moved subscriptions and licences requests to subpages & renaming

frontend/src/app.d.ts

@@ -30,7 +30,7 @@ interface BankAccount {
   mandate_reference: string | "";
 }
 
-interface DriversLicence {
+interface Licence {
   id: number | -1;
   status: number | -1;
   licence_number: string | "";
@@ -63,7 +63,7 @@ interface User {
   payment_status: number | -1;
   membership: Membership;
   bank_account: BankAccount;
-  drivers_licence: DriversLicence;
+  licence: Licence;
   notes: string | "";
 }
 
@@ -72,6 +72,7 @@ declare global {
     // interface Error {}
     interface Locals {
       user: User;
+      users: User[];
       subscriptions: Subscription[];
       licence_categories: LicenceCategory[];
     }

frontend/src/hooks.server.js

@@ -25,7 +25,6 @@ export async function handle({ event, resolve }) {
     event.cookies.delete("jwt", { path: "/" });
     return await resolve(event);
   }
-  // find the user based on the jwt
 
   const data = await response.json();
 
@@ -62,13 +61,13 @@ export async function handle({ event, resolve }) {
         event.locals.user.membership.end_date.split("T")[0];
     }
   }
-  if (event.locals.user.drivers_licence?.issued_date) {
+  if (event.locals.user.licence?.issued_date) {
-    event.locals.user.drivers_licence.issued_date =
+    event.locals.user.licence.issued_date =
-      event.locals.user.drivers_licence.issued_date.split("T")[0];
+      event.locals.user.licence.issued_date.split("T")[0];
   }
-  if (event.locals.user.drivers_licence?.expiration_date) {
+  if (event.locals.user.licence?.expiration_date) {
-    event.locals.user.drivers_licence.expiration_date =
+    event.locals.user.licence.expiration_date =
-      event.locals.user.drivers_licence.expiration_date.split("T")[0];
+      event.locals.user.licence.expiration_date.split("T")[0];
   }
   if (
     event.locals.user.bank_account &&

frontend/src/lib/components/InputField.svelte

@@ -106,7 +106,7 @@
       case "licence_number":
         return typeof value === "string" && value.length == 11
           ? null
-          : $t("validation.drivers_licence");
+          : $t("validation.licence");
 
       default:
         return typeof value === "string" && !value.trim() && required

frontend/src/lib/components/UserEditForm.svelte

@@ -1,12 +1,9 @@
 <script>
   import InputField from "$lib/components/InputField.svelte";
   import SmallLoader from "$lib/components/SmallLoader.svelte";
-  import { onMount } from "svelte";
   import { applyAction, enhance } from "$app/forms";
-  import { page } from "$app/stores";
   import { receive, send } from "$lib/utils/helpers";
   import { t } from "svelte-i18n";
-  import { fly } from "svelte/transition";
 
   /** @type {import('../../routes/auth/about/[id]/$types').ActionData} */
   export let form;
@@ -88,10 +85,6 @@
       );
   }
 
-  onMount(() => {
-    console.dir(user);
-  });
-
   /**
    * Sets the active tab
    * @param {string} tab - The tab to set as active
@@ -277,14 +270,14 @@
       name="licence_status"
       type="select"
       label={$t("status")}
-      bind:value={user.drivers_licence.status}
+      bind:value={user.licence.status}
       options={licenceStatusOptions}
     />
     <InputField
       name="licence_number"
       type="text"
       label={$t("licence_number")}
-      bind:value={user.drivers_licence.licence_number}
+      bind:value={user.licence.licence_number}
       placeholder={$t("placeholder.licence_number")}
       toUpperCase={true}
     />
@@ -292,20 +285,20 @@
       name="issued_date"
       type="date"
       label={$t("issued_date")}
-      bind:value={user.drivers_licence.issued_date}
+      bind:value={user.licence.issued_date}
       placeholder={$t("placeholder.issued_date")}
     />
     <InputField
       name="expiration_date"
       type="date"
       label={$t("expiration_date")}
-      bind:value={user.drivers_licence.expiration_date}
+      bind:value={user.licence.expiration_date}
       placeholder={$t("placeholder.expiration_date")}
     />
     <InputField
       name="country"
       label={$t("country")}
-      bind:value={user.drivers_licence.country}
+      bind:value={user.licence.country}
       placeholder={$t("placeholder.issuing_country")}
     />
     <div class="licence-categories">
@@ -323,8 +316,8 @@
                   name="licence_categories[]"
                   value={JSON.stringify(category)}
                   label={category.category}
-                  checked={user.drivers_licence.licence_categories != null &&
+                  checked={user.licence.licence_categories != null &&
-                    user.drivers_licence.licence_categories.some(
+                    user.licence.licence_categories.some(
                       (cat) => cat.category === category.category
                     )}
                 />

frontend/src/lib/locales/de.js

@@ -44,7 +44,7 @@ export default {
     iban: "Ungültige IBAN",
     date: "Bitte geben Sie ein Datum ein",
     email: "Ungültige Emailadresse",
-    drivers_licence: "Nummer zu kurz(11 Zeichen)",
+    licence: "Nummer zu kurz(11 Zeichen)",
   },
   server: {
     error: {

frontend/src/routes/+layout.js

@@ -1,5 +1,5 @@
 /** @type {import('./$types').LayoutLoad} */
 export async function load({ fetch, url, data }) {
-  const { user, subscriptions, licence_categories } = data;
+  const { user } = data;
-  return { fetch, url: url.pathname, user, subscriptions, licence_categories };
+  return { fetch, url: url.pathname, user };
 }

frontend/src/routes/+layout.server.js

@@ -2,7 +2,5 @@
 export async function load({ locals }) {
   return {
     user: locals.user,
-    subscriptions: locals.subscriptions,
-    licence_categories: locals.licence_categories,
   };
 }

frontend/src/routes/auth/about/[id]/+layout.js

@@ -0,0 +1,5 @@
+/** @type {import('./$types').LayoutLoad} */
+export async function load({ fetch, url, data }) {
+  const { user, subscriptions, licence_categories } = data;
+  return { fetch, url: url.pathname, user, subscriptions, licence_categories };
+}

frontend/src/routes/auth/about/[id]/+layout.server.js

@@ -0,0 +1,66 @@
+import { BASE_API_URI } from "$lib/utils/constants";
+
+/** @type {import('./$types').LayoutServerLoad} */
+export async function load({ cookies, fetch, locals }) {
+  const jwt = cookies.get("jwt");
+  try {
+    // Fetch user data, subscriptions, and licence categories in parallel
+    const [subscriptionsResponse, licenceCategoriesResponse] =
+      await Promise.all([
+        fetch(`${BASE_API_URI}/backend/membership/subscriptions`, {
+          credentials: "include",
+          headers: { Cookie: `jwt=${jwt}` },
+        }),
+        fetch(`${BASE_API_URI}/backend/licence/categories`, {
+          credentials: "include",
+          headers: { Cookie: `jwt=${jwt}` },
+        }),
+      ]);
+
+    // Check if any of the responses are not ok
+    if (!subscriptionsResponse.ok || !licenceCategoriesResponse.ok) {
+      cookies.delete("jwt", { path: "/" });
+      throw new Error("One or more API requests failed");
+    }
+
+    // Parse the JSON responses
+    const [subscriptionsData, licence_categoriesData] = await Promise.all([
+      subscriptionsResponse.json(),
+      licenceCategoriesResponse.json(),
+    ]);
+    // Check if the server sent a new token
+    const newToken =
+      subscriptionsResponse.headers.get("Set-Cookie") == null
+        ? licenceCategoriesResponse.headers.get("Set-Cookie")
+        : subscriptionsResponse.headers.get("Set-Cookie");
+
+    if (newToken) {
+      const match = newToken.match(/jwt=([^;]+)/);
+      if (match) {
+        cookies.set("jwt", match[1], {
+          path: "/",
+          httpOnly: true,
+          secure: process.env.NODE_ENV === "production", // Secure in production
+          sameSite: "lax",
+          maxAge: 5 * 24 * 60 * 60, // 5 days in seconds
+        });
+      }
+    }
+    console.dir(subscriptionsData);
+    console.dir(licence_categoriesData);
+    return {
+      user: locals.user,
+      subscriptions: subscriptionsData.subscriptions,
+      licence_categories: licence_categoriesData.licence_categories,
+    };
+  } catch (error) {
+    console.error("Error fetching data:", error);
+    // In case of any error, clear the JWT cookie
+    cookies.delete("jwt", { path: "/" });
+    return {
+      user: locals.user,
+      subscriptions: null,
+      licence_categories: null,
+    };
+  }
+}

frontend/src/routes/auth/about/[id]/+page.server.js

@@ -72,7 +72,7 @@ export const actions = {
         bic: String(formData.get("bic")),
         mandate_reference: String(formData.get("mandate_reference")),
       },
-      drivers_licence: {
+      licence: {
         id: Number(formData.get("drivers_licence_id")),
         status: Number(formData.get("licence_status")),
         licence_number: String(formData.get("licence_number")),
@@ -128,13 +128,13 @@ export const actions = {
       locals.user.bank_account.mandate_date_signed =
         locals.user.bank_account.mandate_date_signed.split("T")[0];
     }
-    if (locals.user.drivers_licence?.issued_date) {
+    if (locals.user.licence?.issued_date) {
-      locals.user.drivers_licence.issued_date =
+      locals.user.licence.issued_date =
-        locals.user.drivers_licence.issued_date.split("T")[0];
+        locals.user.licence.issued_date.split("T")[0];
     }
-    if (locals.user.drivers_licence?.expiration_date) {
+    if (locals.user.licence?.expiration_date) {
-      locals.user.drivers_licence.expiration_date =
+      locals.user.licence.expiration_date =
-        locals.user.drivers_licence.expiration_date.split("T")[0];
+        locals.user.licence.expiration_date.split("T")[0];
     }
     throw redirect(303, `/auth/about/${response.id}`);
   },

frontend/src/routes/auth/about/[id]/+page.svelte

@@ -12,14 +12,7 @@
   /** @type {import('./$types').ActionData} */
   export let form;
 
-  /** @type {App.Locals['subscriptions']}*/
+  $: ({ user, subscriptions, licence_categories } = $page.data);
-  $: subscriptions = $page.data.subscriptions;
-
-  /** @type {App.Locals['user']}*/
-  $: user = $page.data.user;
-
-  /** @type {App.Locals['licence_categories']} */
-  $: licence_categories = $page.data.licence_categories;
 
   let showModal = false;
 
@@ -110,89 +103,6 @@
 {/if}
 
 <style>
-  .category-break {
-    grid-column: 1 / -1;
-    height: 1px;
-    background-color: #ccc;
-    margin-top: 10px;
-    margin-left: 20%;
-    width: 60%;
-    opacity: 0.4;
-  }
-
-  .licence-categories {
-    margin-bottom: 20px;
-  }
-
-  .checkbox-grid {
-    display: grid;
-    grid-template-columns: 1fr;
-    gap: 0px;
-  }
-
-  .checkbox-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .checkbox-label-container {
-    flex: 0 0 auto;
-    width: 4em;
-    margin-right: 5px;
-  }
-
-  .checkbox-description {
-    flex: 1;
-    font-size: 15px;
-    color: #9b9b9b;
-    margin-left: 10px;
-  }
-
-  @media (min-width: 768px) {
-    .checkbox-grid {
-      grid-template-columns: 1fr 1fr;
-      gap: 0px;
-    }
-  }
-
-  @media (max-width: 480px) {
-    .checkbox-item {
-      flex-direction: column;
-      align-items: flex-start;
-    }
-
-    .checkbox-description {
-      margin-left: 24px;
-      margin-top: 5px;
-      text-align: left;
-    }
-  }
-  .subscription-info {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 1rem;
-    margin-top: 1rem;
-    font-size: 0.9rem;
-  }
-
-  .subscription-column {
-    flex: 1;
-    min-width: 200px;
-  }
-
-  .subscription-column p {
-    margin: 0.5rem 0;
-  }
-
-  .subscription-column strong {
-    display: inline-block;
-    min-width: 100px;
-  }
-  .tab-content {
-    padding: 1rem;
-    border-radius: 0 0 3px 3px;
-  }
   .hero-container .hero-subtitle:not(:last-of-type) {
     margin: 0 0 0 0;
   }
@@ -247,25 +157,4 @@
   .value {
     font-size: 1.1rem;
   }
-
-  .button-container {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    gap: 10px;
-    margin-top: 1rem;
-    width: 100%;
-  }
-
-  .button-container button {
-    flex: 1 1 0;
-    min-width: 120px;
-    max-width: calc(50%-5px);
-  }
-  @media (max-width: 480px) {
-    .button-container button {
-      flex-basis: 100%;
-      max-width: none;
-    }
-  }
 </style>

internal/controllers/controllers_test.go

@@ -99,13 +99,13 @@ func TestSuite(t *testing.T) {
 	var subscriptionRepo repositories.SubscriptionModelsRepositoryInterface = &repositories.SubscriptionModelsRepository{}
 	membershipService := &services.MembershipService{Repo: membershipRepo, SubscriptionRepo: subscriptionRepo}
 
-	var licenceRepo repositories.DriversLicenceInterface = &repositories.DriversLicenceRepository{}
+	var licenceRepo repositories.LicenceInterface = &repositories.LicenceRepository{}
 	var userRepo repositories.UserRepositoryInterface = &repositories.UserRepository{}
 	userService := &services.UserService{Repo: userRepo, Licences: licenceRepo}
 
-	driversLicenceService := &services.DriversLicenceService{Repo: licenceRepo}
+	licenceService := &services.LicenceService{Repo: licenceRepo}
 
-	Uc = &UserController{Service: userService, DriversLicenceService: driversLicenceService, EmailService: emailService, ConsentService: consentService, BankAccountService: bankAccountService, MembershipService: membershipService}
+	Uc = &UserController{Service: userService, LicenceService: licenceService, EmailService: emailService, ConsentService: consentService, BankAccountService: bankAccountService, MembershipService: membershipService}
 	Mc = &MembershipController{Service: *membershipService}
 	Cc = &ContactController{EmailService: emailService}
 
@@ -147,23 +147,23 @@ func TestSuite(t *testing.T) {
 }
 
 func initLicenceCategories() error {
-	categories := []models.LicenceCategory{
+	categories := []models.Category{
-		{Category: "AM"},
+		{Name: "AM"},
-		{Category: "A1"},
+		{Name: "A1"},
-		{Category: "A2"},
+		{Name: "A2"},
-		{Category: "A"},
+		{Name: "A"},
-		{Category: "B"},
+		{Name: "B"},
-		{Category: "C1"},
+		{Name: "C1"},
-		{Category: "C"},
+		{Name: "C"},
-		{Category: "D1"},
+		{Name: "D1"},
-		{Category: "D"},
+		{Name: "D"},
-		{Category: "BE"},
+		{Name: "BE"},
-		{Category: "C1E"},
+		{Name: "C1E"},
-		{Category: "CE"},
+		{Name: "CE"},
-		{Category: "D1E"},
+		{Name: "D1E"},
-		{Category: "DE"},
+		{Name: "DE"},
-		{Category: "T"},
+		{Name: "T"},
-		{Category: "L"},
+		{Name: "L"},
 	}
 	for _, category := range categories {
 		result := database.DB.Create(&category)
@@ -258,7 +258,7 @@ func getBaseUser() models.User {
 		Phone:          "01738484993",
 		BankAccount:    models.BankAccount{IBAN: "DE89370400440532013000"},
 		Membership:     models.Membership{SubscriptionModel: models.SubscriptionModel{Name: "Basic"}},
-		DriversLicence: models.DriversLicence{},
+		Licence:        models.Licence{},
 		ProfilePicture: "",
 		Password:       "password123",
 		Company:        "",

internal/controllers/licenceController.go

@@ -0,0 +1,31 @@
+package controllers
+
+import (
+	"GoMembership/internal/services"
+	"GoMembership/pkg/logger"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+type LicenceController struct {
+	Service services.LicenceService
+}
+
+func (lc *LicenceController) GetAllCategories(c *gin.Context) {
+
+	categories, err := lc.Service.GetAllCategories()
+
+	if err != nil {
+		logger.Error.Printf("Error retrieving licence categories: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"errors": []gin.H{{
+			"field": "general",
+			"key":   "validation.internal_server_error",
+		}}})
+		return
+	}
+	logger.Error.Printf("categories: %v", categories)
+	c.JSON(http.StatusOK, gin.H{
+		"licence_categories": categories,
+	})
+}

internal/controllers/membershipController.go

@@ -46,3 +46,19 @@ func (mc *MembershipController) RegisterSubscription(c *gin.Context) {
 		"id":     id,
 	})
 }
+
+func (mc *MembershipController) GetSubscriptions(c *gin.Context) {
+	subscriptions, err := mc.Service.GetSubscriptions(nil)
+	if err != nil {
+		logger.Error.Printf("Error retrieving subscriptions: %v", err)
+		c.JSON(http.StatusInternalServerError, gin.H{"errors": []gin.H{{
+			"field": "general",
+			"key":   "validation.internal_server_error",
+		}}})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"subscriptions": subscriptions,
+	})
+}

internal/controllers/user_controller.go

@@ -24,7 +24,7 @@ type UserController struct {
 	ConsentService     services.ConsentServiceInterface
 	BankAccountService services.BankAccountServiceInterface
 	MembershipService  services.MembershipServiceInterface
-	DriversLicenceService services.DriversLicenceInterface
+	LicenceService     services.LicenceInterface
 }
 
 type RegistrationData struct {
@@ -172,28 +172,8 @@ func (uc *UserController) CurrentUserHandler(c *gin.Context) {
 		return
 	}
 
-	subscriptions, err := uc.MembershipService.GetSubscriptions(nil)
-	if err != nil {
-		logger.Error.Printf("Error retrieving subscriptions: %v", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"errors": []gin.H{{
-			"field": "general",
-			"key":   "validation.internal_server_error",
-		}}})
-		return
-	}
-	licenceCategories, err := uc.DriversLicenceService.GetAllCategories()
-	if err != nil {
-		logger.Error.Printf("Error retrieving licence categories: %v", err)
-		c.JSON(http.StatusInternalServerError, gin.H{"errors": []gin.H{{
-			"field": "general",
-			"key":   "validation.internal_server_error",
-		}}})
-		return
-	}
 	c.JSON(http.StatusOK, gin.H{
 		"user": user.Safe(),
-		"subscriptions":      subscriptions,
-		"licence_categories": licenceCategories,
 	})
 }
 

internal/controllers/user_controller_test.go

@@ -75,7 +75,7 @@ func testUserController(t *testing.T) {
 
 	loginEmail, loginCookie := testLoginHandler(t)
 	logoutCookie := testCurrentUserHandler(t, loginEmail, loginCookie)
-	testUpdateUser(t, loginEmail, loginCookie)
+	testUpdateUser(t, loginCookie)
 	testLogoutHandler(t, logoutCookie)
 }
 
@@ -413,7 +413,7 @@ func validateUser(assert bool, wantDBData map[string]interface{}) error {
 	return nil
 }
 
-func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
+func testUpdateUser(t *testing.T, loginCookie http.Cookie) {
 
 	invalidCookie := http.Cookie{
 		Name:  "jwt",
@@ -480,7 +480,7 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 			},
 		},
 		{
-			name: "Change LicenceNumber",
+			name: "Change Number",
 			setupCookie: func(req *http.Request) {
 				req.AddCookie(&loginCookie)
 			},
@@ -489,7 +489,7 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.FirstName = "John Updated"
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
 			},
 			expectedStatus: http.StatusAccepted,
 		},
@@ -503,11 +503,11 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.FirstName = "John Updated"
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
-				var licenceRepo repositories.DriversLicenceInterface = &repositories.DriversLicenceRepository{}
+				var licenceRepo repositories.LicenceInterface = &repositories.LicenceRepository{}
 				category, err := licenceRepo.FindCategoryByName("B")
 				assert.NoError(t, err)
-				u.DriversLicence.LicenceCategories = []models.LicenceCategory{category}
+				u.Licence.Categories = []models.Category{category}
 			},
 			expectedStatus: http.StatusAccepted,
 		},
@@ -521,12 +521,12 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.FirstName = "John Updated"
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
-				var licenceRepo repositories.DriversLicenceInterface = &repositories.DriversLicenceRepository{}
+				var licenceRepo repositories.LicenceInterface = &repositories.LicenceRepository{}
 				category, err := licenceRepo.FindCategoryByName("A")
 				category2, err := licenceRepo.FindCategoryByName("BE")
 				assert.NoError(t, err)
-				u.DriversLicence.LicenceCategories = []models.LicenceCategory{category, category2}
+				u.Licence.Categories = []models.Category{category, category2}
 			},
 			expectedStatus: http.StatusAccepted,
 		},
