Upstream sync

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