Upstream sync

server/router/eligibilityroute/controller.go

@@ -1,12 +1,8 @@
 package eligibilityroute
 
 import (
-	"context"
-	"encoding/xml"
 	"fmt"
-	"html"
 	"math/rand"
-	"strings"
 	"sync"
 	"time"
 
@@ -16,9 +12,7 @@ import (
 	"bitbucket.org/nemt/nemt-portal-api/infra/auth"
 	"bitbucket.org/nemt/nemt-portal-api/infra/config"
 	"bitbucket.org/nemt/nemt-portal-api/server/router/routeutils"
-	"bitbucket.org/nemt/nemt-portal-api/server/validation"
 	"github.com/labstack/echo"
-	"googlemaps.github.io/maps"
 )
 
 var (
@@ -78,185 +72,53 @@ func (c *controller) handleEligibility(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
-	if validationErrors := validation.ValidateEligibility(&eligibility.User); len(validationErrors) > 0 {
-		return routeutils.ResponseAPICustomValidationError(ctx, "eligibility validation failed", validationErrors)
-	}
-
-	if eligibility.Provider.ProviderNPI == "" {
-		provider, err := c.svc.Provider.GetByOrganization(authUser.Profiles[0].Organization.UUID, authUser)
-		if err != nil {
-			return routeutils.HandleAPIError(ctx, err)
-		}
-		eligibility.Provider.ProviderNPI = provider.InternalID
-		eligibility.Provider.ProviderName = provider.OrganizatioName
-	}
-
-	loc, _ := time.LoadLocation("America/Chicago")
-	eligibility.TrackingID = c.rangeIn(1000000, 9999999)
-	eligibility.ServiceInfo.DateOfService = time.Now().In(loc)
-	eligibility.ServiceInfo.ServiceTypeCodes = []string{"30"}
-
-	var plan viewmodel.Plan
-	if eligibility.Subscriber.SubscriberID != "" {
-		plan, err = c.svc.Plan.GetByAlphaPrefix(eligibility.Subscriber.SubscriberID[:3])
-		if err != nil {
-			return routeutils.HandleAPIError(ctx, err)
-		}
-
-		eligibility.Payer.PayerID = fmt.Sprintf("%v", plan.PayerID)
-		eligibility.Payer.PayerName = plan.PayerName
-	} else {
-		return routeutils.ResponseAPIFieldValidationError(ctx, "subscriber_id", "member # is required.")
-	}
-
-	ret, err := c.bcbsi.BXE.CheckEligibility(eligibility)
+	var provider viewmodel.ProviderResp
+	provider, err = c.svc.Provider.GetByNPI(eligibility.RawProvider.FivePartKeyGroups[0].ProviderNum, authUser)
 	if err != nil {
-		fmt.Println("Error Here: ", err.Error())
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
-	if ret.QueryResult.QueryResultSummary.BenefitsFound {
-		xmlString := html.UnescapeString(ret.QueryResult.HIPPA271.T271)
-		xmlReader := strings.NewReader(xmlString)
-
-		var f viewmodel.Interchange271
-		err = xml.NewDecoder(xmlReader).Decode(&f)
-		if err != nil {
-			fmt.Println("Error to unmarshal: ", err.Error())
+	if provider.ProviderUUID == "" {
+		org := viewmodel.Organization{
+			Type: viewmodel.OrganizationType{
+				Key:  "provider",
+				Name: "Provider",
+			},
+			Name:        eligibility.RawProvider.OrgName,
+			Description: eligibility.RawProvider.OrgName,
+			Main:        false,
+			Author:      authUser,
+			LastEditor:  authUser,
+			Reference:   eligibility.RawProvider,
 		}
 
-		user, err := c.svc.Users.GetByMemberID(eligibility.Subscriber.SubscriberID)
+		org, err = c.svc.Organization.AddOrganization(org, authUser)
 		if err != nil {
-			fmt.Println(err)
 			return routeutils.HandleAPIError(ctx, err)
 		}
 
-		if user.ID == "" {
-			user.Pass = c.generatePassword(8)
-			user.BirthDate = &eligibility.Subscriber.DemographicInfo.DateOfBirth
-			user.Member = &eligibility.Subscriber.SubscriberID
-			user.Gender = &eligibility.Subscriber.DemographicInfo.Gender
-			user.First = eligibility.Subscriber.Name.First
-			user.Last = eligibility.Subscriber.Name.Last
-			user.Active = true
-			user.Type = &eligibility.Subscriber.PatientType
-			user.PhoneNumber = eligibility.User.PhoneNumber
-			user.Email = eligibility.User.Email
+		provider, err = c.svc.Provider.GetByOrganization(org.UUID, authUser)
+		if err != nil {
+			return routeutils.HandleAPIError(ctx, err)
+		}
+	}
 
-			profile, err := c.svc.Profile.GetByKey("US")
-			if err != nil {
-				return routeutils.HandleAPIError(ctx, err)
-			}
-			user.Profiles = append(user.Profiles, profile)
-
-			if user.BirthDate == nil || user.BirthDate.IsZero() {
-				return routeutils.ResponseAPIAuthError(ctx, "birthdate is required", false)
-			}
-
-			if user.Member == nil || len(*user.Member) == 0 {
-				return routeutils.ResponseAPIAuthError(ctx, "member is required", false)
-			}
-
-			if user.Gender == nil || len(*user.Gender) == 0 || (*user.Gender != "M" && *user.Gender != "F" && *user.Gender != "U") {
-				return routeutils.ResponseAPIAuthError(ctx, "gender is required", false)
-			}
-
-			if len(user.Name) == 0 && len(user.First) == 0 && len(user.Last) == 0 {
-				return routeutils.ResponseAPIAuthError(ctx, "name is required", false)
-			}
-
-			if len(user.First) != 0 && len(user.Last) != 0 {
-				user.Name = fmt.Sprintf("%s %s", user.First, user.Last)
-			}
-
-			if user.PhoneNumber != nil && len(*user.PhoneNumber) == 10 && !strings.Contains(*user.PhoneNumber, "+1") {
-				phoneNumber := fmt.Sprintf("+1%s", *user.PhoneNumber)
-				user.PhoneNumber = &phoneNumber
+	user, err := c.svc.Users.CheckAndCreateMember(eligibility.User, provider, authUser)
+	if err != nil {
+		if validationError, ok := err.(*viewmodel.ValidationError); ok {
+			if len(validationError.Errors) > 0 {
+				return routeutils.ResponseAPICustomValidationError(ctx, validationError.Message, validationError.Errors)
 			} else {
-				return routeutils.ResponseAPIFieldValidationError(ctx, "phonenumber", "Phone number is required")
-			}
-
-			user, err = c.svc.Users.Create(user, authUser)
-			if err != nil {
-				return routeutils.HandleAPIError(ctx, err)
+				return routeutils.ResponseAPIServiceError(ctx, validationError.Message)
 			}
 		} else {
-			if eligibility.User.Email != nil && len(*eligibility.User.Email) > 0 {
-				user.Email = eligibility.User.Email
-			}
-
-			if eligibility.User.PhoneNumber != nil {
-				if len(*eligibility.User.PhoneNumber) == 10 && !strings.Contains(*eligibility.User.PhoneNumber, "+1") {
-					phoneNumber := fmt.Sprintf("+1%s", *eligibility.User.PhoneNumber)
-					eligibility.User.PhoneNumber = &phoneNumber
-				}
-
-				if len(*eligibility.User.PhoneNumber) > 0 {
-					user.PhoneNumber = eligibility.User.PhoneNumber
-				}
-			}
-
-			err = c.svc.Users.UpdateLogin(user)
-			if err != nil {
-				return routeutils.HandleAPIError(ctx, err)
-			}
-		}
-
-		address := viewmodel.Address{}
-		header := f.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N3_0950
-		body := f.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N4_0960
-		zipCode := strings.TrimSpace(body.N403)
-
-		address.AddressTypeName = "Home"
-		address.AddressType = "home"
-		address.Name = fmt.Sprintf("%s, %s", header.N301, body.N401)
-		address.Address = fmt.Sprintf("%s, %s (%s)", header.N301, body.N401, zipCode)
-		address.CreatedUserUUID = authUser.ID
-		address.User = user
-		address.Type = "provider"
-
-		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)
 		}
+	}
 
-		r := &maps.GeocodingRequest{
-			Address: address.Address + " " + body.N402 + ", " + zipCode,
-		}
-
-		result, err := googleMapsAPI.Geocode(context.Background(), r)
-		if err != nil {
-			fmt.Println("Error to instantiate googles api: ", err.Error())
-			return routeutils.HandleAPIError(ctx, err)
-		}
-
-		if len(result) > 0 {
-			address.Latitude = result[0].Geometry.Location.Lat
-			address.Longitude = result[0].Geometry.Location.Lng
-		}
-
-		if len(user.Addresses) > 0 {
-			for _, a := range user.Addresses {
-				if a.AddressType == "home" {
-					err := c.svc.Users.RemoveAddress(a.UUID)
-					if err != nil {
-						fmt.Println("Error to remove old address: ", err.Error())
-						return routeutils.HandleAPIError(ctx, err)
-					}
-				}
-			}
-		}
-
-		address, err = c.svc.Users.SaveAddress(address)
-		if err != nil {
-			fmt.Println("Error to save address: ", err.Error())
-			return routeutils.HandleAPIError(ctx, err)
-		}
-		user.Addresses = append(user.Addresses, address)
-
-		return ctx.JSON(200, user)
+	if authUser.Profiles[0].Key == "VIRPT" {
+		return ctx.JSON(204, nil)
 	} else {
-		return routeutils.ResponseAPINotEligibleWithMessageError(ctx, "No benefits found for member")
+		return ctx.JSON(200, user)
 	}
 }

server/router/externalroute/controller.go

@@ -63,12 +63,17 @@ func (c *controller) handleCancel(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
+	authUser, err := c.svc.Users.GetByUUID(ride.CreatedUser.ID, "")
+	if err != nil {
+		return routeutils.HandleAPIError(ctx, err)
+	}
+
 	lyftRide := viewmodel.RideRequest{RideID: ride.InternalID}
 	if ride.Status.Key == "scheduled" && !strings.Contains(ride.InternalID, "s_") {
 		lyftRide.RideID = "s_" + ride.InternalID
 	}
 
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if authUser.Test {
 		if err = c.tnc.Lyft.CancelRide(lyftRide); err != nil {
 			if err.Error() != "ride_not_found" {
 				fmt.Println("Error to cancel with Lyft: ", err.Error())
@@ -144,13 +149,18 @@ func (c *controller) handle(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
+	authUser, err := c.svc.Users.GetByUUID(ride.CreatedUser.ID, "")
+	if err != nil {
+		fmt.Println("Error: ", err.Error())
+		return routeutils.HandleAPIError(ctx, err)
+	}
+
 	if ride.Status.Key == "accepted" || ride.Status.Key == "pickedUp" || ride.Status.Key == "arrived" {
 		var lyftRide viewmodel.RideRequest
 		var err error
-		if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+		if authUser.Test {
 			lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 		} else {
-			fmt.Println("In Production")
 			lyftRide, err = c.tnc.LyftProd.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 		}
 		if err != nil {
@@ -236,7 +246,7 @@ func (c *controller) handleReady(ctx echo.Context) error {
 	}
 
 	var lyftRide viewmodel.RideRequest
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if authUser.Test {
 		lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 	} else {
 		fmt.Println("In Production")
@@ -258,7 +268,7 @@ func (c *controller) handleReady(ctx echo.Context) error {
 	lyftRide.Passenger.PhoneNumber = *nextRide.User.PhoneNumber
 	lyftRide.RideType = "lyft"
 
-	if c.cfg.LyftProd.UserUUID != nextRide.CreatedUser.ID {
+	if authUser.Test {
 		lyftRide, err = c.tnc.Lyft.RequestRide(lyftRide)
 	} else {
 		fmt.Println("In Production")

server/router/lyfthookroute/controller.go

@@ -57,8 +57,14 @@ func (c *controller) handleStateChange(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
+	authUser, err := c.svc.Users.GetByUUID(ride.CreatedUser.ID, "")
+	if err != nil {
+		fmt.Println("Error: ", err.Error())
+		return routeutils.HandleAPIError(ctx, err)
+	}
+
 	// var lyftRide viewmodel.RideRequest
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if authUser.Test {
 		_, err = c.tnc.Lyft.GetRideStatus(viewmodel.RideRequest{RideID: ride.InternalID}, status)
 		go func() {
 			secondCall := func() {

server/router/selfregisterroute/controller.go

@@ -2,6 +2,7 @@ package selfregisterroute
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
 	b64 "encoding/base64"
@@ -22,6 +23,10 @@ const (
 	notificationSmsBody      = "You have registered as a Visit Reporter for CHM NEMT. Login: https://portal.bcbsinstitute.com  Reset PW: https://portal.bcbsinstitute.com/forgot"
 )
 
+const (
+	phoneNumberMaxLength = 12
+)
+
 var (
 	instance *controller
 	once     sync.Once
@@ -44,12 +49,34 @@ func controllerInstance(svc *applicationservice.Service, cfg *config.Config) *co
 	return instance
 }
 
+func removeNonNumberChars(input string) string {
+	result := ""
+	for _, char := range input {
+		if char >= '0' && char <= '9' {
+			result += string(char)
+		}
+	}
+
+	return result
+}
+
 func (c *controller) handle(ctx echo.Context) error {
 	var user viewmodel.User
 	if err := ctx.Bind(&user); err != nil {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
+	//format phone number - max length in database is 12 chars
+	formatedPhoneNumber := strings.TrimSpace(*user.PhoneNumber)
+	formatedPhoneNumber = strings.Replace(formatedPhoneNumber, "+1", "", -1)
+	formatedPhoneNumber = removeNonNumberChars(formatedPhoneNumber)
+
+	if len(formatedPhoneNumber) > phoneNumberMaxLength {
+		formatedPhoneNumber = formatedPhoneNumber[:phoneNumberMaxLength]
+	}
+
+	*user.PhoneNumber = formatedPhoneNumber
+
 	authUser, err := c.svc.Users.GetByUUID("573c70ff-733d-11e7-ba8f-0a6ad3fcdeaa", "")
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)
@@ -132,10 +159,14 @@ func (c *controller) handle(ctx echo.Context) error {
 
 	notification, err = c.svc.Notification.SendNotificationWithoutWritingToDatabase(notification)
 	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
+		logger := ctx.Logger()
+		logger.Warnf("Application Error: Could not send email notification to user email : %s", *user.Email)
 	}
 
 	//Send sms notification to Authorized user
+
+	formatedPhoneNumber = *user.PhoneNumber
+
 	notification = viewmodel.Notification{
 		Type:    applicationservice.NOtificationTypeSMS,
 		To:      *user.PhoneNumber,
@@ -144,7 +175,8 @@ func (c *controller) handle(ctx echo.Context) error {
 
 	notification, err = c.svc.Notification.SendNotificationWithoutWritingToDatabase(notification)
 	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
+		logger := ctx.Logger()
+		logger.Warnf("Application Error: Could not send sms notification to user mobile : %s", *user.PhoneNumber)
 	}
 
 	return routeutils.ResponseAPIOK(ctx, user)

server/router/tncroute/controller.go

@@ -289,7 +289,7 @@ func (c *controller) handle(ctx echo.Context) error {
 			requestRide.Destination = newOrigin
 		}
 
-		if c.cfg.LyftProd.UserUUID != createdUser.ID {
+		if createdUser.Test {
 			resp, err = c.tnc.Lyft.RequestRide(requestRide)
 		} else {
 			fmt.Println("In Production")
@@ -404,7 +404,7 @@ func (c *controller) handle(ctx echo.Context) error {
 			newRide.Passenger.LastName = " "
 			newRide.Passenger.PhoneNumber = *user.PhoneNumber
 
-			if c.cfg.LyftProd.UserUUID != createdUser.ID {
+			if createdUser.Test {
 				newRide, err = c.tnc.Lyft.RequestRide(newRide)
 			} else {
 				fmt.Println("In Production")
@@ -514,7 +514,7 @@ func (c *controller) handleRawLyft(ctx echo.Context) error {
 	}
 
 	var lyftRide viewmodel.RideRequest
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if user.Test {
 		lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 	} else {
 		fmt.Println("In Production")
@@ -546,7 +546,7 @@ func (c *controller) handleRideETA(ctx echo.Context) error {
 
 	if ride.Status.Key == "accepted" || ride.Status.Key == "pickedUp" || ride.Status.Key == "arrived" {
 		var lyftRide viewmodel.RideRequest
-		if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+		if user.Test {
 			lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 		} else {
 			fmt.Println("In Production")
@@ -614,7 +614,7 @@ func (c *controller) handleCancel(ctx echo.Context) error {
 		requestRide.RideID = "s_" + ride.InternalID
 	}
 
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if user.Test {
 		err = c.tnc.Lyft.CancelRide(requestRide)
 		if err != nil && err.Error() == "ride_not_found" {
 			err = nil
@@ -719,7 +719,7 @@ func (c *controller) handleRide(ctx echo.Context) error {
 
 	if ride.Status.Key == "accepted" || ride.Status.Key == "pickedUp" || ride.Status.Key == "arrived" {
 		var lyftRide viewmodel.RideRequest
-		if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+		if user.Test {
 			lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 		} else {
 			fmt.Println("In Production")
@@ -858,7 +858,7 @@ func (c *controller) handleReady(ctx echo.Context) error {
 	}
 
 	var lyftRide viewmodel.RideRequest
-	if ride.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+	if user.Test {
 		lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: ride.InternalID})
 	} else {
 		fmt.Println("In Production")
@@ -880,7 +880,7 @@ func (c *controller) handleReady(ctx echo.Context) error {
 	lyftRide.Passenger.PhoneNumber = *nextRide.User.PhoneNumber
 	lyftRide.RideType = "lyft"
 
-	if c.cfg.LyftProd.UserUUID != nextRide.CreatedUser.ID {
+	if user.Test {
 		lyftRide, err = c.tnc.Lyft.RequestRide(lyftRide)
 	} else {
 		fmt.Println("In Production")

server/router/twilioroute/controller.go

@@ -128,6 +128,13 @@ func (c *controller) handleTwilio(ctx echo.Context) error {
 				message = fmt.Sprintf("We received a request to cancel a ride from you at %s, but cannot find a ride for this mobile number.", libphonenumber.Format(num, libphonenumber.NATIONAL))
 			}
 		}
+
+		authUser, err := c.svc.Users.GetByUUID(lastRide.CreatedUser.ID, "")
+		if err != nil {
+			fmt.Println("Error to author of the ride: ", err.Error())
+			message = "There was a problem to call your ride"
+		}
+
 		if !isDriver {
 			if requestMessage == "I AM READY" && lastRide.UUID != "" {
 				if (lastRide.Visit.TripType.Key == "roundtrip_call" && (lastRide.TripType.Key == "to_visit" || lastRide.TripType.Key == "from_visit_call")) || lastRide.Visit.TripType.Key == "from_visit_call" {
@@ -161,7 +168,7 @@ func (c *controller) handleTwilio(ctx echo.Context) error {
 						lyftRide.Passenger.PhoneNumber = *readyRide.User.PhoneNumber
 						lyftRide.RideType = "lyft"
 
-						if c.cfg.LyftProd.UserUUID != readyRide.CreatedUser.ID {
+						if authUser.Test {
 							lyftRide, err = c.tnc.Lyft.RequestRide(lyftRide)
 						} else {
 							fmt.Println("In Production")
@@ -209,7 +216,7 @@ func (c *controller) handleTwilio(ctx echo.Context) error {
 
 			if requestMessage == "YES" && lastRide.UUID != "" {
 				var lyftRide viewmodel.RideRequest
-				if lastRide.CreatedUser.ID != c.cfg.LyftProd.UserUUID {
+				if authUser.Test {
 					lyftRide, err = c.tnc.Lyft.GetRideDetails(viewmodel.RideRequest{RideID: lastRide.InternalID})
 					if err != nil {
 						fmt.Println("Error: ", err.Error())

server/router/usersroute/controller.go

@@ -1,13 +1,9 @@
 package usersroute
 
 import (
-	"bytes"
 	b64 "encoding/base64"
-	"encoding/json"
 	"fmt"
 	"math/rand"
-	"net/http"
-	"strings"
 	"sync"
 	"time"
 
@@ -22,8 +18,6 @@ import (
 	"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"
 )
 
 const (
@@ -345,11 +339,6 @@ func (c *controller) handleMember(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
-	//Validate member
-	if validationErrors := validation.ValidateEligibility(&user); len(validationErrors) > 0 {
-		return routeutils.ResponseAPICustomValidationError(ctx, "eligibility validation failed", validationErrors)
-	}
-
 	authUser, err := auth.GetUserDetail(ctx, c.cfg)
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)
@@ -359,153 +348,24 @@ func (c *controller) handleMember(ctx echo.Context) error {
 		return routeutils.ResponseAPIAuthError(ctx, "phonenumber or email is required", false)
 	}
 
-	if len(user.Pass) == 0 {
-		user.Pass = c.generatePassword(8)
-	} else {
-		pass, err := b64.StdEncoding.DecodeString(user.Pass)
-		if err != nil {
-			return routeutils.ResponseAPIAuthError(ctx, "Invalid password", false)
-		}
-		user.Pass = string(pass)
-	}
-
-	if user.BirthDate == nil || user.BirthDate.IsZero() {
-		return routeutils.ResponseAPIAuthError(ctx, "birthdate is required", false)
-	}
-
-	if user.Member == nil || len(*user.Member) == 0 {
-		return routeutils.ResponseAPIAuthError(ctx, "member is required", false)
-	}
-
-	if user.Gender == nil || len(*user.Gender) == 0 || (*user.Gender != "M" && *user.Gender != "F" && *user.Gender != "U") {
-		return routeutils.ResponseAPIAuthError(ctx, "gender is required", false)
-	}
-
-	if len(user.Name) == 0 && len(user.First) == 0 && len(user.Last) == 0 {
-		return routeutils.ResponseAPIAuthError(ctx, "name is required", false)
-	}
-
-	if len(user.First) != 0 && len(user.Last) != 0 {
-		user.Name = fmt.Sprintf("%s %s", user.First, user.Last)
-	}
-
-	profile, err := c.svc.Profile.GetByKey("US")
+	provider, err := c.svc.Provider.GetByNPI("1699849786", authUser)
 	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
+		return routeutils.ResponseAPIAuthError(ctx, "Provider not found", false)
 	}
-	user.Profiles = append(user.Profiles, profile)
 
-	eligibility := viewmodel.Eligibility{}
-	eligibility.Provider.ProviderNPI = "1699849786"
-	eligibility.Provider.ProviderName = "LITHOLINK CORPORATION"
-	eligibility.TrackingID = user.ID
-	eligibility.Subscriber.SubscriberID = *user.Member
-	eligibility.Subscriber.PatientType = "S"
-	eligibility.Subscriber.Name.First = user.First
-	eligibility.Subscriber.Name.Last = user.Last
-	eligibility.Subscriber.DemographicInfo.DateOfBirth = *user.BirthDate
-	eligibility.Subscriber.DemographicInfo.Gender = *user.Gender
-	eligibility.ServiceInfo.DateOfService = time.Now()
-	eligibility.ServiceInfo.ServiceTypeCodes = []string{"30"}
-
-	/*
-		resp, err := c.bcbsi.BXE.Get271(eligibility)
-		if err != nil {
-			fmt.Println("Eligibility Not Found or Error: ", err.Error())
-			return routeutils.ResponseAPINotEligibleError(ctx)
-		}
-	*/
-
-	//This part is emulating eligibility check for testing purposes
-	client := &http.Client{}
-	eligibilityJson, err := json.Marshal(eligibility)
+	user, err = c.svc.Users.CheckAndCreateMember(user, provider, authUser)
 	if err != nil {
-		return routeutils.ResponseAPINotEligibleError(ctx)
-	}
-	req, _ := http.NewRequest("POST", c.cfg.Eligibility.Url, bytes.NewBuffer(eligibilityJson))
-	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.ResponseAPINotEligibleError(ctx)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode > 300 {
-		return routeutils.ResponseAPINotEligibleError(ctx)
-	}
-
-	eligibilityResponse := viewmodel.Interchange271{}
-	decoder := json.NewDecoder(resp.Body)
-	err = decoder.Decode(&eligibilityResponse)
-	if err != nil {
-		return routeutils.ResponseAPINotEligibleError(ctx)
-	}
-	//================================================================
-
-	if len(eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030) < 1 {
-		return routeutils.ResponseAPINotEligibleError(ctx)
-	}
-
-	address := viewmodel.Address{}
-	//header := resp.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N3_0950
-	//body := resp.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N4_0960
-	header := eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N3_0950
-	body := eligibilityResponse.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N4_0960
-
-	address.AddressTypeName = "Home"
-	address.AddressType = "home"
-	address.Name = fmt.Sprintf("%s, %s", header.N301, body.N401)
-	address.Address = fmt.Sprintf("%s, %s", header.N301, body.N401)
-	address.CreatedUserUUID = authUser.ID
-	address.User = user
-
-	cleanZipcode := strings.TrimSpace(body.N403)
-	trimmedZipcode := cleanZipcode
-	if len(cleanZipcode) > zipcodeTrimLength {
-		trimmedZipcode = cleanZipcode[:zipcodeTrimLength]
-	}
-
-	_, err = c.svc.Zipcodes.GetByParticipatingZipcode(trimmedZipcode)
-
-	if err != nil {
-		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)
-	}
-
-	r := &maps.GeocodingRequest{
-		Address: address.Address + " " + body.N402 + ", " + body.N403,
-	}
-
-	result, err := googleMapsAPI.Geocode(context.Background(), r)
-	if err != nil {
-		fmt.Println("Error to instantiate googles api: ", err.Error())
-		return routeutils.HandleAPIError(ctx, err)
-	}
-
-	if len(result) > 0 {
-		address.Latitude = result[0].Geometry.Location.Lat
-		address.Longitude = result[0].Geometry.Location.Lng
-
-		_, err := c.svc.Users.SaveAddress(address)
-		if err != nil {
-			fmt.Println("Error to save address: ", err.Error())
+		if validationError, ok := err.(*viewmodel.ValidationError); ok {
+			if len(validationError.Errors) > 0 {
+				return routeutils.ResponseAPICustomValidationError(ctx, validationError.Message, validationError.Errors)
+			} else {
+				return routeutils.ResponseAPIServiceError(ctx, validationError.Message)
+			}
+		} else {
 			return routeutils.HandleAPIError(ctx, err)
 		}
 	}
 
-	user, err = c.svc.Users.Create(user, authUser)
-	if err != nil {
-		return routeutils.HandleAPIError(ctx, err)
-	}
-
 	return routeutils.ResponseAPIOK(ctx, user)
 }
 
@@ -547,6 +407,7 @@ func (c *controller) handleBulkPortal(ctx echo.Context) error {
 			return routeutils.ResponseAPIAuthError(ctx, "name is required", false)
 		}
 
+		users[i].Test = true
 		if len(users[i].First) != 0 && len(users[i].Last) != 0 {
 			users[i].Name = fmt.Sprintf("%s %s", users[i].First, users[i].Last)
 		}
@@ -608,6 +469,7 @@ func (c *controller) handlePortal(ctx echo.Context) error {
 	if len(user.First) != 0 && len(user.Last) != 0 {
 		user.Name = fmt.Sprintf("%s %s", user.First, user.Last)
 	}
+	user.Test = true
 
 	user, err = c.svc.Users.Create(user, authUser)
 	if err != nil {

server/router/visitroute/controller.go

@@ -1,15 +1,12 @@
 package visitroute
 
 import (
-	"context"
 	"fmt"
 	"math/rand"
 	"strings"
 	"sync"
 	"time"
 
-	b64 "encoding/base64"
-
 	"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/tncservice"
@@ -20,7 +17,6 @@ import (
 	"bitbucket.org/nemt/nemt-portal-api/server/validation"
 	"github.com/labstack/echo"
 	uuid "github.com/satori/go.uuid"
-	"googlemaps.github.io/maps"
 )
 
 var (
@@ -81,103 +77,34 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)
 	}
+
+	visit.User.PhoneNumber = ride.User.PhoneNumber
+	visit.User.Email = ride.User.Email
+	visit.User.Consent = true
+
 	ride.Visit = visit
 
-	user, err := c.svc.Users.GetByMemberID(*visit.User.Member)
-	if err != nil {
-		fmt.Println(err)
-		return routeutils.HandleAPIError(ctx, err)
-	}
-	user.PhoneNumber = ride.User.PhoneNumber
-	user.Email = ride.User.Email
-
-	ride.Visit.User = user
-	if ride.Visit.User.Type == nil {
-		subscriber := "S"
-		ride.Visit.User.Type = &subscriber
-	}
-
 	var provider viewmodel.ProviderResp
 	provider, err = c.svc.Provider.GetByUUID(ride.Visit.Provider.ProviderUUID, authUser)
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)
 	}
-	visit.Provider = provider
+	ride.Visit.Provider = provider
 
-	eligibility := viewmodel.Eligibility{}
-	eligibility.Provider.ProviderNPI = provider.InternalID
-	eligibility.Provider.ProviderName = provider.OrganizatioName
-	eligibility.TrackingID = c.rangeIn(1000000, 9999999)
-	eligibility.Subscriber.SubscriberID = *ride.Visit.User.Member
-	eligibility.Subscriber.PatientType = *ride.Visit.User.Type
-	eligibility.Subscriber.Name.First = ride.Visit.User.First
-	eligibility.Subscriber.Name.Last = ride.Visit.User.Last
-	eligibility.Subscriber.DemographicInfo.DateOfBirth = *ride.Visit.User.BirthDate
-	eligibility.Subscriber.DemographicInfo.Gender = *ride.Visit.User.Gender
-	loc, _ := time.LoadLocation("America/Chicago")
-	eligibility.ServiceInfo.DateOfService = time.Now().In(loc)
-	eligibility.ServiceInfo.ServiceTypeCodes = []string{"30"}
-
-	resp271, err := c.bcbsi.BXE.Get271(eligibility)
+	user, err := c.svc.Users.CheckAndCreateMember(ride.Visit.User, provider, authUser)
 	if err != nil {
-		fmt.Println(err)
-		return routeutils.ResponseAPIValidationError(ctx, err.Error())
-	}
-
-	address := viewmodel.Address{}
-	header := resp271.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N3_0950
-	body := resp271.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N4_0960
-	zipCode := strings.TrimSpace(body.N403)
-
-	address.AddressTypeName = "Home"
-	address.AddressType = "home"
-	address.Name = fmt.Sprintf("%s, %s", header.N301, body.N401)
-	address.Address = fmt.Sprintf("%s, %s (%s)", header.N301, body.N401, zipCode)
-	address.CreatedUserUUID = authUser.ID
-	address.User = user
-	address.Type = "provider"
-
-	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)
-	}
-
-	r := &maps.GeocodingRequest{
-		Address: address.Address + " " + body.N402 + ", " + zipCode,
-	}
-
-	result, err := googleMapsAPI.Geocode(context.Background(), r)
-	if err != nil {
-		fmt.Println("Error to instantiate googles api: ", err.Error())
-		return routeutils.HandleAPIError(ctx, err)
-	}
-
-	if len(result) > 0 {
-		address.Latitude = result[0].Geometry.Location.Lat
-		address.Longitude = result[0].Geometry.Location.Lng
-	}
-
-	if address.Latitude != 0 && address.Longitude != 0 {
-		if len(user.Addresses) > 0 {
-			for _, a := range user.Addresses {
-				if a.AddressType == "home" {
-					err := c.svc.Users.RemoveAddress(a.UUID)
-					if err != nil {
-						fmt.Println("Error to remove old address: ", err.Error())
-						return routeutils.HandleAPIError(ctx, err)
-					}
-				}
+		if validationError, ok := err.(*viewmodel.ValidationError); ok {
+			if len(validationError.Errors) > 0 {
+				return routeutils.ResponseAPICustomValidationError(ctx, validationError.Message, validationError.Errors)
+			} else {
+				return routeutils.ResponseAPIServiceError(ctx, validationError.Message)
 			}
-		}
-
-		address, err = c.svc.Users.SaveAddress(address)
-		if err != nil {
-			fmt.Println("Error to save address: ", err.Error())
+		} else {
 			return routeutils.HandleAPIError(ctx, err)
 		}
-		user.Addresses = append(user.Addresses, address)
 	}
+	ride.Visit.User = user
+	ride.User = user
 
 	homeAddress := viewmodel.Address{}
 	for _, a := range visit.User.Addresses {
@@ -226,7 +153,7 @@ func (c *controller) handleRide(ctx echo.Context) error {
 			ride.Destination = newOrigin
 		}
 
-		if c.cfg.LyftProd.UserUUID != authUser.ID {
+		if authUser.Test {
 			resp, err = c.tnc.Lyft.RequestRide(ride)
 		} else {
 			fmt.Println("In Production")
@@ -340,7 +267,7 @@ func (c *controller) handleRide(ctx echo.Context) error {
 			newRide.Passenger.LastName = " "
 			newRide.Passenger.PhoneNumber = *visit.User.PhoneNumber
 
-			if c.cfg.LyftProd.UserUUID != authUser.ID {
+			if authUser.Test {
 				newRide, err = c.tnc.Lyft.RequestRide(newRide)
 			} else {
 				fmt.Println("In Production")
@@ -471,154 +398,19 @@ func (c *controller) handle(ctx echo.Context) error {
 		return routeutils.ResponseAPICustomValidationError(ctx, "visit validation failed", validationErrors)
 	}
 
-	eligibility := viewmodel.Eligibility{}
-	eligibility.Provider.ProviderNPI = provider.InternalID
-	eligibility.Provider.ProviderName = provider.OrganizatioName
-	eligibility.TrackingID = c.rangeIn(1000000, 9999999)
-	eligibility.Subscriber.SubscriberID = *visit.User.Member
-	eligibility.Subscriber.PatientType = *visit.User.Type
-	eligibility.Subscriber.Name.First = visit.User.First
-	eligibility.Subscriber.Name.Last = visit.User.Last
-	eligibility.Subscriber.DemographicInfo.DateOfBirth = *visit.User.BirthDate
-	eligibility.Subscriber.DemographicInfo.Gender = *visit.User.Gender
-	loc, _ := time.LoadLocation("America/Chicago")
-	eligibility.ServiceInfo.DateOfService = time.Now().In(loc)
-	eligibility.ServiceInfo.ServiceTypeCodes = []string{"30"}
-
-	resp, err := c.bcbsi.BXE.Get271(eligibility)
+	user, err := c.svc.Users.CheckAndCreateMember(visit.User, provider, authUser)
 	if err != nil {
-		fmt.Println("Error to get eligibility: ", err.Error())
-		return routeutils.ResponseAPIValidationError(ctx, err.Error())
-	}
-
-	user, err := c.svc.Users.GetByMemberID(*visit.User.Member)
-	if err != nil {
-		fmt.Println("Error to get user by memberID: ", err.Error())
-		return routeutils.HandleAPIError(ctx, err)
-	}
-
-	if user.ID == "" {
-		if len(user.Pass) == 0 {
-			user.Pass = c.generatePassword(8)
+		if validationError, ok := err.(*viewmodel.ValidationError); ok {
+			if len(validationError.Errors) > 0 {
+				return routeutils.ResponseAPICustomValidationError(ctx, validationError.Message, validationError.Errors)
+			} else {
+				return routeutils.ResponseAPIServiceError(ctx, validationError.Message)
+			}
 		} else {
-			pass, err := b64.StdEncoding.DecodeString(user.Pass)
-			if err != nil {
-				return routeutils.ResponseAPIAuthError(ctx, "Invalid password", false)
-			}
-			user.Pass = string(pass)
-		}
-
-		if user.BirthDate == nil || user.BirthDate.IsZero() {
-			return routeutils.ResponseAPIAuthError(ctx, "birthdate is required", false)
-		}
-
-		if user.Member == nil || len(*user.Member) == 0 {
-			return routeutils.ResponseAPIAuthError(ctx, "member is required", false)
-		}
-
-		if user.Gender == nil || len(*user.Gender) == 0 || (*user.Gender != "M" && *user.Gender != "F" && *user.Gender != "U") {
-			return routeutils.ResponseAPIAuthError(ctx, "gender is required", false)
-		}
-
-		if len(user.Name) == 0 && len(user.First) == 0 && len(user.Last) == 0 {
-			return routeutils.ResponseAPIAuthError(ctx, "name is required", false)
-		}
-
-		if len(user.First) != 0 && len(user.Last) != 0 {
-			user.Name = fmt.Sprintf("%s %s", user.First, user.Last)
-		}
-
-		if user.PhoneNumber != nil && len(*user.PhoneNumber) == 10 && !strings.Contains(*user.PhoneNumber, "+1") {
-			phoneNumber := fmt.Sprintf("+1%s", *user.PhoneNumber)
-			user.PhoneNumber = &phoneNumber
-		}
-
-		profile, err := c.svc.Profile.GetByKey("US")
-		if err != nil {
-			fmt.Println("Error to get Profile: ", err.Error())
-			return routeutils.HandleAPIError(ctx, err)
-		}
-		user.Profiles = append(user.Profiles, profile)
-
-		user, err = c.svc.Users.Create(user, authUser)
-		if err != nil {
-			fmt.Println("Error to create the user: ", err.Error())
-			return routeutils.HandleAPIError(ctx, err)
-		}
-	} else {
-		if visit.User.Email != nil && len(*visit.User.Email) > 0 {
-			user.Email = visit.User.Email
-		}
-
-		if visit.User.PhoneNumber != nil {
-			if len(*visit.User.PhoneNumber) == 10 && !strings.Contains(*visit.User.PhoneNumber, "+1") {
-				phoneNumber := fmt.Sprintf("+1%s", *visit.User.PhoneNumber)
-				visit.User.PhoneNumber = &phoneNumber
-			}
-			user.PhoneNumber = visit.User.PhoneNumber
-		}
-
-		err = c.svc.Users.UpdateLogin(user)
-		if err != nil {
-			fmt.Println("Error to update login: ", err.Error())
 			return routeutils.HandleAPIError(ctx, err)
 		}
 	}
-
-	address := viewmodel.Address{}
-	header := resp.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N3_0950
-	body := resp.Division.HealthCareEligibilityResponse.LoopHL0030[0].HL_0460[0].HL_0890[0].NM1_0920[0].N4_0960
-	zipCode := strings.TrimSpace(body.N403)
-
-	address.AddressTypeName = "Home"
-	address.AddressType = "home"
-	address.Name = fmt.Sprintf("%s, %s", header.N301, body.N401)
-	address.Address = fmt.Sprintf("%s, %s (%s)", header.N301, body.N401, zipCode)
-	address.CreatedUserUUID = authUser.ID
-	address.User = user
-	address.Type = "provider"
-
-	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)
-	}
-
-	r := &maps.GeocodingRequest{
-		Address: address.Address + " " + body.N402 + ", " + zipCode,
-	}
-
-	result, err := googleMapsAPI.Geocode(context.Background(), r)
-	if err != nil {
-		fmt.Println("Error to instantiate googles api: ", err.Error())
-		return routeutils.HandleAPIError(ctx, err)
-	}
-
-	if len(result) > 0 {
-		address.Latitude = result[0].Geometry.Location.Lat
-		address.Longitude = result[0].Geometry.Location.Lng
-	}
-
-	if address.Latitude != 0 && address.Longitude != 0 {
-		if len(user.Addresses) > 0 {
-			for _, a := range user.Addresses {
-				if a.AddressType == "home" {
-					err := c.svc.Users.RemoveAddress(a.UUID)
-					if err != nil {
-						fmt.Println("Error to remove old address: ", err.Error())
-						return routeutils.HandleAPIError(ctx, err)
-					}
-				}
-			}
-		}
-
-		address, err = c.svc.Users.SaveAddress(address)
-		if err != nil {
-			fmt.Println("Error saving address: ", err.Error())
-			return routeutils.HandleAPIError(ctx, err)
-		}
-		user.Addresses = append(user.Addresses, address)
-	}
+	visit.User = user
 
 	visit.TripType = viewmodel.TripType{
 		Key:   "no_trip",
@@ -634,7 +426,11 @@ func (c *controller) handle(ctx echo.Context) error {
 		return routeutils.HandleAPIError(ctx, err)
 	}
 
-	return routeutils.ResponseAPIOK(ctx, visit)
+	if authUser.Profiles[0].Key == "VIRPT" {
+		return routeutils.ResponseNoContent(ctx, nil)
+	} else {
+		return routeutils.ResponseAPIOK(ctx, visit)
+	}
 }
 
 func (c *controller) handleGetByID(ctx echo.Context) error {