add: mockSMTP Server for testing; getUser func

This commit is contained in:
$(pass /github/name)
2024-08-08 09:29:49 +02:00
parent 602ac0fef0
commit c02b96e538
9 changed files with 321 additions and 187 deletions

View File

@@ -86,7 +86,7 @@ func (s *EmailService) SendWelcomeEmail(user *models.User) error {
MembershipFee float32
RentalFee float32
}{
Company: *user.Company,
Company: user.Company,
FirstName: user.FirstName,
MembershipModel: user.Membership.SubscriptionModel.Name,
MembershipID: user.Membership.ID,
@@ -121,7 +121,7 @@ func (s *EmailService) NotifyAdminOfNewUser(user *models.User) error {
RentalFee float32
MembershipFee float32
}{
Company: *user.Company,
Company: user.Company,
FirstName: user.FirstName,
LastName: user.LastName,
MembershipModel: user.Membership.SubscriptionModel.Name,

View File

@@ -1,20 +1,24 @@
package services
import (
"net/http"
"strings"
"github.com/go-playground/validator/v10"
"GoMembership/internal/constants"
"GoMembership/internal/models"
"GoMembership/internal/repositories"
"GoMembership/internal/utils"
"GoMembership/pkg/logger"
"github.com/go-playground/validator/v10"
// "crypto/rand"
// "encoding/base64"
// "golang.org/x/crypto/bcrypt"
"time"
)
type UserServiceInterface interface {
RegisterUser(user *models.User) (int64, string, error)
FindUserByEmail(email string) (*models.User, error)
GetUsers(where map[string]interface{}) (*[]models.User, error)
// AuthenticateUser(email, password string) (*models.User, error)A
VerifyUser(token *string) (*models.User, error)
}
@@ -32,7 +36,7 @@ func (service *UserService) RegisterUser(user *models.User) (int64, string, erro
*/
err := validateRegistrationData(user)
if err != nil {
return -1, "", err
return http.StatusNotAcceptable, "", err
}
user.Status = constants.UnverifiedStatus
@@ -40,27 +44,38 @@ func (service *UserService) RegisterUser(user *models.User) (int64, string, erro
user.UpdatedAt = time.Now()
id, err := service.Repo.CreateUser(user)
if err != nil {
return -1, "", err
if err != nil && strings.Contains(err.Error(), "UNIQUE constraint failed") {
return http.StatusConflict, "", err
} else if err != nil {
return http.StatusInternalServerError, "", err
}
user.ID = id
token, err := utils.GenerateVerificationToken()
if err != nil {
return -1, "", err
return http.StatusInternalServerError, "", err
}
logger.Info.Printf("TOKEN: %v", token)
_, err = service.Repo.SetVerificationToken(user, &token)
if err != nil {
return -1, "", err
return http.StatusInternalServerError, "", err
}
return id, token, nil
}
func (service *UserService) FindUserByEmail(email string) (*models.User, error) {
return service.Repo.FindUserByEmail(email)
}
func (service *UserService) GetUsers(where map[string]interface{}) (*[]models.User, error) {
return service.Repo.GetUsers(where)
}
func (service *UserService) VerifyUser(token *string) (*models.User, error) {
user, err := service.Repo.VerifyUserOfToken(token)
if err != nil {