Merge remote-tracking branch 'origin/dev' into feat/user-routes

# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/controllers.ts
#	frontend/src/queries/themes.ts

frontend/src/controllers/base-controller.ts

@@ -1,73 +1,47 @@
-import { apiConfig } from "@/config.ts";
+import apiClient from "@/services/api-client/api-client.ts";
+import type { AxiosResponse, ResponseType } from "axios";
+import { HttpErrorResponseException } from "@/exception/http-error-response-exception.ts";
 
-export class BaseController {
-    protected baseUrl: string;
+export abstract class BaseController {
+    protected basePath: string;
 
-    constructor(basePath: string) {
-        this.baseUrl = `${apiConfig.baseUrl}/${basePath}`;
+    protected constructor(basePath: string) {
+        this.basePath = basePath;
     }
 
-    protected async get<T>(path: string, queryParams?: Record<string, string | number | boolean>): Promise<T> {
-        let url = `${this.baseUrl}${path}`;
-        if (queryParams) {
-            const query = new URLSearchParams();
-            Object.entries(queryParams).forEach(([key, value]) => {
-                if (value !== undefined && value !== null) {
-                    query.append(key, value.toString());
-                }
-            });
-            url += `?${query.toString()}`;
+    private static assertSuccessResponse(response: AxiosResponse<unknown, unknown>): void {
+        if (response.status / 100 !== 2) {
+            throw new HttpErrorResponseException(response);
         }
+    }
 
-        const res = await fetch(url);
-        if (!res.ok) {
-            const errorData = await res.json().catch(() => ({}));
-            throw new Error(errorData?.error || `Error ${res.status}: ${res.statusText}`);
-        }
-
-        return res.json();
+    protected async get<T>(path: string, queryParams?: QueryParams, responseType?: ResponseType): Promise<T> {
+        const response = await apiClient.get<T>(this.absolutePathFor(path), { params: queryParams, responseType });
+        BaseController.assertSuccessResponse(response);
+        return response.data;
     }
 
     protected async post<T>(path: string, body: unknown): Promise<T> {
-        const res = await fetch(`${this.baseUrl}${path}`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-        });
-
-        if (!res.ok) {
-            const errorData = await res.json().catch(() => ({}));
-            throw new Error(errorData?.error || `Error ${res.status}: ${res.statusText}`);
-        }
-
-        return res.json();
+        const response = await apiClient.post<T>(this.absolutePathFor(path), body);
+        BaseController.assertSuccessResponse(response);
+        return response.data;
     }
 
     protected async delete<T>(path: string): Promise<T> {
-        const res = await fetch(`${this.baseUrl}${path}`, {
-            method: "DELETE",
-        });
-
-        if (!res.ok) {
-            const errorData = await res.json().catch(() => ({}));
-            throw new Error(errorData?.error || `Error ${res.status}: ${res.statusText}`);
-        }
-
-        return res.json();
+        const response = await apiClient.delete<T>(this.absolutePathFor(path));
+        BaseController.assertSuccessResponse(response);
+        return response.data;
     }
 
     protected async put<T>(path: string, body: unknown): Promise<T> {
-        const res = await fetch(`${this.baseUrl}${path}`, {
-            method: "PUT",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-        });
+        const response = await apiClient.put<T>(this.absolutePathFor(path), body);
+        BaseController.assertSuccessResponse(response);
+        return response.data;
+    }
 
-        if (!res.ok) {
-            const errorData = await res.json().catch(() => ({}));
-            throw new Error(errorData?.error || `Error ${res.status}: ${res.statusText}`);
-        }
-
-        return res.json();
+    private absolutePathFor(path: string): string {
+        return "/" + this.basePath + path;
     }
 }
+
+type QueryParams = Record<string, string | number | boolean | undefined>;

frontend/src/controllers/controllers.ts

@@ -0,0 +1,18 @@
+import { ThemeController } from "@/controllers/themes.ts";
+import { LearningObjectController } from "@/controllers/learning-objects.ts";
+import { LearningPathController } from "@/controllers/learning-paths.ts";
+
+export function controllerGetter<T>(factory: new () => T): () => T {
+    let instance: T | undefined;
+
+    return (): T => {
+        if (!instance) {
+            instance = new factory();
+        }
+        return instance;
+    };
+}
+
+export const getThemeController = controllerGetter(ThemeController);
+export const getLearningObjectController = controllerGetter(LearningObjectController);
+export const getLearningPathController = controllerGetter(LearningPathController);

frontend/src/controllers/learning-objects.ts

@@ -0,0 +1,17 @@
+import { BaseController } from "@/controllers/base-controller.ts";
+import type { Language } from "@/data-objects/language.ts";
+import type { LearningObject } from "@/data-objects/learning-objects/learning-object.ts";
+
+export class LearningObjectController extends BaseController {
+    constructor() {
+        super("learningObject");
+    }
+
+    async getMetadata(hruid: string, language: Language, version: number): Promise<LearningObject> {
+        return this.get<LearningObject>(`/${hruid}`, { language, version });
+    }
+
+    async getHTML(hruid: string, language: Language, version: number): Promise<Document> {
+        return this.get<Document>(`/${hruid}/html`, { language, version }, "document");
+    }
+}

frontend/src/controllers/learning-paths.ts

@@ -0,0 +1,32 @@
+import { BaseController } from "@/controllers/base-controller.ts";
+import { LearningPath } from "@/data-objects/learning-paths/learning-path.ts";
+import type { Language } from "@/data-objects/language.ts";
+import { single } from "@/utils/response-assertions.ts";
+import type { LearningPathDTO } from "@/data-objects/learning-paths/learning-path-dto.ts";
+
+export class LearningPathController extends BaseController {
+    constructor() {
+        super("learningPath");
+    }
+    async search(query: string): Promise<LearningPath[]> {
+        const dtos = await this.get<LearningPathDTO[]>("/", { search: query });
+        return dtos.map((dto) => LearningPath.fromDTO(dto));
+    }
+    async getBy(
+        hruid: string,
+        language: Language,
+        options?: { forGroup?: string; forStudent?: string },
+    ): Promise<LearningPath> {
+        const dtos = await this.get<LearningPathDTO[]>("/", {
+            hruid,
+            language,
+            forGroup: options?.forGroup,
+            forStudent: options?.forStudent,
+        });
+        return LearningPath.fromDTO(single(dtos));
+    }
+    async getAllByTheme(theme: string): Promise<LearningPath[]> {
+        const dtos = await this.get<LearningPathDTO[]>("/", { theme });
+        return dtos.map((dto) => LearningPath.fromDTO(dto));
+    }
+}