tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
Archived
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix: submissionDTO bevat nu learningObjectIdentifier ipv elk veld apart

Browse source
This commit is contained in:
Adriaan Jacquet 2025-03-23 19:02:09 +01:00
parent fe1a6b7eea
commit 59e8f2fcf2
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
backend/src/interfaces/submission.ts
View file

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