Create and edit test groups

backend/app/crud/tests.py

@@ -90,13 +90,44 @@ def remove_group_from_test_task(
 def create_group(
     db: Session, group: schemas.TestTaskGroupCreate
 ) -> models.TestTaskGroup:
-    db_group = models.TestTaskGroup(**group.model_dump())
+    db_group = models.TestTaskGroup(
+        **group.model_dump(exclude_unset=True, exclude={"questions"})
+    )
+
+    if group.questions:
+        db_group.questions = (
+            db.query(models.TestTaskQuestion)
+            .filter(models.TestTaskQuestion.id.in_(group.questions))
+            .all()
+        )
     db.add(db_group)
     db.commit()
     db.refresh(db_group)
     return db_group
 
 
+def update_group(
+    db: Session, group: schemas.TestTaskGroupCreate, group_id: int
+) -> None:
+    current = db.query(models.TestTaskGroup).filter(models.TestTaskGroup.id == group_id)
+    current.update(
+        {
+            **group.model_dump(exclude_unset=True, exclude={"questions"}),
+        }
+    )
+
+    first = current.first()
+
+    if first:
+        first.questions = (
+            db.query(models.TestTaskQuestion)
+            .filter(models.TestTaskQuestion.id.in_(group.questions))
+            .all()
+        )
+
+    db.commit()
+
+
 def get_group(db: Session, group_id: int) -> models.TestTaskGroup | None:
     return (
         db.query(models.TestTaskGroup)

backend/app/routes/tests.py

@@ -49,6 +49,35 @@ def get_groups(
     return crud.get_groups(db)
 
 
+@require_admin("You do not have permission to get a group.")
+@testRouter.get("/groups/{group_id}", response_model=schemas.TestTaskGroup)
+def get_group(
+    group_id: int,
+    db: Session = Depends(get_db),
+):
+    group = crud.get_group(db, group_id)
+    if group is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Group not found"
+        )
+    return group
+
+
+@require_admin("You do not have permission to edit a group.")
+@testRouter.put("/groups/{group_id}", status_code=status.HTTP_204_NO_CONTENT)
+def update_group(
+    group_id: int,
+    group: schemas.TestTaskGroupCreate,
+    db: Session = Depends(get_db),
+):
+    db_group = crud.get_group(db, group_id)
+    if db_group is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Group not found"
+        )
+    crud.update_group(db, group, group_id)
+
+
 @require_admin("You do not have permission to get all the questions.")
 @testRouter.get("/questions", response_model=list[schemas.TestTaskQuestion])
 def get_questions(

backend/app/schemas/tests.py

@@ -65,6 +65,7 @@ class TestTaskGroupCreate(BaseModel):
     title: str
     demo: bool = False
     randomize: bool = True
+    questions: list[int] = []
 
 
 class TestTypingCreate(BaseModel):
@@ -74,8 +75,11 @@ class TestTypingCreate(BaseModel):
     duration: int | None = None
 
 
-class TestTaskGroup(TestTaskGroupCreate):
-    # id: int
+class TestTaskGroup(BaseModel):
+    id: int | None = None
+    title: str
+    demo: bool = False
+    randomize: bool = True
     questions: list[TestTaskQuestion] = []
 
 

frontend/src/lib/api/tests.ts

@@ -195,6 +195,13 @@ export async function getTestGroupsAPI(fetch: fetchType): Promise<any> {
 	return groups;
 }
 
+export async function getTestTaskGroupAPI(fetch: fetchType, id: number): Promise<any> {
+	const response = await fetch(`/api/tests/groups/${id}`);
+	if (!response.ok) return null;
+	const group = await response.json();
+	return group;
+}
+
 export async function getTestQuestionsAPI(fetch: fetchType): Promise<any> {
 	const response = await fetch(`/api/tests/questions`);
 	if (!response.ok) return null;
@@ -240,3 +247,46 @@ export async function updateTestTaskAPI(
 	});
 	return response.ok;
 }
+
+export async function createTestTaskGroupAPI(
+	fetch: fetchType,
+	title: string,
+	demo: boolean,
+	randomize: boolean,
+	questions: number[]
+): Promise<number | null> {
+	const response = await fetch(`/api/tests/groups`, {
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		body: JSON.stringify({
+			title,
+			demo,
+			randomize,
+			questions
+		})
+	});
+	if (!response.ok) return null;
+	const group = await response.json();
+	return group.id;
+}
+
+export async function updateTestTaskGroupAPI(
+	fetch: fetchType,
+	id: number,
+	title: string,
+	demo: boolean,
+	randomize: boolean,
+	questions: number[]
+): Promise<boolean> {
+	const response = await fetch(`/api/tests/groups/${id}`, {
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		body: JSON.stringify({
+			title,
+			demo,
+			randomize,
+			questions
+		})
+	});
+	return response.ok;
+}

frontend/src/routes/admin/tests/+page.svelte

@@ -31,7 +31,7 @@
 		{/each}
 	</tbody>
 </table>
-<div class="mt-8 mx-auto w-[64rem] flex justify-between">
+<div class="mt-8 mx-auto w-[64rem] flex justify-between pb-8">
 	<a class="button" href="/admin/tests/new">{$t('tests.create')}</a>
 	<span>
 		<a class="btn" href="/admin/studies">⏎ {$t('tests.backtostudies')}</a>

frontend/src/routes/admin/tests/groups/+page.svelte

@@ -35,7 +35,7 @@
 		{/each}
 	</tbody>
 </table>
-<div class="mt-8 mx-auto w-[64rem] flex justify-between">
+<div class="mt-8 mx-auto w-[64rem] flex justify-between pb-8">
 	<a class="button" href="/admin/tests/groups/new">{$t('tests.groups.create')}</a>
 	<span>
 		<a class="btn" href="/admin/tests">⏎ {$t('tests.groups.backtotests')}</a>

frontend/src/routes/admin/tests/groups/[id]/+page.server.ts

 import { redirect, type Actions } from '@sveltejs/kit';
-import { updateTestTypingAPI } from '$lib/api/tests';
+import { updateTestTaskGroupAPI } from '$lib/api/tests';
 
 export const actions: Actions = {
 	default: async ({ request, fetch }) => {
@@ -7,9 +7,10 @@ export const actions: Actions = {
 
 		const idStr = formData.get('id')?.toString();
 		const title = formData.get('title')?.toString();
-		const type = formData.get('type')?.toString();
+		const demo = formData.get('demo')?.toString() == 'on';
+		const randomize = formData.get('randomize')?.toString() == 'on';
 
-		if (!title || !type || !idStr || (type !== 'typing' && type !== 'task')) {
+		if (!idStr || !title) {
 			return {
 				message: 'Invalid request: Missing required fields'
 			};
@@ -23,36 +24,19 @@ export const actions: Actions = {
 			};
 		}
 
-		if (type === 'typing') {
-			const explanation = formData.get('explanation')?.toString();
-			const text = formData.get('text')?.toString();
-			const repeatStr = formData.get('repeat')?.toString();
-			const durationStr = formData.get('duration')?.toString();
+		const questions = formData
+			.getAll('questions[]')
+			.map((question) => parseInt(question.toString(), 10))
+			.filter((question) => !isNaN(question));
 
-			if (!explanation || !text || !repeatStr || !durationStr) {
-				return {
-					message: 'Invalid request: Missing required fields'
-				};
-			}
+		const ok = await updateTestTaskGroupAPI(fetch, id, title, demo, randomize, questions);
 
-			const repeat = parseInt(repeatStr, 10);
-			const duration = parseInt(durationStr, 10);
-
-			if (isNaN(repeat) || isNaN(duration)) {
-				return {
-					message: 'Invalid request: Invalid format for numbers'
-				};
-			}
-
-			const ok = await updateTestTypingAPI(fetch, id, title, explanation, text, repeat, duration);
-
-			if (!ok) {
-				return {
-					message: 'Invalid request: Failed to update test'
-				};
-			}
-
-			return redirect(303, `/admin/tests`);
+		if (!ok) {
+			return {
+				message: 'Error updating test task group'
+			};
 		}
+
+		return redirect(303, `/admin/tests/groups`);
 	}
 };

frontend/src/routes/admin/tests/groups/[id]/+page.svelte

 <script lang="ts">
-	import TestForm from '$lib/components/tests/TestForm.svelte';
+	import GroupForm from '$lib/components/tests/GroupForm.svelte';
 	import type { PageData } from './$types';
 
-	const { data }: { data: PageData } = $props();
-	const { test, possibleGroups } = data;
+	const { data, form }: { data: PageData; form: FormData } = $props();
+	const { group, possibleQuestions } = data;
 </script>
 
-<TestForm {test} {possibleGroups} />
+<GroupForm {group} {possibleQuestions} message={form?.message} />

frontend/src/routes/admin/tests/groups/[id]/+page.ts

-import { getTestAPI, getTestGroupsAPI } from '$lib/api/tests';
-import { Test } from '$lib/types/tests';
+import { getTestQuestionsAPI, getTestTaskGroupAPI } from '$lib/api/tests';
 import TestTaskGroup from '$lib/types/testTaskGroups';
+import { TestTaskQuestion } from '$lib/types/testTaskQuestions';
 import { error, type Load } from '@sveltejs/kit';
 
 export const load: Load = async ({ fetch, params }) => {
-	const id = Number(params.id);
+	const idStr = params?.id;
+
+	if (!idStr) {
+		return error(400, 'Invalid ID');
+	}
+
+	const id = parseInt(idStr, 10);
 
 	if (isNaN(id)) {
 		return error(400, 'Invalid ID');
 	}
 
-	const testRaw = await getTestAPI(fetch, id);
-	const test = Test.parse(testRaw);
+	const groupRaw = await getTestTaskGroupAPI(fetch, id);
+
+	if (!groupRaw) {
+		return error(404, 'Group not found');
+	}
+
+	const group = TestTaskGroup.parse(groupRaw);
 
-	const groupsRaw = await getTestGroupsAPI(fetch);
-	const groups = TestTaskGroup.parseAll(groupsRaw);
+	const questionsRaw = await getTestQuestionsAPI(fetch);
+	const questions = TestTaskQuestion.parseAll(questionsRaw);
 
-	return { test, possibleGroups: groups };
+	return { group, possibleQuestions: questions };
 };

frontend/src/routes/admin/tests/groups/new/+page.server.ts

 import { redirect, type Actions } from '@sveltejs/kit';
-import { createTestTypingAPI } from '$lib/api/tests';
+import { createTestTaskGroupAPI } from '$lib/api/tests';
 
 export const actions: Actions = {
 	default: async ({ request, fetch }) => {
@@ -9,7 +9,7 @@ export const actions: Actions = {
 		const demo = formData.get('demo')?.toString() == 'on';
 		const randomize = formData.get('randomize')?.toString() == 'on';
 
-		if (!title || !demo || !randomize) {
+		if (!title) {
 			return {
 				message: 'Invalid request: Missing required fields'
 			};
@@ -22,6 +22,12 @@ export const actions: Actions = {
 
 		const id = await createTestTaskGroupAPI(fetch, title, demo, randomize, questions);
 
-		return redirect(303, `/admin/tests`);
+		if (id === null) {
+			return {
+				message: 'Error creating test task group'
+			};
+		}
+
+		return redirect(303, `/admin/tests/groups`);
 	}
 };