Upstream sync

application/applicationservice/user.go

@@ -172,11 +172,6 @@ func (s *userService) UpdateLogin(user viewmodel.User) error {
 	return s.svc.Users.UpdateLogin(eUser)
 }
 
-func (s *userService) UpdateLoginPassword(user viewmodel.User) error {
-	eUser := s.mapEntity.User.ToUserEntity(user)
-	return s.svc.Users.UpdateLoginPassword(eUser)
-}
-
 func (s *userService) SaveAddress(address viewmodel.Address) (retVal viewmodel.Address, err error) {
 	entity := s.mapEntity.Address.ToAddressEntity(address)
 	entity, err = s.svc.Users.SaveAddress(entity)
@@ -265,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)
@@ -276,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())}
@@ -284,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

data/datamysql/user.go

@@ -462,22 +462,6 @@ func (c *userRepo) UpdateLogin(user entity.User) error {
 	return nil
 }
 
-func (c *userRepo) UpdateLoginPassword(user entity.User) error {
-	const (
-		query = `UPDATE			tab_login   	a
-				 INNER JOIN 	tab_user    	b
-				 ON      		a.user_id		=	b.user_id
-				 SET      		a.password     	=   sha2(?, 512)
-				 WHERE  		b.user_uuid     = 	?`
-	)
-
-	if _, err := c.conn.Exec(query, user.Pass, user.UUID); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (c *userRepo) RemoveContact(contact entity.ContactInfo) (entity.ContactInfo, error) {
 	const (
 		query = `DELETE FROM tab_contact WHERE contact_uuid = ?;`

domain/contract/repo.go

@@ -35,7 +35,6 @@ type UserRepo interface {
 	SaveContact(contact entity.ContactInfo) (entity.ContactInfo, error)
 	RemoveContact(contact entity.ContactInfo) (entity.ContactInfo, error)
 	UpdateLogin(user entity.User) error
-	UpdateLoginPassword(user entity.User) error
 }
 
 // RideRepo defines the data set for Rides

domain/service/user.go

@@ -80,10 +80,6 @@ func (s *userService) UpdateLogin(user entity.User) error {
 	return s.svc.db.Users().UpdateLogin(user)
 }
 
-func (s *userService) UpdateLoginPassword(user entity.User) error {
-	return s.svc.db.Users().UpdateLoginPassword(user)
-}
-
 // GetUsersByProfile returns a list of users by profile
 func (s *userService) GetUsersByProfile(profile string) ([]entity.User, error) {
 	return s.svc.db.Users().GetUsersByProfile(profile)

server/router/passwordresetroute/controller.go

@@ -2,7 +2,6 @@ package passwordresetroute
 
 import (
 	"crypto/sha256"
-	b64 "encoding/base64"
 	"fmt"
 	"math/rand"
 	"strings"
@@ -116,39 +115,33 @@ func (c *controller) handleResetComplete(ctx echo.Context) error {
 	}
 
 	if len(strings.TrimSpace(user.Pass)) < 1 {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "No password")
+		routeutils.ResponseAPIPasswordResetFailed(ctx, "No password")
 	}
 
-	pass, err := b64.StdEncoding.DecodeString(user.Pass)
-	if err != nil {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "Invalid password")
-	}
-	user.Pass = string(pass)
-
 	passwordResetEntry, err := c.svc.PasswordReset.GetByToken(userToken)
 	if err != nil || len(passwordResetEntry.Token) < 1 || passwordResetEntry.Expires.Before(time.Now()) || passwordResetEntry.Used == true {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "Token error")
+		routeutils.ResponseAPIPasswordResetFailed(ctx, "Token error")
 	}
 
 	fullUserData, err := c.svc.Users.GetByUUID(passwordResetEntry.User.ID, "")
 	if err != nil {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "User error")
+		routeutils.ResponseAPIPasswordResetFailed(ctx, "User problem")
 	}
 
-	fullUserData.Pass = user.Pass //user contains just password sent from reset form
-	if err = c.svc.Users.UpdateLoginPassword(fullUserData); err != nil {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "Error updating password")
-	}
+	fmt.Println(fullUserData)
+
+	//write new password in database
+	//TODO
 
 	if err := c.svc.PasswordReset.SetTokenUsed(userToken); err != nil {
-		return routeutils.ResponseAPIPasswordResetFailed(ctx, "Reset failed")
+		routeutils.ResponseAPIPasswordResetFailed(ctx, "Reset failed")
 	}
 
 	//Send email with reset link
 	notification := viewmodel.Notification{
 		Type:    applicationservice.NotificationTypeEmail,
 		From:    c.cfg.Email.Sender,
-		To:      *fullUserData.Email,
+		To:      *user.Email,
 		Subject: passwordResetCompleteEmailSubject,
 		Message: passwordResetCompleteEmailBody,
 	}

server/router/usersroute/controller.go

@@ -348,11 +348,7 @@ func (c *controller) handleMember(ctx echo.Context) error {
 		return routeutils.ResponseAPIAuthError(ctx, "phonenumber or email is required", false)
 	}
 
-	provider, err := c.svc.Provider.GetByNPI("1699849786", authUser)
-	if err != nil {
-		return routeutils.ResponseAPIAuthError(ctx, "Provider not found", false)
-	}
-
+	provider := viewmodel.ProviderResp{}
 	user, err = c.svc.Users.CheckAndCreateMember(user, provider, authUser)
 	if err != nil {
 		if validationError, ok := err.(*viewmodel.ValidationError); ok {

server/router/visitroute/controller.go

@@ -91,6 +91,10 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 	ride.Visit.Provider = provider
 
+	// user, err := c.svc.Users.GetByUUID(ride.User.ID, "US")
+	// if err != nil {
+	// 	return routeutils.HandleAPIError(ctx, err)
+	// }
 	user, err := c.svc.Users.CheckAndCreateMember(ride.Visit.User, provider, authUser)
 	if err != nil {
 		if validationError, ok := err.(*viewmodel.ValidationError); ok {
@@ -105,6 +109,7 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 	ride.Visit.User = user
 	ride.User = user
+	visit.User = user
 
 	homeAddress := viewmodel.Address{}
 	for _, a := range visit.User.Addresses {
@@ -133,9 +138,9 @@ func (c *controller) handleRide(ctx echo.Context) error {
 	}
 
 	ride.Notes = ride.Notes
-	ride.Passenger.FirstName = visit.User.First
+	ride.Passenger.FirstName = ride.Visit.User.First
 	ride.Passenger.LastName = " "
-	ride.Passenger.PhoneNumber = *visit.User.PhoneNumber
+	ride.Passenger.PhoneNumber = *ride.Visit.User.PhoneNumber
 	ride.RideType = "lyft"
 	ride.VisitDate = &visit.VisitDatetime
 	ride.VisitTime = &visit.VisitDatetime