senaduka/old-svijetlastrana
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Change error messages according to instructions document

Browse Source
This commit is contained in:
GotPPay
2018-05-22 13:51:12 +02:00
parent d8737a558b
commit fb8b8f63af
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/router/routeutils/response.go
View File

@@ -92,11 +92,12 @@ func ResponseAPINotFoundError(c echo.Context) error {
return ResponseAPIError(c, http.StatusNotFound, "Not Found", false) return ResponseAPIError(c, http.StatusNotFound, "Not Found", false)
} }
//ResponseAPINotEligible returns a standard API not eligible to the response //ResponseAPINotEligibleError returns a standard API not eligible to the response
func ResponseAPINotEligibleError(c echo.Context) error { func ResponseAPINotEligibleError(c echo.Context) error {
return ResponseAPIError(c, http.StatusForbidden, "Eligibility Not Found or Error", false) return ResponseAPIError(c, http.StatusForbidden, "Member does not have active insurance coverage", false)
} }
//ResponseAPINotEligibleWithMessageError returns a standard API not eligible to the response with custom message
func ResponseAPINotEligibleWithMessageError(c echo.Context, message string) error { func ResponseAPINotEligibleWithMessageError(c echo.Context, message string) error {
return ResponseAPIError(c, http.StatusForbidden, message, false) return ResponseAPIError(c, http.StatusForbidden, message, false)
} }

34
server/router/usersroute/controller.go
View File