@@ -540,11 +540,11 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.FirstName = "John Updated"
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
-				var licenceRepo repositories.DriversLicenceInterface = &repositories.DriversLicenceRepository{}
+				var licenceRepo repositories.LicenceInterface = &repositories.LicenceRepository{}
 				category, err := licenceRepo.FindCategoryByName("A")
 				assert.NoError(t, err)
-				u.DriversLicence.LicenceCategories = []models.LicenceCategory{category}
+				u.Licence.Categories = []models.Category{category}
 			},
 			expectedStatus: http.StatusAccepted,
 		},
@@ -558,8 +558,8 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.FirstName = "John Updated"
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
-				u.DriversLicence.LicenceCategories = []models.LicenceCategory{}
+				u.Licence.Categories = []models.Category{}
 			},
 			expectedStatus: http.StatusAccepted,
 		},
@@ -573,7 +573,7 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.ID = 1
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
 				u.FirstName = "John Missing ID"
 			},
 			expectedStatus: http.StatusForbidden,
@@ -590,7 +590,7 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				u.Password = ""
 				u.LastName = "Doe Updated"
 				u.Phone = "01738484994"
-				u.DriversLicence.LicenceNumber = "B072RRE2I50"
+				u.Licence.Number = "B072RRE2I50"
 				u.Password = "NewPassword"
 			},
 			expectedStatus: http.StatusAccepted,
