frontend cleanup

frontend/src/lib/components/InputField.svelte

@@ -1,5 +1,4 @@
 <script>
-	import { createEventDispatcher } from 'svelte';
 	import { t } from 'svelte-i18n';
 
 	/** @type {string} */

frontend/src/lib/components/Modal.svelte

@@ -1,9 +1,6 @@
 <script>
 	import { quintOut } from 'svelte/easing';
 
-	import { t } from 'svelte-i18n';
-	import { createEventDispatcher } from 'svelte';
-
 	const modal = (/** @type {Element} */ node, { duration = 300 } = {}) => {
 		const transform = getComputedStyle(node).transform;
 
@@ -19,11 +16,6 @@
 			}
 		};
 	};
-
-	const dispatch = createEventDispatcher();
-	function closeModal() {
-		dispatch('close', {});
-	}
 </script>
 
 <div class="modal-background">
@@ -59,42 +51,11 @@
 		box-shadow: 0 4px 20px rgba(17, 17, 27, 0.5); /* var(--crust) with opacity */
 		transform: translate(-50%, -50%);
 	}
-	.sr-only {
-		position: absolute;
-		width: 1px;
-		height: 1px;
-		padding: 0;
-		margin: -1px;
-		overflow: hidden;
-		clip: rect(0, 0, 0, 0);
-		white-space: nowrap;
-		border-width: 0;
-	}
 	@media (max-width: 990px) {
 		.modal {
 			width: 90%;
 		}
 	}
-	.modal-close {
-		border: none;
-		padding: 1rem;
-		cursor: pointer;
-		position: absolute;
-		right: 0;
-		top: 0;
-	}
-
-	.modal-close svg {
-		display: block;
-		margin-left: auto;
-		margin-right: auto;
-		transition: all 0.3s ease-in-out;
-		fill: var(--blue); /* Using Catppuccin blue */
-	}
-	.modal-close:hover svg {
-		fill: var(--red); /* Using Catppuccin red */
-		transform: scale(1.2);
-	}
 	.modal .container {
 		max-height: 90vh;
 		overflow-y: auto;

frontend/src/lib/components/UserEditForm.svelte

@@ -80,7 +80,7 @@
 		}
 	}
 
-	$: isNewUser = user === null;
+	// $: isNewUser = user === null;
 	$: isLoading = user === undefined;
 
 	$: {
@@ -135,7 +135,8 @@
 		label: sub?.name ?? ''
 	}));
 	$: selectedSubscriptionModel =
