Use id instead

Author: W2Wizard

backend/NXTBackend.API.Core/Services/Implementation/UserCursusService.cs

@@ -67,7 +67,7 @@ public async Task<CursusTrackDTO> ConstructTrack(Guid userId, Guid cursusId)
         // 3. Load user goals separately with minimal data needed
         var userGoalsInfo = await _context.UserGoals
             .AsNoTracking()
-            .Where(ug => ug.UserCursusId == userCursus.Id)
+            .Where(ug => ug.UserId == userId)
             .Select(ug => new
             {
                 ug.GoalId,

backend/NXTBackend.API.Core/Services/Implementation/UserGoalService.cs

@@ -16,6 +16,8 @@ public sealed class UserGoalService : BaseService<UserGoal>, IUserGoalService
     public UserGoalService(DatabaseContext ctx) : base(ctx)
     {
         DefineFilter<Guid>("user_id", (q, id) => q.Where(ug => ug.UserId == id));
+        DefineFilter<Guid>("goal_id", (q, id) => q.Where(ug => ug.GoalId == id));
         DefineFilter<string>("name", (q, name) => q.Where(ug => EF.Functions.Like(ug.Goal.Name, $"%{name}%")));
+        DefineFilter<string>("slug", (q, slug) => q.Include(ug => ug.Goal).Where(ug => ug.Goal.Slug == slug));
     }
 }

backend/NXTBackend.API/Controllers/UserController.cs

@@ -244,15 +244,19 @@ public async Task<IActionResult> GetUserGoals(
         Guid id,
         [FromQuery] PaginationParams pagination,
         [FromQuery] SortingParams sorting,
-        [FromQuery(Name = "filter[name]"), Description("The name of the learning goal")] string? goalName
+        [FromQuery(Name = "filter[name]")] string? name,
+        [FromQuery(Name = "filter[slug]")] string? slug,
+        [FromQuery(Name = "filter[goal_id]")] string? goalId
     )
     {
         var user = await userService.FindByIdAsync(id);
         if (user is null)
             return NotFound("User not found");
 
         var filters = new FilterDictionary()
-            .AddFilter("name", goalName)
+            .AddFilter("name", name)
+            .AddFilter("slug", slug)
+            .AddFilter("goal_id", goalId)
             .AddFilter("user_id", id);
 
         var page = await userGoalService.GetAllAsync(pagination, sorting, filters);

frontend/src/lib/api/types.d.ts

@@ -4386,8 +4386,9 @@ export interface paths {
                     "page[size]"?: number;
                     sort_by?: string;
                     sort?: components["schemas"]["Order"];
-                    /** @description The name of the learning goal */
                     "filter[name]"?: string;
+                    "filter[slug]"?: string;
+                    "filter[goal_id]"?: string;
                 };
                 header?: never;
                 path: {

frontend/src/lib/components/pagination.svelte

@@ -9,7 +9,7 @@
 
 	interface Props {
 		/** Total number of items */
-		totalItems?: number;
+		pages?: number;
 		/** How many per page */
 		perPage?: number;
 		/** Current page */
@@ -29,7 +29,7 @@
 	}
 
 	let {
-		totalItems = 0,
+		pages = 0,
 		perPage = $bindable(10),
 		page = $bindable(1),
 		variant = "default",
@@ -40,8 +40,7 @@
 		onPageSizeChange,
 	}: Props = $props();
 
-	const totalPages = $derived(Math.max(1, Math.ceil(totalItems / perPage)));
-	$inspect(totalPages)
+	const totalPages = $derived(pages * perPage);
 	function handlePageSizeChange(newSize: number) {
 		perPage = newSize;
 		if (page > totalPages) {
@@ -123,7 +122,7 @@
 					{:else}
 						<Pagination.Item>
 							<span class="px-2 text-sm font-medium">
-								Page {currentPage} of {totalPages}
+								Page {currentPage} of {pages.length}
 							</span>
 						</Pagination.Item>
 					{/if}

frontend/src/routes/(app)/users/[id=uuid]/goals/+page.server.ts

@@ -43,7 +43,7 @@ export const load: PageServerLoad = async ({locals, params, url}) => {
 		logger.debug({ lel: Number(response.headers.get("X-Pages")) })
 
 		return {
-			size: Number(response.headers.get("X-Pages")),
+			XPages: Number(response.headers.get("X-Pages")),
 			goals: data ?? []
 		}
 	} else {
@@ -61,7 +61,7 @@ export const load: PageServerLoad = async ({locals, params, url}) => {
 		logger.debug({ lel: Number(response.headers.get("X-Pages")) })
 
 		return {
-			size: Number(response.headers.get("X-Pages")),
+			XPages: Number(response.headers.get("X-Pages")),
 			goals: data ?? []
 		}
 	}

frontend/src/routes/(app)/users/[id=uuid]/goals/+page.svelte

@@ -12,12 +12,11 @@
 	import * as Tabs from "$lib/components/ui/tabs/index";
 	import { page } from "$app/state";
 	import type { QueryKeys } from "./+page.server";
+	import { encodeID } from "$lib/utils";
 
 	const debounce = useDebounce();
 	const query = useQuery<QueryKeys>(page.url);
 	const { data }: PageProps = $props();
-
-	const size = $derived(data.size);
 </script>
 
 <svelte:head>
@@ -66,7 +65,7 @@
 					<li>
 						<Pagination
 							variant="default"
-							totalItems={size}
+							pages={data.XPages}
 							onPage={(p) => query.write("page", p)}
 							onPageSizeChange={(s) => query.write("size", s)}
 						/>
@@ -78,12 +77,12 @@
 				{#if query.read("filter") === "available"}
 					{#each data.goals as entity}
 						{@const goal = entity as BackendTypes["LearningGoalDO"]}
-						<Taskcard href="goals/1" type="goal" title={goal.name} />
+						<Taskcard href="goals/{encodeID(goal.id)}" type="goal" title={goal.name} />
 					{/each}
 				{:else}
 					{#each data.goals as entity}
 						{@const goal = entity as BackendTypes["UserGoalDO"]}
-						<Taskcard href="goals/1" type="goal" title={goal.name ?? "Unknown"} />
+						<Taskcard href="goals/{encodeID(goal.goalId)}" type="goal" title={goal.name ?? "Unknown"} />
 					{/each}
 				{/if}
 			</div>

frontend/src/routes/(app)/users/[id=uuid]/goals/[goal=uuid]/+page.server.ts

@@ -0,0 +1,46 @@
+import { decodeID } from '$lib/utils';
+import { check } from '$lib/utils/check.svelte';
+import { error } from '@sveltejs/kit';
+import type { PageServerLoad, RouteParams } from './$types';
+import { logger } from '$lib/logger';
+
+async function fetchGoal(locals: App.Locals, goalId: GUID) {
+	const { response, data } = await check(locals.api.GET("/goals", {
+		params: {
+			query: {
+				"filter[id]": decodeID(goalId),
+			}
+		}
+	}));
+
+	return data?.at(0) ?? error(404);
+}
+
+async function fetchUserGoal(locals: App.Locals, goalId: GUID, userId: GUID) {
+	const { response, data } = await locals.api.GET("/users/{id}/goals", {
+		params: {
+			path: { id: userId },
+			query: {
+				"filter[goal_id]": decodeID(goalId),
+			}
+		}
+	});
+
+	if (!response.ok && response.status !== 404)
+		error(response.status, `Failed to fetch user goal: ${response.statusText}`);
+	return data?.at(0) ?? null;
+}
+
+export const load: PageServerLoad = async ({ url, params, locals }) => {
+	const goalId = decodeID(params.goal);
+	logger.info(`Loading goal with ID: ${goalId} for user with ID: ${params.id}`, { url: url.pathname });
+	const [goal, userGoal] = await Promise.all([
+		fetchGoal(locals, goalId),
+		fetchUserGoal(locals, goalId, decodeID(params.id))
+	]);
+
+	return {
+		goal,
+		userGoal,
+	};
+};