@@ -1,15 +1,15 @@
package usersroute package usersroute
import ( import (
"bytes"
b64 "encoding/base64" b64 "encoding/base64"
"encoding/json"
"fmt" "fmt"
"math/rand" "math/rand"
"net/http"
"strings"
"sync" "sync"
"time" "time"
"net/http"
"encoding/json"
"bytes"
"strings"
"bitbucket.org/nemt/nemt-portal-api/application/applicationservice" "bitbucket.org/nemt/nemt-portal-api/application/applicationservice"
"bitbucket.org/nemt/nemt-portal-api/application/third/eligibility/bcbsi" "bitbucket.org/nemt/nemt-portal-api/application/third/eligibility/bcbsi"
@@ -19,8 +19,8 @@ import (
"bitbucket.org/nemt/nemt-portal-api/infra/cache" "bitbucket.org/nemt/nemt-portal-api/infra/cache"
"bitbucket.org/nemt/nemt-portal-api/infra/config" "bitbucket.org/nemt/nemt-portal-api/infra/config"
"bitbucket.org/nemt/nemt-portal-api/server/authorization" "bitbucket.org/nemt/nemt-portal-api/server/authorization"
"bitbucket.org/nemt/nemt-portal-api/server/validation"
"bitbucket.org/nemt/nemt-portal-api/server/router/routeutils" "bitbucket.org/nemt/nemt-portal-api/server/router/routeutils"
"bitbucket.org/nemt/nemt-portal-api/server/validation"
"github.com/labstack/echo" "github.com/labstack/echo"
"golang.org/x/net/context" "golang.org/x/net/context"
"googlemaps.github.io/maps" "googlemaps.github.io/maps"
@@ -346,7 +346,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
} }
//Validate member //Validate member
if validationErrors := validation.ValidateEligibility(&user) ; len(validationErrors) > 0 { if validationErrors := validation.ValidateEligibility(&user); len(validationErrors) > 0 {
return routeutils.ResponseAPICustomValidationError(ctx, "eligibility validation failed", validationErrors) return routeutils.ResponseAPICustomValidationError(ctx, "eligibility validation failed", validationErrors)
} }
@@ -420,7 +420,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
client := &http.Client{} client := &http.Client{}
eligibilityJson, err := json.Marshal(eligibility) eligibilityJson, err := json.Marshal(eligibility)
if err != nil { if err != nil {
return routeutils.HandleAPIError(ctx, err) return routeutils.ResponseAPINotEligibleError(ctx)
} }
req, _ := http.NewRequest("POST", c.cfg.Eligibility.Url, bytes.NewBuffer(eligibilityJson)) req, _ := http.NewRequest("POST", c.cfg.Eligibility.Url, bytes.NewBuffer(eligibilityJson))
req.Header.Add("App", c.cfg.HTTP.Auth.AppKey) req.Header.Add("App", c.cfg.HTTP.Auth.AppKey)
@@ -429,24 +429,24 @@ func (c *controller) handleMember(ctx echo.Context) error {
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return routeutils.HandleAPIError(ctx, err) return routeutils.ResponseAPINotEligibleError(ctx)
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode < 200 || resp.StatusCode > 300 { if resp.StatusCode < 200 || resp.StatusCode > 300 {
return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility") return routeutils.ResponseAPINotEligibleError(ctx)
} }
eligibilityResponse := viewmodel.Interchange271{} eligibilityResponse := viewmodel.Interchange271{}
decoder := json.NewDecoder(resp.Body) decoder := json.NewDecoder(resp.Body)
err = decoder.Decode(&eligibilityResponse) err = decoder.Decode(&eligibilityResponse)
if err != nil { if err != nil {
return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility") return routeutils.ResponseAPINotEligibleError(ctx)
} }
//================================================================ //================================================================
if len(eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030) < 1 { if len(eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030) < 1 {
return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility") return routeutils.ResponseAPINotEligibleError(ctx)
} }
address := viewmodel.Address{} address := viewmodel.Address{}
@@ -470,14 +470,14 @@ func (c *controller) handleMember(ctx echo.Context) error {
_, err = c.svc.Zipcodes.GetByParticipatingZipcode(trimmedZipcode) _, err = c.svc.Zipcodes.GetByParticipatingZipcode(trimmedZipcode)
if err != nil{ if err != nil {
return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Member's Home zipcode, " + trimmedZipcode + ", is not currently eligible for participation in this program") return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Member's Home zipcode, "+trimmedZipcode+", is not currently eligible for participation in this program")
} }
googleMapsAPI, err := maps.NewClient(maps.WithClientIDAndSignature("gme-bluecrossandblue1", "msqgD-jdqCyR0M_1u5C1HION5iI=")) googleMapsAPI, err := maps.NewClient(maps.WithClientIDAndSignature("gme-bluecrossandblue1", "msqgD-jdqCyR0M_1u5C1HION5iI="))
if err != nil { if err != nil {
fmt.Println("Error to instantiate googles api: ", err.Error()) fmt.Println("Error to instantiate googles api: ", err.Error())
return routeutils.HandleAPIError(ctx,err) return routeutils.HandleAPIError(ctx, err)
} }
r := &maps.GeocodingRequest{ r := &maps.GeocodingRequest{
@@ -487,7 +487,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
result, err := googleMapsAPI.Geocode(context.Background(), r) result, err := googleMapsAPI.Geocode(context.Background(), r)
if err != nil { if err != nil {
fmt.Println("Error to instantiate googles api: ", err.Error()) fmt.Println("Error to instantiate googles api: ", err.Error())
return routeutils.HandleAPIError(ctx,err) return routeutils.HandleAPIError(ctx, err)
} }
if len(result) > 0 { if len(result) > 0 {
@@ -497,7 +497,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
_, err := c.svc.Users.SaveAddress(address) _, err := c.svc.Users.SaveAddress(address)
if err != nil { if err != nil {
fmt.Println("Error to save address: ", err.Error()) fmt.Println("Error to save address: ", err.Error())
return routeutils.HandleAPIError(ctx,err) return routeutils.HandleAPIError(ctx, err)
} }
} }
@@ -597,7 +597,7 @@ func (c *controller) handlePortal(ctx echo.Context) error {
} }
user.Pass = string(pass) user.Pass = string(pass)
if passwordValidationErrors := validation.ValidatePassword(&user) ; len(passwordValidationErrors) > 0 { if passwordValidationErrors := validation.ValidatePassword(&user); len(passwordValidationErrors) > 0 {
return routeutils.ResponseAPICustomValidationError(ctx, "Password not strong enough", passwordValidationErrors) return routeutils.ResponseAPICustomValidationError(ctx, "Password not strong enough", passwordValidationErrors)
} }