From 59e8f2fcf231081cec01c3a61bf112f68f80575a Mon Sep 17 00:00:00 2001
From: Adriaan Jacquet <adriaanjacquet@gmail.com>
Date: Sun, 23 Mar 2025 19:02:09 +0100
Subject: [PATCH] fix: submissionDTO bevat nu learningObjectIdentifier ipv elk
 veld apart

---
 backend/src/interfaces/submission.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/src/interfaces/submission.ts b/backend/src/interfaces/submission.ts
index de47e81d..d4e4eb72 100644
--- a/backend/src/interfaces/submission.ts
+++ b/backend/src/interfaces/submission.ts
@@ -4,11 +4,10 @@ import { GroupDTO, mapToGroupDTO } from './group.js';
 import { mapToStudent, mapToStudentDTO, StudentDTO } from './student.js';
 import { mapToUser } from './user';
 import { Student } from '../entities/users/student.entity';
+import { LearningObjectIdentifier } from './learning-content.js';
 
 export interface SubmissionDTO {
-    learningObjectHruid: string;
-    learningObjectLanguage: Language;
-    learningObjectVersion: number;
+    learningObjectIdentifier: LearningObjectIdentifier;
 
     submissionNumber?: number;
     submitter: StudentDTO;
@@ -27,9 +26,11 @@ export interface SubmissionDTOId {
 
 export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
     return {
-        learningObjectHruid: submission.learningObjectHruid,
-        learningObjectLanguage: submission.learningObjectLanguage,
-        learningObjectVersion: submission.learningObjectVersion,
+        learningObjectIdentifier: {
+            hruid: submission.learningObjectHruid,
+            language: submission.learningObjectLanguage,
+            version: submission.learningObjectVersion,
+        },
 
         submissionNumber: submission.submissionNumber,
         submitter: mapToStudentDTO(submission.submitter),
@@ -51,9 +52,9 @@ export function mapToSubmissionDTOId(submission: Submission): SubmissionDTOId {
 
 export function mapToSubmission(submissionDTO: SubmissionDTO): Submission {
     const submission = new Submission();
-    submission.learningObjectHruid = submissionDTO.learningObjectHruid;
-    submission.learningObjectLanguage = submissionDTO.learningObjectLanguage;
-    submission.learningObjectVersion = submissionDTO.learningObjectVersion;
+    submission.learningObjectHruid = submissionDTO.learningObjectIdentifier.hruid;
+    submission.learningObjectLanguage = submissionDTO.learningObjectIdentifier.language;
+    submission.learningObjectVersion = submissionDTO.learningObjectIdentifier.version!;
     // Submission.submissionNumber = submissionDTO.submissionNumber;
     submission.submitter = mapToStudent(submissionDTO.submitter);
     // Submission.submissionTime = submissionDTO.time;