From 8edd4f02251d96769f0329836b580ab8e1680d52 Mon Sep 17 00:00:00 2001
From: Gerald Schmittinger <gerald.schmittinger@ugent.be>
Date: Tue, 20 May 2025 13:26:39 +0200
Subject: [PATCH] fix: Logica vragen stellen gecorrigeerd (WIP)

---
 backend/src/data/questions/question-repository.ts     |  9 ++-------
 backend/src/entities/questions/question.entity.ts     |  6 +++---
 frontend/src/components/QuestionBox.vue               | 11 ++++++-----
 frontend/src/controllers/questions.ts                 |  2 +-
 .../src/views/learning-paths/LearningPathPage.vue     | 10 +++++-----
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts
index 6a3c0ead..a07a0a94 100644
--- a/backend/src/data/questions/question-repository.ts
+++ b/backend/src/data/questions/question-repository.ts
@@ -18,13 +18,8 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
             content: question.content,
             timestamp: new Date(),
         });
-        await this.insert(questionEntity);
-        questionEntity.learningObjectHruid = question.loId.hruid;
-        questionEntity.learningObjectLanguage = question.loId.language;
-        questionEntity.learningObjectVersion = question.loId.version;
-        questionEntity.author = question.author;
-        questionEntity.inGroup = question.inGroup;
-        questionEntity.content = question.content;
+        console.log(questionEntity)
+        await this.save(questionEntity, { preventOverwrite: true });
         return questionEntity;
     }
     public async findAllQuestionsAboutLearningObject(loId: LearningObjectIdentifier): Promise<Question[]> {
diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts
index 44ccfbd3..0b41f2f7 100644
--- a/backend/src/entities/questions/question.entity.ts
+++ b/backend/src/entities/questions/question.entity.ts
@@ -6,6 +6,9 @@ import { Group } from '../assignments/group.entity.js';
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {
+    @PrimaryKey({ type: 'integer', autoincrement: true })
+    sequenceNumber?: number;
+
     @PrimaryKey({ type: 'string' })
     learningObjectHruid!: string;
 
@@ -18,9 +21,6 @@ export class Question {
     @PrimaryKey({ type: 'number' })
     learningObjectVersion = 1;
 
-    @PrimaryKey({ type: 'integer', autoincrement: true })
-    sequenceNumber?: number;
-
     @ManyToOne({ entity: () => Group })
     inGroup!: Group;
 
diff --git a/frontend/src/components/QuestionBox.vue b/frontend/src/components/QuestionBox.vue
index ef021793..79481975 100644
--- a/frontend/src/components/QuestionBox.vue
+++ b/frontend/src/components/QuestionBox.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
     import authService from "@/services/auth/auth-service.ts";
-    import { Language } from "@/data-objects/language.ts";
     import { computed, type ComputedRef, ref } from "vue";
     import type {  GroupDTOId } from "@dwengo-1/common/interfaces/group";
     import type { QuestionData } from "@dwengo-1/common/interfaces/question";
@@ -10,9 +9,9 @@
     import { AccountType } from "@dwengo-1/common/util/account-types.ts";
 
     const props = defineProps<{
-        hruid: string;
-        language: Language;
-        learningObjectHruid?: string;
+        learningObjectHruid: string;
+        learningObjectLanguage: string;
+        learningObjectVersion: number;
         forGroup?: GroupDTOId | undefined;
         withTitle?: boolean;
     }>();
@@ -25,7 +24,8 @@
 
     const loID: ComputedRef<LearningObjectIdentifierDTO> = computed(() => ({
         hruid: props.learningObjectHruid as string,
-        language: props.language,
+        language: props.learningObjectLanguage,
+        version: props.learningObjectVersion
     }));
     const createQuestionMutation = useCreateQuestionMutation(loID);
 
@@ -56,6 +56,7 @@
 
 <template>
     <h3 v-if="props.withTitle && showQuestionBox">{{ t("askAQuestion") }}:</h3>
+    {{ props.forGroup }}
     <div
         class="question-box"
         v-if="showQuestionBox"
diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts
index fb4149f4..6765151f 100644
--- a/frontend/src/controllers/questions.ts
+++ b/frontend/src/controllers/questions.ts
@@ -14,7 +14,7 @@ export class QuestionController extends BaseController {
     loId: LearningObjectIdentifierDTO;
 
     constructor(loId: LearningObjectIdentifierDTO) {
-        super(`learningObject/${loId.hruid}/:${loId.version}/questions`);
+        super(`learningObject/${loId.hruid}/${loId.version}/questions`);
         this.loId = loId;
     }
 
diff --git a/frontend/src/views/learning-paths/LearningPathPage.vue b/frontend/src/views/learning-paths/LearningPathPage.vue
index 746a42f9..4eb0331a 100644
--- a/frontend/src/views/learning-paths/LearningPathPage.vue
+++ b/frontend/src/views/learning-paths/LearningPathPage.vue
@@ -339,7 +339,7 @@
             </v-btn>
         </div>
         <using-query-result
-            v-if="forGroup"
+            v-if="currentNode && forGroup"
             :query-result="getQuestionsQuery"
             v-slot="questionsResponse: { data: QuestionsResponse }"
         >
@@ -354,10 +354,10 @@
                 </span>
             </div>
             <QuestionBox
-                :hruid="props.hruid"
-                :language="props.language"
-                :learningObjectHruid="props.learningObjectHruid"
-                :forGroup="forGroup"
+                :learningObjectHruid="currentNode.learningobjectHruid"
+                :learningObjectLanguage="currentNode.language"
+                :learningObjectVersion="currentNode.version"
+                :forGroup="{assignment: forGroup.assignmentNo, class: forGroup.classId, groupNumber: forGroup.forGroup}"
                 @updated="refetchQuestions"
             />
             <QandA :questions="(questionsResponse.data.questions as QuestionDTO[]) ?? []" />