remove rebase markings

data/datamysql/zipcode.go

@@ -62,4 +62,4 @@ func (c *zipcodeRepo) GetAll() ([]entity.Zipcode, error) {
 
 func (c *zipcodeRepo) GetByParticipatingZipcode(zipcode string) (entity.Zipcode, error) {
 	return c.parseEntity(c.conn.QueryRow(c.getQuery()+"WHERE a.participating = 1 AND a.zipcode = ?", zipcode))
-}
+}

server/router/routeutils/response.go

@@ -39,7 +39,7 @@ func ResponseAPIErrorWithData(c echo.Context, status int, message string, redire
 		Error:    true,
 		Message:  message,
 		Redirect: redirect,
-		Data:	  data,
+		Data:     data,
 	}
 
 	return c.JSON(status, returnValue)

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"
@@ -346,7 +346,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	}
 
 	//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)
 	}
 
@@ -409,11 +409,11 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	eligibility.ServiceInfo.ServiceTypeCodes = []string{"30"}
 
 	/*
-	resp, err := c.bcbsi.BXE.Get271(eligibility)
+		resp, err := c.bcbsi.BXE.Get271(eligibility)
-	if err != nil {
+		if err != nil {
-		fmt.Println("Eligibility Not Found or Error: ", err.Error())
+			fmt.Println("Eligibility Not Found or Error: ", err.Error())
-		return routeutils.ResponseAPINotEligibleError(ctx)
+			return routeutils.ResponseAPINotEligibleError(ctx)
-	} 
+		}
 	*/
 
 	//This part is emulating eligibility check for testing purposes
@@ -426,7 +426,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	req.Header.Add("App", c.cfg.HTTP.Auth.AppKey)
 	req.Header.Add("Token", ctx.Request().Header.Get("Token"))
 	req.Header.Add("Content-Type", "application/json")
-	
+
 	resp, err := client.Do(req)
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)
@@ -446,7 +446,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	//================================================================
 
 	if len(eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030) < 1 {
-		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility")	
+		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "Cannot check eligibility")
 	}
 
 	address := viewmodel.Address{}
@@ -467,17 +467,17 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	if len(cleanZipcode) > zipcodeTrimLength {
 		trimmedZipcode = cleanZipcode[:zipcodeTrimLength]
 	}
-	
+
 	_, 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="))
 	if err != nil {
 		fmt.Println("Error to instantiate googles api: ", err.Error())
-		return routeutils.HandleAPIError(ctx,err)
+		return routeutils.HandleAPIError(ctx, err)
 	}
 
 	r := &maps.GeocodingRequest{
@@ -487,7 +487,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 	result, err := googleMapsAPI.Geocode(context.Background(), r)
 	if err != nil {
 		fmt.Println("Error to instantiate googles api: ", err.Error())
-		return routeutils.HandleAPIError(ctx,err)
+		return routeutils.HandleAPIError(ctx, err)
 	}
 
 	if len(result) > 0 {
@@ -497,7 +497,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 		_, err := c.svc.Users.SaveAddress(address)
 		if err != nil {
 			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)
 
-	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)
 	}