From d8115f512d4afbb205e8bfac1cc1313d878f30e5 Mon Sep 17 00:00:00 2001
From: "$(pass /github/name)" <$(pass /github/email)>
Date: Fri, 12 Jul 2024 13:35:35 +0200
Subject: [PATCH] fix:admin Notification mail sending;typo in template

---
 internal/controllers/user_controller.go |  9 +--------
 internal/services/email_service.go      | 12 ++++++------
 templates/email/mail_registration.html  |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/internal/controllers/user_controller.go b/internal/controllers/user_controller.go
index 277a6a6..7e58fec 100644
--- a/internal/controllers/user_controller.go
+++ b/internal/controllers/user_controller.go
@@ -107,14 +107,7 @@ func (uc *UserController) VerifyMailHandler(c *gin.Context) {
 		return
 	}
 
-	membership, err := uc.MembershipService.FindMembershipByUserID(user.ID)
-	if err != nil {
-		logger.Error.Printf("Cannot get membership of user %v: %v", user.ID, err)
-		c.HTML(http.StatusInternalServerError, "verifiction_error.html", gin.H{"ErrorMessage": "Nutzer konnte nicht gefunden werden.. Merkwürdig.. wende Dich bitte an info@carsharing-hasloh.de."})
-		return
-	}
-
-	uc.EmailService.SendWelcomeEmail(user, membership)
+	uc.EmailService.SendWelcomeEmail(user)
 	c.HTML(http.StatusOK, "verification_success.html", gin.H{"FirstName": user.FirstName})
 
 }
diff --git a/internal/services/email_service.go b/internal/services/email_service.go
index fd48d9c..61c8800 100644
--- a/internal/services/email_service.go
+++ b/internal/services/email_service.go
@@ -76,7 +76,7 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e
 
 }
 
-func (s *EmailService) SendWelcomeEmail(user *models.User, membership *models.Membership) error {
+func (s *EmailService) SendWelcomeEmail(user *models.User) error {
 	// Prepare data to be injected into the template
 	data := struct {
 		FirstName       string
@@ -86,10 +86,10 @@ func (s *EmailService) SendWelcomeEmail(user *models.User, membership *models.Me
 		RentalFee       float32
 	}{
 		FirstName:       user.FirstName,
-		MembershipModel: membership.SubscriptionModel.Name,
-		MembershipID:    membership.ID,
-		MembershipFee:   float32(membership.SubscriptionModel.MonthlyFee),
-		RentalFee:       float32(membership.SubscriptionModel.HourlyRate),
+		MembershipModel: user.Membership.SubscriptionModel.Name,
+		MembershipID:    user.Membership.ID,
+		MembershipFee:   float32(user.Membership.SubscriptionModel.MonthlyFee),
+		RentalFee:       float32(user.Membership.SubscriptionModel.HourlyRate),
 	}
 
 	subject := "Willkommen beim Dörpsmobil Hasloh e.V."
@@ -139,5 +139,5 @@ func (s *EmailService) NotifyAdminOfNewUser(user *models.User) error {
 		logger.Error.Print("Couldn't send admin notification mail")
 		return err
 	}
-	return s.SendEmail(user.Email, subject, body)
+	return s.SendEmail(config.LoadConfig().SMTP.AdminEmail, subject, body)
 }
diff --git a/templates/email/mail_registration.html b/templates/email/mail_registration.html
index 37f26b7..cfcaa49 100644
--- a/templates/email/mail_registration.html
+++ b/templates/email/mail_registration.html
@@ -77,7 +77,7 @@
                     </ul>
                   </li>
                   <li><strong>Name:</strong> {{.FirstName}} {{.LastName}}</li>
-                  <li><strong>Mitgliedsname:</strong> {{.MembershipID}}</li>
+                  <li><strong>Mitgliedsnr:</strong> {{.MembershipID}}</li>
                   <li>
                     <strong>Adresse:</strong> {{.Address}},{{.ZipCode}}
                     {{.City}}