-		subscriptions.find((sub) => sub?.id === localUser.membership?.subscription_model.id) || null;
+		subscriptions.find((sub) => sub?.name === localUser.membership?.subscription_model.name) ||
+		null;
 
 	/**
 	 * creates groups of categories depending on the first letter
@@ -146,7 +147,7 @@
 		return Object.entries(categories)
 			.sort((a, b) => a[1].category.localeCompare(b[1].category))
 			.reduce(
-				(/** @type {Object.<string, App.Locals['licence_categories']>} */ acc, [_, category]) => {
+				(/** @type {Object.<string, App.Locals['licence_categories']>} */ acc, [, category]) => {
 					const firstLetter = category.category[0];
 					if (!acc[firstLetter]) {
 						acc[firstLetter] = [];
@@ -167,12 +168,12 @@
 	}
 
 	/** @type {import('../../routes/auth/about/[id]/$types').SubmitFunction} */
-	const handleUpdate = async ({ formData, action, cancel }) => {
+	const handleUpdate = async () => {
 		isUpdating = true;
 		return async ({ result }) => {
 			isUpdating = false;
 			if (result.type === 'success' || result.type === 'redirect') {
-				close();
+				dispatch('close');
 			} else {
 				document.querySelector('.modal .container')?.scrollTo({ top: 0, behavior: 'smooth' });
 			}
@@ -371,7 +372,7 @@
 			<div class="licence-categories">
 				<h3>{$t('licence_categories')}</h3>
 				<div class="checkbox-grid">
-					{#each Object.entries(groupedCategories) as [group, categories], groupIndex}
+					{#each Object.entries(groupedCategories) as [, categories], groupIndex}
 						{#if groupIndex > 0}
 							<div class="category-break"></div>
 						{/if}
@@ -417,11 +418,11 @@
 				<div class="subscription-column">
 					<p>
 						<strong>{$t('monthly_fee')}:</strong>
-						{selectedSubscriptionModel?.monthly_fee || '-'}
+						{selectedSubscriptionModel?.monthly_fee || '-'} €
 					</p>
 					<p>
 						<strong>{$t('hourly_rate')}:</strong>
-						{selectedSubscriptionModel?.hourly_rate || '-'}
+						{selectedSubscriptionModel?.hourly_rate || '-'} €
 					</p>
 					{#if selectedSubscriptionModel?.included_hours_per_year}
 						<p>

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

@@ -32,10 +32,10 @@ export const actions = {
 		const rawData = formDataToObject(formData);
 		const processedData = processFormData(rawData);
 
-		console.dir(processedData.user.membership);
 		const isCreating = !processedData.user.id || processedData.user.id === 0;
-		console.log('Is updating: ', isCreating);
-		console.dir(formData);
+		console.log('Is creating: ', isCreating);
+		// console.dir(formData);
+		console.dir(processedData.user.membership);
 		const apiURL = `${BASE_API_URI}/backend/users/update/`;
 
 		/** @type {RequestInit} */

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

@@ -86,7 +86,14 @@
 
 {#if showModal}
 	<Modal on:close={close}>
-		<UserEditForm {form} {user} {subscriptions} {licence_categories} on:cancel={close} />
+		<UserEditForm
+			{form}
+			{user}
+			{subscriptions}
+			{licence_categories}
+			on:close={close}
+			on:cancel={close}
+		/>
 	</Modal>
 {/if}
 

frontend/src/routes/auth/admin/users/+page.server.js

@@ -8,7 +8,7 @@ import { fail, redirect } from '@sveltejs/kit';
 import { formDataToObject, processFormData } from '$lib/utils/processing';
 
 /** @type {import('./$types').PageServerLoad} */
-export async function load({ locals, params }) {
+export async function load({ locals }) {
 	// redirect user if not logged in
 	if (!locals.user) {
 		throw redirect(302, `/auth/login?next=/auth/users`);

frontend/src/routes/auth/admin/users/+page.svelte

@@ -7,13 +7,7 @@
 	/** @type {import('./$types').ActionData} */
 	export let form;
 
-	$: ({
-		user,
-		users = [],
-		licence_categories = [],
-		subscriptions = [],
-		payments = []
-	} = $page.data);
+	$: ({ users = [], licence_categories = [], subscriptions = [], payments = [] } = $page.data);
 
 	let activeSection = 'users';
 	/** @type{App.Locals['user'] | null} */

internal/controllers/user_controller.go

@@ -84,14 +84,6 @@ func (uc *UserController) UpdateHandler(c *gin.Context) {
 		return
 	}
 
-	// Validate subscription model
-	selectedModel, err := uc.MembershipService.GetModelByName(&user.Membership.SubscriptionModel.Name)
-	if err != nil {
-		utils.RespondWithError(c, err, "Error in UpdateHandler", http.StatusNotFound, "subscription_model", "server.validation.subscription_model_not_found")
-		return
-	}
-	user.Membership.SubscriptionModel = *selectedModel
-
 	updatedUser, err := uc.Service.UpdateUser(&user)
 	if err != nil {
 		utils.HandleUpdateError(c, err)

internal/repositories/user_repository.go

@@ -51,9 +51,11 @@ 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("Licence").
-			Preload("Licence.Categories").
+
+		if err := tx.Preload(clause.Associations).
 			Preload("Membership").
+			Preload("Membership.SubscriptionModel").
+			Preload("Licence.Categories").
 			First(&existingUser, user.ID).Error; err != nil {
 			return err
 		}
@@ -109,6 +111,7 @@ func GetUserByID(userID *uint) (*models.User, error) {
 	var user models.User
 	result := database.DB.
 		Preload(clause.Associations).
+		Preload("Membership").
 		Preload("Membership.SubscriptionModel").
 		Preload("Licence.Categories").
 		First(&user, userID)

internal/services/user_service.go

@@ -41,6 +41,29 @@ func (service *UserService) UpdateUser(user *models.User) (*models.User, error)
 		setPassword(user.Password, user)
 	}
 
+	// Validate subscription model
+	selectedModel, err := repositories.GetModelByName(&user.Membership.SubscriptionModel.Name)
+	if err != nil {
+		return nil, errors.ErrSubscriptionNotFound
+	}
+	user.Membership.SubscriptionModel = *selectedModel
+	user.Membership.SubscriptionModelID = selectedModel.ID
+
+	existingUser, err := service.GetUserByID(user.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	user.Membership.ID = existingUser.Membership.ID
+
+	user.MembershipID = existingUser.MembershipID
+	if existingUser.Licence != nil {
+		user.Licence.ID = existingUser.Licence.ID
+	}
+	user.LicenceID = existingUser.LicenceID
+	user.BankAccount.ID = existingUser.BankAccount.ID
+	user.BankAccountID = existingUser.BankAccountID
+
 	// if user.Licence.Status == 0 {
 	// 	// This is a new drivers licence
 	// 	user.Licence.Status = constants.UnverifiedStatus

internal/utils/response_handler.go

@@ -42,6 +42,8 @@ func HandleUpdateError(c *gin.Context, err error) {
 		RespondWithError(c, err, "Error while updating user", http.StatusNotFound, "user", "server.validation.user_not_found")
 	case errors.ErrInvalidUserData:
 		RespondWithError(c, err, "Error while updating user", http.StatusBadRequest, "user", "server.validation.invalid_user_data")
+	case errors.ErrSubscriptionNotFound:
+		RespondWithError(c, err, "Error while updating user", http.StatusBadRequest, "subscription", "server.validation.subscription_data")
 	default:
 		RespondWithError(c, err, "Error while updating user", http.StatusInternalServerError, "user", "server.error.internal_server_error")
 	}

internal/validation/membership_validation.go

@@ -15,12 +15,12 @@ func validateMembership(sl validator.StructLevel) {
 		switch membership.SubscriptionModel.RequiredMembershipField {
 		case "ParentMembershipID":
 			if err := CheckParentMembershipID(membership); err != nil {
-				logger.Error.Printf(err.Error())
+				logger.Error.Printf("Error ParentMembershipValidation: %v", err.Error())
 				sl.ReportError(membership.ParentMembershipID, membership.SubscriptionModel.RequiredMembershipField,
 					"RequiredMembershipField", "invalid", "")
 			}
 		default:
-			logger.Error.Printf(errors.ErrInvalidValue.Error())
+			logger.Error.Printf("Error no matching RequiredMembershipField: %v", errors.ErrInvalidValue.Error())
 			sl.ReportError(membership.ParentMembershipID, membership.SubscriptionModel.RequiredMembershipField,
 				"RequiredMembershipField", "not_implemented", "")
 		}

internal/validation/user_validation.go

@@ -27,7 +27,7 @@ func validateUser(sl validator.StructLevel) {
 		sl.ReportError(user.DateOfBirth, "DateOfBirth", "dateofbirth", "age", "")
 	}
 	// validate subscriptionModel
-	logger.Error.Printf("User: %#v", user)
+	logger.Error.Printf("User SubscriptionModel.Name: %#v", user.Membership.SubscriptionModel.Name)
 	if user.Membership.SubscriptionModel.Name == "" {
 		sl.ReportError(user.Membership.SubscriptionModel.Name, "SubscriptionModel.Name", "name", "required", "")
 	} else {

pkg/errors/errors.go

@@ -43,6 +43,7 @@ var (
 	ErrNotAuthorized           = errors.New("not authorized")
 	ValErrParentIDNotSet       = errors.New("Parent Membership ID not provided")
 	ValErrParentIDNotFound     = errors.New("Parent Membership ID not found")
+	ErrSubscriptionNotFound    = errors.New("Subscription Model not found")
 )
 
 var Responses = struct {