Upstream sync

application/applicationservice/applicationservice.go

@@ -17,15 +17,16 @@ var (
 
 // Service holds the domain service repositories
 type Service struct {
-	Users        *userService
-	Rides        *rideService
-	Visits       *visitService
-	Provider     *providerService
-	Notification *notificationService
-	Profile      *profileService
-	Organization *organizationService
-	Zipcodes     *zipcodeService
-	Plan         *planService
+	Users         *userService
+	Rides         *rideService
+	Visits        *visitService
+	Provider      *providerService
+	Notification  *notificationService
+	Profile       *profileService
+	Organization  *organizationService
+	Zipcodes      *zipcodeService
+	Plan          *planService
+	PasswordReset *passwordResetService
 }
 
 // New returns a new domain Service instance
@@ -34,15 +35,16 @@ func New(svc *service.Service, mapper *entitymapping.Mapper, notification *notif
 		bcbsi := bcbsi.New(cfg)
 
 		instance = &Service{
-			Users:        newUserService(svc, mapper, bcbsi, cfg),
-			Rides:        newRideService(svc, mapper),
-			Visits:       newVisitService(svc, mapper),
-			Provider:     newProviderService(svc, mapper),
-			Notification: newNotificationService(svc, mapper, notification, cfg),
-			Profile:      newProfileService(svc, mapper),
-			Organization: newOrganizationService(svc, mapper),
-			Zipcodes:     newZipcodeService(svc, mapper),
-			Plan:         newPlanService(svc, mapper),
+			Users:         newUserService(svc, mapper, bcbsi, cfg),
+			Rides:         newRideService(svc, mapper),
+			Visits:        newVisitService(svc, mapper),
+			Provider:      newProviderService(svc, mapper),
+			Notification:  newNotificationService(svc, mapper, notification, cfg),
+			Profile:       newProfileService(svc, mapper),
+			Organization:  newOrganizationService(svc, mapper),
+			Zipcodes:      newZipcodeService(svc, mapper),
+			Plan:          newPlanService(svc, mapper),
+			PasswordReset: newPasswordResetService(svc, mapper),
 		}
 	})
 

application/applicationservice/user.go

@@ -77,6 +77,16 @@ func (s *userService) GetByMemberID(memberID string) (retVal viewmodel.User, err
 	return s.mapEntity.User.ToUserModel(user), nil
 }
 
+// GetByEmail returns a specific user by its email
+func (s *userService) GetByEmail(email string) (retVal viewmodel.User, err error) {
+	user, err := s.svc.Users.GetByEmail(email)
+	if err != nil {
+		return retVal, errors.Wrap(err)
+	}
+
+	return s.mapEntity.User.ToUserModel(user), nil
+}
+
 // Login returns a specific user by email and pass
 func (s *userService) FullLogin(loginType string, key string, pass string, profile string) (retVal viewmodel.User, err error) {
 	user, err := s.svc.Users.FullLogin(loginType, key, pass, profile)
@@ -250,6 +260,10 @@ func (s *userService) CheckAndCreateMember(user viewmodel.User, provider viewmod
 		}
 	}
 
+	if entityUser.UUID == "" {
+		entityUser = s.mapEntity.User.ToUserEntity(user)
+	}
+
 	var eligibility viewmodel.Eligibility
 	loc, _ := time.LoadLocation("America/Chicago")
 	eligibility.TrackingID = s.rangeIn(1000000, 9999999)
@@ -261,7 +275,7 @@ func (s *userService) CheckAndCreateMember(user viewmodel.User, provider viewmod
 		if err != nil {
 			return viewmodel.User{}, &viewmodel.ValidationError{Message: fmt.Sprintf("Error finding provider by UUID: %s", err.Error())}
 		}
-	} else {
+	} else if entityProvider.InternalID != "" {
 		entityProvider, err = s.svc.Provider.GetByNPI(entityProvider.InternalID, entityAuthorUser)
 		if err != nil {
 			return viewmodel.User{}, &viewmodel.ValidationError{Message: fmt.Sprintf("Error finding provider by NPI: %s", err.Error())}
@@ -269,7 +283,8 @@ func (s *userService) CheckAndCreateMember(user viewmodel.User, provider viewmod
 	}
 
 	if entityProvider.InternalID == "" {
-		return viewmodel.User{}, &viewmodel.ValidationError{Message: "Provider not found"}
+		eligibility.Provider.ProviderNPI = "1699849786"
+		eligibility.Provider.ProviderName = "LITHOLINK CORPORATION"
 	} else {
 		eligibility.Provider.ProviderNPI = entityProvider.InternalID
 		eligibility.Provider.ProviderName = entityProvider.OrganizatioName

application/entitymapping/entitymapping.go

@@ -13,16 +13,17 @@ var (
 
 // Mapper has mapping methods to map entities to view models
 type Mapper struct {
-	User         *userMapping
-	Ride         *rideMapping
-	Visit        *visitMapping
-	Address      *addressMapping
-	Provider     *providerMapping
-	Notification *notificationMapping
-	Profile      *profileMapping
-	Organization *organizationMapping
-	Zipcode      *zipcodeMapping
-	Plan         *planMapping
+	User          *userMapping
+	Ride          *rideMapping
+	Visit         *visitMapping
+	Address       *addressMapping
+	Provider      *providerMapping
+	Notification  *notificationMapping
+	Profile       *profileMapping
+	Organization  *organizationMapping
+	Zipcode       *zipcodeMapping
+	Plan          *planMapping
+	PasswordReset *passwordResetMapping
 }
 
 // New returns an EntityMapper for fluent mapping
@@ -40,6 +41,7 @@ func New() *Mapper {
 		instance.Organization = &organizationMapping{instance}
 		instance.Zipcode = &zipcodeMapping{instance}
 		instance.Plan = &planMapping{instance}
+		instance.PasswordReset = &passwordResetMapping{instance}
 	})
 
 	return instance