Change error messages according to instructions document

server/router/routeutils/response.go

@@ -92,11 +92,12 @@ func ResponseAPINotFoundError(c echo.Context) error {
 	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 {
-	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 {
 	return ResponseAPIError(c, http.StatusForbidden, message, false)
 }

server/router/usersroute/controller.go

@@ -1,15 +1,15 @@
 package usersroute
 
 import (
+	"bytes"
 	b64 "encoding/base64"
+	"encoding/json"
 	"fmt"
 	"math/rand"
+	"net/http"
+	"strings"
 	"sync"
 	"time"
-	"net/http"
-	"encoding/json"
-	"bytes"
-	"strings"
 
 	"bitbucket.org/nemt/nemt-portal-api/application/applicationservice"
 	"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/config"
 	"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/validation"
 	"github.com/labstack/echo"
 	"golang.org/x/net/context"
 	"googlemaps.github.io/maps"
@@ -420,7 +420,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	client := &http.Client{}
 	eligibilityJson, err := json.Marshal(eligibility)
 	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
+		return routeutils.ResponseAPINotEligibleError(ctx)
 	}
 	req, _ := http.NewRequest("POST", c.cfg.Eligibility.Url, bytes.NewBuffer(eligibilityJson))
 	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)
 	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
+		return routeutils.ResponseAPINotEligibleError(ctx)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode < 200 || resp.StatusCode > 300 {
-		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility")
+		return routeutils.ResponseAPINotEligibleError(ctx)
 	}
 
 	eligibilityResponse := viewmodel.Interchange271{}
 	decoder := json.NewDecoder(resp.Body)
 	err = decoder.Decode(&eligibilityResponse)
 	if err != nil {
-		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility")
+		return routeutils.ResponseAPINotEligibleError(ctx)
 	}
 	//================================================================
 
 	if len(eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030) < 1 {
-		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility")	
+		return routeutils.ResponseAPINotEligibleError(ctx)
 	}
 
 	address := viewmodel.Address{}

server/validation/tnc.go

@@ -1,13 +1,15 @@
 package validation
 
 import (
-	"fmt"
+
-	"regexp"
-	"strconv"
 	"time"
+	"fmt"
+	"strconv"
+	"regexp"
 
 	"bitbucket.org/nemt/nemt-portal-api/application/viewmodel"
 	"bitbucket.org/nemt/nemt-portal-api/infra/errors"
+
 )
 
 const (
@@ -36,7 +38,7 @@ func isMixedIDValid(id string) bool {
 	hasLowerCase := false
 	hasNumber := false
 
-	for _, character := range id {
+	for _, character := range (id) {
 		hasUpperCase = hasUpperCase || ((character >= 65) && (character <= 90))
 		hasLowerCase = hasLowerCase || ((character >= 97) && (character <= 122))
 		hasNumber = hasNumber || ((character >= 48) && (character <= 57))
@@ -208,5 +210,6 @@ func ValidateRide(requestRide *viewmodel.RideRequest, user *viewmodel.User) []er
 		result = append (result, errors.ValidationError{Field : "trip_type.key", Message : "Step #4 - Choose a Trip Type"})
 	}
 
+
 	return result
 }