@@ -713,23 +713,23 @@ func testUpdateUser(t *testing.T, loginEmail string, loginCookie http.Cookie) {
 				assert.Equal(t, updatedUser.Membership.SubscriptionModelID, updatedUserFromDB.Membership.SubscriptionModelID, "Membership.SubscriptionModelID mismatch")
 				assert.Equal(t, updatedUser.Membership.ParentMembershipID, updatedUserFromDB.Membership.ParentMembershipID, "Membership.ParentMembershipID mismatch")
 
-				if updatedUser.DriversLicence.Status == 0 {
+				if updatedUser.Licence.Status == 0 {
-					updatedUser.DriversLicence.Status = constants.UnverifiedStatus
+					updatedUser.Licence.Status = constants.UnverifiedStatus
 				}
-				assert.Equal(t, updatedUser.DriversLicence.Status, updatedUserFromDB.DriversLicence.Status, "DriversLicence.Status mismatch")
+				assert.Equal(t, updatedUser.Licence.Status, updatedUserFromDB.Licence.Status, "Licence.Status mismatch")
-				assert.Equal(t, updatedUser.DriversLicence.LicenceNumber, updatedUserFromDB.DriversLicence.LicenceNumber, "DriversLicence.LicenceNumber mismatch")
+				assert.Equal(t, updatedUser.Licence.Number, updatedUserFromDB.Licence.Number, "Licence.Number mismatch")
-				assert.Equal(t, updatedUser.DriversLicence.IssuedDate, updatedUserFromDB.DriversLicence.IssuedDate, "DriversLicence.IssuedDate mismatch")
+				assert.Equal(t, updatedUser.Licence.IssuedDate, updatedUserFromDB.Licence.IssuedDate, "Licence.IssuedDate mismatch")
-				assert.Equal(t, updatedUser.DriversLicence.ExpirationDate, updatedUserFromDB.DriversLicence.ExpirationDate, "DriversLicence.ExpirationDate mismatch")
+				assert.Equal(t, updatedUser.Licence.ExpirationDate, updatedUserFromDB.Licence.ExpirationDate, "Licence.ExpirationDate mismatch")
-				assert.Equal(t, updatedUser.DriversLicence.IssuingCountry, updatedUserFromDB.DriversLicence.IssuingCountry, "DriversLicence.IssuingCountry mismatch")
+				assert.Equal(t, updatedUser.Licence.IssuingCountry, updatedUserFromDB.Licence.IssuingCountry, "Licence.IssuingCountry mismatch")
 
 				// For slices or more complex nested structures, you might want to use deep equality checks
 				assert.ElementsMatch(t, updatedUser.Consents, updatedUserFromDB.Consents, "Consents mismatch")
-				if len(updatedUser.DriversLicence.LicenceCategories) > 0 {
+				if len(updatedUser.Licence.Categories) > 0 {
-					for i := range updatedUser.DriversLicence.LicenceCategories {
+					for i := range updatedUser.Licence.Categories {
-						assert.Equal(t, updatedUser.DriversLicence.LicenceCategories[i].Category, updatedUserFromDB.DriversLicence.LicenceCategories[i].Category, "LicenceCategory Category mismatch at index %d", i)
+						assert.Equal(t, updatedUser.Licence.Categories[i].Name, updatedUserFromDB.Licence.Categories[i].Name, "Category Category mismatch at index %d", i)
 					}
 				} else {
-					assert.Emptyf(t, updatedUserFromDB.DriversLicence.LicenceCategories, "Categories aren't empty when they should")
+					assert.Emptyf(t, updatedUserFromDB.Licence.Categories, "Categories aren't empty when they should")
 				}
 			}
 		})
@@ -1094,18 +1094,18 @@ func getTestUsers() []RegisterUserTest {
 			Assert:       false,
 			Input: GenerateInputJSON(customizeInput(func(user models.User) models.User {
 				user.Email = "john.wronglicence.doe@example.com"
-				user.DriversLicence.LicenceNumber = "AAAA12345AA"
+				user.Licence.Number = "AAAA12345AA"
 				return user
 			})),
 		},
 		{
-			Name:         "Correct DriversLicence number, should pass",
+			Name:         "Correct Licence number, should pass",
 			WantResponse: http.StatusCreated,
 			WantDBData:   map[string]interface{}{"email": "john.correctLicenceNumber@example.com"},
 			Assert:       true,
 			Input: GenerateInputJSON(customizeInput(func(user models.User) models.User {
 				user.Email = "john.correctLicenceNumber@example.com"
-				user.DriversLicence.LicenceNumber = "B072RRE2I55"
+				user.Licence.Number = "B072RRE2I55"
 				return user
 			})),
 		},

internal/database/db.go

@@ -27,8 +27,8 @@ func Open(dbPath string, adminMail string) error {
 		&models.Membership{},
 		&models.Consent{},
 		&models.Verification{},
-		&models.DriversLicence{},
+		&models.Licence{},
-		&models.LicenceCategory{},
+		&models.Category{},
 		&models.BankAccount{}); err != nil {
 		logger.Error.Fatalf("Couldn't create database: %v", err)
 		return err
@@ -82,24 +82,24 @@ func createSubscriptionModels() []models.SubscriptionModel {
 	}
 }
 
-func createLicenceCategories() []models.LicenceCategory {
+func createLicenceCategories() []models.Category {
-	return []models.LicenceCategory{
+	return []models.Category{
-		{Category: "AM"},
+		{Name: "AM"},
-		{Category: "A1"},
+		{Name: "A1"},
-		{Category: "A2"},
+		{Name: "A2"},
-		{Category: "A"},
+		{Name: "A"},
-		{Category: "B"},
+		{Name: "B"},
-		{Category: "C1"},
+		{Name: "C1"},
-		{Category: "C"},
+		{Name: "C"},
-		{Category: "D1"},
+		{Name: "D1"},
-		{Category: "D"},
+		{Name: "D"},
-		{Category: "BE"},
+		{Name: "BE"},
-		{Category: "C1E"},
+		{Name: "C1E"},
-		{Category: "CE"},
+		{Name: "CE"},
-		{Category: "D1E"},
+		{Name: "D1E"},
-		{Category: "DE"},
+		{Name: "DE"},
-		{Category: "T"},
+		{Name: "T"},
-		{Category: "L"},
+		{Name: "L"},
 	}
 }
 
@@ -143,7 +143,7 @@ func createAdmin(userMail string, subscriptionModelID uint) (*models.User, error
 			SubscriptionModelID: subscriptionModelID,
 		},
 		BankAccount: models.BankAccount{},
-		DriversLicence: models.DriversLicence{
+		Licence: models.Licence{
 			Status: constants.UnverifiedStatus,
 		},
 	}, nil

internal/models/drivers_licence.go

@@ -4,17 +4,17 @@ import (
 	"time"
 )
 
-type DriversLicence struct {
+type Licence struct {
 	ID             uint       `json:"id" gorm:"primaryKey"`
 	Status         int8       `json:"status" binding:"omitempty,number"`
-	LicenceNumber     string            `json:"number" binding:"omitempty,euDriversLicence,safe_content"`
+	Number         string     `json:"number" binding:"omitempty,euDriversLicence,safe_content"`
 	IssuedDate     time.Time  `json:"issued_date" binding:"omitempty,lte"`
 	ExpirationDate time.Time  `json:"expiration_date" binding:"omitempty,gt"`
 	IssuingCountry string     `json:"country" binding:"safe_content"`
-	LicenceCategories []LicenceCategory `json:"licence_categories" gorm:"many2many:licence_2_categories"`
+	Categories     []Category `json:"licence_categories" gorm:"many2many:licence_2_categories"`
 }
 
-type LicenceCategory struct {
+type Category struct {
 	ID   uint   `json:"id" gorm:"primaryKey"`
-	Category string `json:"category" binding:"safe_content"`
+	Name string `json:"category" binding:"safe_content"`
 }

internal/models/user.go

@@ -29,8 +29,8 @@ type User struct {
 	VerificationID uint
 	Membership     Membership `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"membership"`
 	MembershipID   uint
-	DriversLicence   DriversLicence `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"drivers_licence"`
+	Licence        Licence `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"licence"`
-	DriversLicenceID uint
+	LicenceID      uint
 	ID             uint `json:"id"`
 	PaymentStatus  int8 `json:"payment_status"`
 	Status         int8 `json:"status"`
@@ -99,14 +99,14 @@ func (u *User) Safe() map[string]interface{} {
 			"bic":                 u.BankAccount.BIC,
 			"mandate_reference":   u.BankAccount.MandateReference,
 		},
-		"drivers_licence": map[string]interface{}{
+		"licence": map[string]interface{}{
-			"id":                 u.DriversLicence.ID,
+			"id":                 u.Licence.ID,
-			"licence_number":     u.DriversLicence.LicenceNumber,
+			"number":             u.Licence.Number,
-			"status":             u.DriversLicence.Status,
+			"status":             u.Licence.Status,
-			"issued_date":        u.DriversLicence.IssuedDate,
+			"issued_date":        u.Licence.IssuedDate,
-			"expiration_date":    u.DriversLicence.ExpirationDate,
+			"expiration_date":    u.Licence.ExpirationDate,
-			"country":            u.DriversLicence.IssuingCountry,
+			"country":            u.Licence.IssuingCountry,
-			"licence_categories": u.DriversLicence.LicenceCategories,
+			"licence_categories": u.Licence.Categories,
 		},
 	}
 }

internal/repositories/drivers_licence_repository.go

@@ -1,31 +0,0 @@
-package repositories
-
-import (
-	"GoMembership/internal/database"
-	"GoMembership/internal/models"
-)
-
-type DriversLicenceInterface interface {
-	FindCategoryByName(categoryName string) (models.LicenceCategory, error)
-	FindCategoriesByIDs(ids []uint) ([]models.LicenceCategory, error)
-	GetAllCategories() ([]models.LicenceCategory, error)
-}
-
-type DriversLicenceRepository struct{}
-
-func (r *DriversLicenceRepository) GetAllCategories() ([]models.LicenceCategory, error) {
-	var categories []models.LicenceCategory
-	err := database.DB.Find(&categories).Error
-	return categories, err
-}
-func (r *DriversLicenceRepository) FindCategoriesByIDs(ids []uint) ([]models.LicenceCategory, error) {
-	var categories []models.LicenceCategory
-	err := database.DB.Where("id IN ?", ids).Find(&categories).Error
-	return categories, err
-}
-
-func (r *DriversLicenceRepository) FindCategoryByName(categoryName string) (models.LicenceCategory, error) {
-	var category models.LicenceCategory
-	err := database.DB.Where("category = ?", categoryName).First(&category).Error
-	return category, err
-}

internal/repositories/licence_repository.go

@@ -0,0 +1,31 @@
+package repositories
+
+import (
+	"GoMembership/internal/database"
+	"GoMembership/internal/models"
+)
+
+type LicenceInterface interface {
+	FindCategoryByName(categoryName string) (models.Category, error)
+	FindCategoriesByIDs(ids []uint) ([]models.Category, error)
+	GetAllCategories() ([]models.Category, error)
+}
+
+type LicenceRepository struct{}
+
+func (r *LicenceRepository) GetAllCategories() ([]models.Category, error) {
+	var categories []models.Category
+	err := database.DB.Find(&categories).Error
+	return categories, err
+}
+func (r *LicenceRepository) FindCategoriesByIDs(ids []uint) ([]models.Category, error) {
+	var categories []models.Category
+	err := database.DB.Where("id IN ?", ids).Find(&categories).Error
+	return categories, err
+}
+
+func (r *LicenceRepository) FindCategoryByName(categoryName string) (models.Category, error) {
+	var category models.Category
+	err := database.DB.Where("category = ?", categoryName).First(&category).Error
+	return category, err
+}

internal/repositories/user_repository.go

@@ -42,7 +42,7 @@ func (ur *UserRepository) UpdateUser(user *models.User) (*models.User, error) {
 	err := database.DB.Transaction(func(tx *gorm.DB) error {
 		// Check if the user exists in the database
 		var existingUser models.User
-		if err := tx.Preload("DriversLicence.LicenceCategories").
+		if err := tx.Preload("Licence.Categories").
 			Preload("Membership").
 			First(&existingUser, user.ID).Error; err != nil {
 			return err
@@ -57,9 +57,9 @@ func (ur *UserRepository) UpdateUser(user *models.User) (*models.User, error) {
 		}
 
 		// Handle the update of the LicenceCategories explicitly
-		if user.DriversLicence.ID != 0 {
+		if user.Licence.ID != 0 {
-			// Replace the LicenceCategories with the new list
+			// Replace the Categories with the new list
-			if err := tx.Model(&existingUser.DriversLicence).Association("LicenceCategories").Replace(user.DriversLicence.LicenceCategories); err != nil {
+			if err := tx.Model(&existingUser.Licence).Association("Categories").Replace(user.Licence.Categories); err != nil {
 				return err
 			}
 		}
@@ -71,9 +71,9 @@ func (ur *UserRepository) UpdateUser(user *models.User) (*models.User, error) {
 			}
 		}
 
-		// Update the DriversLicence fields if provided
+		// Update the Licence fields if provided
-		if user.DriversLicence.ID != 0 {
+		if user.Licence.ID != 0 {
-			if err := tx.Model(&existingUser.DriversLicence).Updates(user.DriversLicence).Error; err != nil {
+			if err := tx.Model(&existingUser.Licence).Updates(user.Licence).Error; err != nil {
 				return err
 			}
 		}
@@ -86,7 +86,7 @@ func (ur *UserRepository) UpdateUser(user *models.User) (*models.User, error) {
 	}
 
 	var updatedUser models.User
-	if err := database.DB.Preload("DriversLicence.LicenceCategories").
+	if err := database.DB.Preload("Licence.Categories").
 		Preload("Membership").
 		First(&updatedUser, user.ID).Error; err != nil {
 		return nil, err
@@ -99,7 +99,7 @@ func (ur *UserRepository) GetUsers(where map[string]interface{}) (*[]models.User
 	result := database.DB.
 		Preload(clause.Associations).
 		Preload("Membership.SubscriptionModel").
-		Preload("DriversLicence.LicenceCategories").
+		Preload("Licence.Categories").
 		Where(where).Find(&users)
 	if result.Error != nil {
 		if result.Error == gorm.ErrRecordNotFound {
@@ -115,7 +115,7 @@ func GetUserByID(userID *uint) (*models.User, error) {
 	result := database.DB.
 		Preload(clause.Associations).
 		Preload("Membership.SubscriptionModel").
-		Preload("DriversLicence.LicenceCategories").
+		Preload("Licence.Categories").
 		First(&user, userID)
 	if result.Error != nil {
 		if result.Error == gorm.ErrRecordNotFound {

internal/routes/routes.go

@@ -7,7 +7,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func RegisterRoutes(router *gin.Engine, userController *controllers.UserController, membershipcontroller *controllers.MembershipController, contactController *controllers.ContactController) {
+func RegisterRoutes(router *gin.Engine, userController *controllers.UserController, membershipcontroller *controllers.MembershipController, contactController *controllers.ContactController, licenceController *controllers.LicenceController) {
 	router.GET("/users/verify", userController.VerifyMailHandler)
 	router.POST("/users/register", userController.RegisterUser)
 	router.POST("/users/contact", contactController.RelayContactRequest)
@@ -21,12 +21,23 @@ func RegisterRoutes(router *gin.Engine, userController *controllers.UserControll
 		router.POST("/v1/subscription", membershipcontroller.RegisterSubscription)
 	}
 
-	authRouter := router.Group("/backend/users")
+	userRouter := router.Group("/backend/users")
-	authRouter.Use(middlewares.AuthMiddleware())
+	userRouter.Use(middlewares.AuthMiddleware())
 	{
-		authRouter.GET("/current", userController.CurrentUserHandler)
+		userRouter.GET("/current", userController.CurrentUserHandler)
-		authRouter.POST("/logout", userController.LogoutHandler)
+		userRouter.POST("/logout", userController.LogoutHandler)
-		authRouter.PATCH("/update", userController.UpdateHandler)
+		userRouter.PATCH("/update", userController.UpdateHandler)
+	}
 
+	membershipRouter := router.Group("/backend/membership")
+	membershipRouter.Use(middlewares.AuthMiddleware())
+	{
+		membershipRouter.GET("/subscriptions", membershipcontroller.GetSubscriptions)
+	}
+
+	licenceRouter := router.Group("/backend/licence")
+	licenceRouter.Use(middlewares.AuthMiddleware())
+	{
+		licenceRouter.GET("/categories", licenceController.GetAllCategories)
 	}
 }

internal/server/server.go

@@ -39,14 +39,15 @@ func Run() {
 	var subscriptionRepo repositories.SubscriptionModelsRepositoryInterface = &repositories.SubscriptionModelsRepository{}
 	membershipService := &services.MembershipService{Repo: membershipRepo, SubscriptionRepo: subscriptionRepo}
 
+	var licenceRepo repositories.LicenceInterface = &repositories.LicenceRepository{}
+	licenceService := &services.LicenceService{Repo: licenceRepo}
+
 	var userRepo repositories.UserRepositoryInterface = &repositories.UserRepository{}
-	var licenceRepo repositories.DriversLicenceInterface = &repositories.DriversLicenceRepository{}
-	driversLicenceService := &services.DriversLicenceService{Repo: licenceRepo}
 	userService := &services.UserService{Repo: userRepo, Licences: licenceRepo}
 
-	userController := &controllers.UserController{Service: userService, EmailService: emailService, ConsentService: consentService, DriversLicenceService: driversLicenceService, BankAccountService: bankAccountService, MembershipService: membershipService}
+	userController := &controllers.UserController{Service: userService, EmailService: emailService, ConsentService: consentService, LicenceService: licenceService, BankAccountService: bankAccountService, MembershipService: membershipService}
 	membershipController := &controllers.MembershipController{Service: *membershipService}
-
+	licenceController := &controllers.LicenceController{Service: *licenceService}
 	contactController := &controllers.ContactController{EmailService: emailService}
 
 	router := gin.Default()
@@ -63,7 +64,7 @@ func Run() {
 	limiter := middlewares.NewIPRateLimiter(config.Security.Ratelimits.Limit, config.Security.Ratelimits.Burst)
 	router.Use(middlewares.RateLimitMiddleware(limiter))
 
-	routes.RegisterRoutes(router, userController, membershipController, contactController)
+	routes.RegisterRoutes(router, userController, membershipController, contactController, licenceController)
 	validation.SetupValidators()
 
 	logger.Info.Println("Starting server on :8080")

internal/services/drivers_licence_service.go

@@ -1,18 +0,0 @@
-package services
-
-import (
-	"GoMembership/internal/models"
-	"GoMembership/internal/repositories"
-)
-
-type DriversLicenceInterface interface {
-	GetAllCategories() ([]models.LicenceCategory, error)
-}
-
-type DriversLicenceService struct {
-	Repo repositories.DriversLicenceInterface
-}
-
-func (s *DriversLicenceService) GetAllCategories() ([]models.LicenceCategory, error) {
-	return s.Repo.GetAllCategories()
-}

internal/services/licence_service.go

@@ -0,0 +1,18 @@
+package services
+
+import (
+	"GoMembership/internal/models"
+	"GoMembership/internal/repositories"
+)
+
+type LicenceInterface interface {
+	GetAllCategories() ([]models.Category, error)
+}
+
+type LicenceService struct {
+	Repo repositories.LicenceInterface
+}
+
+func (s *LicenceService) GetAllCategories() ([]models.Category, error) {
+	return s.Repo.GetAllCategories()
+}

internal/services/user_service.go

@@ -28,7 +28,7 @@ type UserServiceInterface interface {
 
 type UserService struct {
 	Repo     repositories.UserRepositoryInterface
-	Licences repositories.DriversLicenceInterface
+	Licences repositories.LicenceInterface
 }
 
 func (service *UserService) UpdateUser(user *models.User, userRole int8) (*models.User, error) {
@@ -38,9 +38,9 @@ func (service *UserService) UpdateUser(user *models.User, userRole int8) (*model
 	}
 
 	user.UpdatedAt = time.Now()
-	if user.DriversLicence.Status == 0 {
+	if user.Licence.Status == 0 {
 		// This is a new drivers licence
-		user.DriversLicence.Status = constants.UnverifiedStatus
+		user.Licence.Status = constants.UnverifiedStatus
 	}
 
 	updatedUser, err := service.Repo.UpdateUser(user)
@@ -66,7 +66,7 @@ func (service *UserService) RegisterUser(user *models.User) (uint, string, error
 	user.CreatedAt = time.Now()
 	user.UpdatedAt = time.Now()
 	user.PaymentStatus = constants.AwaitingPaymentStatus
-	user.DriversLicence.Status = constants.UnverifiedStatus
+	user.Licence.Status = constants.UnverifiedStatus
 	user.BankAccount.MandateDateSigned = time.Now()
 	id, err := service.Repo.CreateUser(user)
 

internal/validation/DriversLicence_validation.go

@@ -6,7 +6,7 @@ import (
 	"github.com/go-playground/validator/v10"
 )
 
-func ValidateDriversLicence(fl validator.FieldLevel) bool {
+func ValidateLicence(fl validator.FieldLevel) bool {
 	fieldValue := fl.Field().String()
 	if len(fieldValue) != 11 {
 		return false

internal/validation/setup.go

@@ -14,7 +14,7 @@ func SetupValidators() {
 		v.RegisterValidation("safe_content", ValidateSafeContent)
 		v.RegisterValidation("iban", IBANValidator)
 		v.RegisterValidation("bic", BICValidator)
-		v.RegisterValidation("euDriversLicence", ValidateDriversLicence)
+		v.RegisterValidation("euDriversLicence", ValidateLicence)
 
 		// Register struct-level validations
 		v.RegisterStructValidation(validateUser, models.User{})