refactoring db; added email-verification

internal/services/email_service.go

@@ -53,14 +53,43 @@ func ParseTemplate(filename string, data interface{}) (string, error) {
 
 	return tplBuffer.String(), nil
 }
-func (s *EmailService) SendWelcomeEmail(user *models.User) error {
+
+func (s *EmailService) SendVerificationEmail(user *models.User, token *string) error {
 	// Prepare data to be injected into the template
 	data := struct {
 		FirstName string
 		LastName  string
+		Token     string
 	}{
 		FirstName: user.FirstName,
 		LastName:  user.LastName,
+		Token:     *token,
+	}
+
+	subject := "Nur noch ein kleiner Schritt!"
+	body, err := ParseTemplate("mail_verification.html", data)
+	if err != nil {
+		logger.Error.Print("Couldn't send verification mail")
+		return err
+	}
+	return s.SendEmail(user.Email, subject, body)
+
+}
+
+func (s *EmailService) SendWelcomeEmail(user *models.User, membership *models.Membership) error {
+	// Prepare data to be injected into the template
+	data := struct {
+		FirstName       string
+		MembershipModel string
+		MembershipID    int64
+		MembershipFee   float32
+		RentalFee       float32
+	}{
+		FirstName:       user.FirstName,
+		MembershipModel: membership.Model,
+		MembershipID:    membership.ID,
+		MembershipFee:   float32(membership.MonthlyFee),
+		RentalFee:       float32(membership.RentalFee),
 	}
 
 	subject := "Willkommen beim Dörpsmobil Hasloh e.V."

internal/services/membership_service.go

@@ -0,0 +1,29 @@
+package services
+
+import (
+	"GoMembership/internal/models"
+	"GoMembership/internal/repositories"
+	"time"
+)
+
+type MembershipService interface {
+	RegisterMembership(membership *models.Membership) (int64, error)
+	FindMembershipByUserID(userID int64) (*models.Membership, error)
+}
+
+type membershipService struct {
+	repo repositories.MembershipRepository
+}
+
+func NewMembershipService(repo repositories.MembershipRepository) MembershipService {
+	return &membershipService{repo}
+}
+
+func (service *membershipService) RegisterMembership(membership *models.Membership) (int64, error) {
+	membership.StartDate = time.Now()
+	return service.repo.CreateMembership(membership)
+}
+
+func (service *membershipService) FindMembershipByUserID(userID int64) (*models.Membership, error) {
+	return service.repo.FindMembershipByUserID(userID)
+}

internal/services/user_service.go

@@ -3,7 +3,9 @@ package services
 import (
 	"GoMembership/internal/models"
 	"GoMembership/internal/repositories"
-	// "GoMembership/pkg/errors"
+	"GoMembership/internal/utils"
+	"GoMembership/pkg/logger"
+
 	// "crypto/rand"
 	// "encoding/base64"
 	// "golang.org/x/crypto/bcrypt"
@@ -11,8 +13,9 @@ import (
 )
 
 type UserService interface {
-	RegisterUser(user *models.User) (int64, error)
-	// AuthenticateUser(email, password string) (*models.User, error)
+	RegisterUser(user *models.User) (int64, string, error)
+	// AuthenticateUser(email, password string) (*models.User, error)A
+	VerifyUser(token *string) (*models.User, error)
 }
 
 type userService struct {
@@ -23,7 +26,7 @@ func NewUserService(repo repositories.UserRepository) UserService {
 	return &userService{repo}
 }
 
-func (service *userService) RegisterUser(user *models.User) (int64, error) {
+func (service *userService) RegisterUser(user *models.User) (int64, string, error) {
 	/* salt := make([]byte, 16)
 	if _, err := rand.Read(salt); err != nil {
 		return -1, err
@@ -35,16 +38,45 @@ func (service *userService) RegisterUser(user *models.User) (int64, error) {
 		return -1, err
 	}
 	user.Password = string(hashedPassword) */
-	user.Password = ""
+	user.Status = "unverified"
 	user.CreatedAt = time.Now()
 	user.UpdatedAt = time.Now()
-	return service.repo.CreateUser(user)
+	id, err := service.repo.CreateUser(user)
+	if err != nil {
+		return -1, "", err
+	}
+	user.ID = id
+
+	token, err := utils.GenerateVerificationToken()
+	if err != nil {
+		return -1, "", err
+	}
+
+	logger.Info.Printf("user: %+v", user)
+	_, err = service.repo.SetVerificationToken(user, &token)
+	if err != nil {
+		return -1, "", err
+	}
+	return id, token, nil
+}
+
+func (service *userService) VerifyUser(token *string) (*models.User, error) {
+	userID, err := service.repo.VerifyUserOfToken(token)
+	if err != nil {
+		return nil, err
+	}
+	user, err := service.repo.FindUserByID(userID)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
 }
 
 /* func HashPassword(password string, salt string) (string, error) {
 	saltedPassword := password + salt
 	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(saltedPassword), bcrypt.DefaultCost)
 	if err != nil {
+
 		return "", err
 	}
 	return base64.StdEncoding.EncodeToString(hashedPassword), nil