fix(quality): extract logic from database layer

service/auth.go

@@ -88,7 +88,7 @@ func NewAuthServiceImpl(dbAuth db.AuthDb, randomGenerator RandomService, clock C
 }
 
 func (service AuthServiceImpl) SignIn(email string, password string) (*Session, error) {
-	user, err := service.dbAuth.GetUser(email)
+	user, err := service.dbAuth.GetUserByEmail(email)
 	if err != nil {
 		if errors.Is(err, db.ErrNotFound) {
 			return nil, ErrInvaidCredentials
@@ -170,27 +170,34 @@ func (service AuthServiceImpl) SignUp(email string, password string) (*User, err
 }
 
 func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email string) {
-	var token string
 
-	token, err := service.dbAuth.GetEmailVerificationToken(userId)
+	tokens, err := service.dbAuth.GetTokensByUserIdAndType(userId, db.TokenTypeEmailVerify)
 	if err != nil {
 		return
 	}
 
-	if token == "" {
-		token, err := service.randomGenerator.String(32)
+	var token *db.Token
+
+	if len(tokens) > 0 {
+		token = tokens[0]
+	}
+
+	if token == nil {
+		newTokenStr, err := service.randomGenerator.String(32)
 		if err != nil {
 			return
 		}
 
-		err = service.dbAuth.InsertEmailVerificationToken(userId, token)
+		token = db.NewToken(userId, newTokenStr, db.TokenTypeEmailVerify, service.clock.Now(), service.clock.Now().Add(24*time.Hour))
+
+		err = service.dbAuth.InsertToken(token)
 		if err != nil {
 			return
 		}
 	}
 
 	var w strings.Builder
-	err = mailTemplate.Register(service.serverSettings.BaseUrl, token).Render(context.Background(), &w)
+	err = mailTemplate.Register(service.serverSettings.BaseUrl, token.Token).Render(context.Background(), &w)
 	if err != nil {
 		utils.LogError("Could not render welcome email", err)
 		return
@@ -199,13 +206,42 @@ func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email stri
 	service.mailService.SendMail(email, "Welcome to ME-FIT", w.String())
 }
 
-func (service AuthServiceImpl) VerifyUserEmail(token string) error {
+func (service AuthServiceImpl) VerifyUserEmail(tokenStr string) error {
 
-	if token == "" {
+	if tokenStr == "" {
 		return types.ErrInternal
 	}
 
-	return service.dbAuth.VerifyEmail(token)
+	token, err := service.dbAuth.GetToken(tokenStr)
+	if err != nil {
+		return types.ErrInternal
+	}
+
+	user, err := service.dbAuth.GetUser(token.UserId)
+	if err != nil {
+		return types.ErrInternal
+	}
+
+	if token.Type != db.TokenTypeEmailVerify {
+		return types.ErrInternal
+	}
+
+	now := service.clock.Now()
+
+	if token.ExpiresAt.Before(now) {
+		return types.ErrInternal
+	}
+
+	user.EmailVerified = true
+	user.EmailVerifiedAt = &now
+
+	err = service.dbAuth.UpdateUser(user)
+	if err != nil {
+		return types.ErrInternal
+	}
+
+	_ = service.dbAuth.DeleteToken(token.Token)
+	return nil
 }
 
 func (service AuthServiceImpl) SignOut(sessionId string) error {
@@ -223,7 +259,7 @@ func (service AuthServiceImpl) GetUserFromSessionId(sessionId string) (*User, er
 		return nil, types.ErrInternal
 	}
 
-	user, err := service.dbAuth.GetUserById(session.UserId)
+	user, err := service.dbAuth.GetUser(session.UserId)
 	if err != nil {
 		return nil, types.ErrInternal
 	}
@@ -273,7 +309,7 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
 		return err
 	}
 
-	userDb, err := service.dbAuth.GetUserById(user.Id)
+	userDb, err := service.dbAuth.GetUser(user.Id)
 	if err != nil {
 		return err
 	}
@@ -292,23 +328,35 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
 
 func (service AuthServiceImpl) ForgotPassword(email string) error {
 
-	token, err := service.randomGenerator.String(32)
+	tokenStr, err := service.randomGenerator.String(32)
 	if err != nil {
 		return err
 	}
 
-	err = service.dbAuth.InsertForgotPasswordToken(email, token)
-
-	if err != db.ErrNotFound {
-		var mail strings.Builder
-		err = mailTemplate.ResetPassword(service.serverSettings.BaseUrl, token).Render(context.Background(), &mail)
-		if err != nil {
-			utils.LogError("Could not render reset password email", err)
+	user, err := service.dbAuth.GetUserByEmail(email)
+	if err != nil {
+		if err == db.ErrNotFound {
+			return nil
+		} else {
 			return types.ErrInternal
 		}
-		go service.mailService.SendMail(email, "Reset Password", mail.String())
 	}
 
+	token := db.NewToken(user.Id, tokenStr, db.TokenTypePasswordReset, service.clock.Now(), service.clock.Now().Add(15*time.Minute))
+
+	err = service.dbAuth.InsertToken(token)
+	if err != nil {
+		return types.ErrInternal
+	}
+
+	var mail strings.Builder
+	err = mailTemplate.ResetPassword(service.serverSettings.BaseUrl, token.Token).Render(context.Background(), &mail)
+	if err != nil {
+		utils.LogError("Could not render reset password email", err)
+		return types.ErrInternal
+	}
+	go service.mailService.SendMail(email, "Reset Password", mail.String())
+
 	return nil
 }
 
@@ -328,7 +376,7 @@ func (service AuthServiceImpl) ForgotPasswordResponse(tokenStr string, newPass s
 		return err
 	}
 
-	user, err := service.dbAuth.GetUserById(token.UserId)
+	user, err := service.dbAuth.GetUser(token.UserId)
 	if err != nil {
 		utils.LogError("Could not get user from token", err)
 		return types.ErrInternal