Merge pull request #160 from SELab-2/refactor/common

refactor: Verplaats DTO's naar gemeenschappelijk package

backend/Dockerfile

@@ -1,38 +1,51 @@
 FROM node:22 AS build-stage
 
-WORKDIR /app
+WORKDIR /app/dwengo
 
 # Install dependencies
 
 COPY package*.json ./
 COPY backend/package.json ./backend/
+# Backend depends on common
+COPY common/package.json ./common/
 
 RUN npm install --silent
 
 # Build the backend
 
 # Root tsconfig.json
-COPY tsconfig.json ./
+COPY tsconfig.json tsconfig.build.json ./
 
-WORKDIR /app/backend
-
-COPY backend ./
-COPY docs /app/docs
+COPY backend ./backend
+COPY common ./common
+COPY docs ./docs
 
 RUN npm run build
 
 FROM node:22 AS production-stage
 
-WORKDIR /app
+WORKDIR /app/dwengo
 
-COPY package-lock.json backend/package.json ./
+# Copy static files
+
+COPY ./backend/i18n ./i18n
+
+# Copy built files
+
+COPY --from=build-stage /app/dwengo/common/dist ./common/dist
+COPY --from=build-stage /app/dwengo/backend/dist ./backend/dist
+
+COPY package*.json ./
+COPY backend/package.json ./backend/
+# Backend depends on common
+COPY common/package.json ./common/
 
 RUN npm install --silent --only=production
 
-COPY ./docs /docs
-COPY ./backend/i18n /app/i18n
-COPY --from=build-stage /app/backend/dist ./dist/
+COPY ./docs ./docs
+COPY ./backend/i18n ./backend/i18n
+COPY ./backend/.env ./backend/.env
 
 EXPOSE 3000
 
-CMD ["node", "--env-file=.env", "dist/app.js"]
+CMD ["node", "--env-file=/app/dwengo/backend/.env", "/app/dwengo/backend/dist/app.js"]

backend/config.js

@@ -1,7 +0,0 @@
-// Can be placed in dotenv but found it redundant
-// Import dotenv from "dotenv";
-// Load .env file
-// Dotenv.config();
-export const DWENGO_API_BASE = 'https://dwengo.org/backend/api';
-export const FALLBACK_LANG = 'nl';
-export const FALLBACK_SEQ_NUM = 1;

backend/package.json

@@ -1,16 +1,18 @@
 {
-    "name": "dwengo-1-backend",
+    "name": "@dwengo-1/backend",
     "version": "0.1.1",
     "description": "Backend for Dwengo-1",
     "private": true,
     "type": "module",
+    "main": "dist/app.js",
     "scripts": {
-        "build": "cross-env NODE_ENV=production tsc --project tsconfig.json",
+        "build": "cross-env NODE_ENV=production tsc --build",
         "dev": "cross-env NODE_ENV=development tsx watch --env-file=.env.development.local src/app.ts",
         "start": "cross-env NODE_ENV=production node --env-file=.env dist/app.js",
         "format": "prettier --write src/",
         "format-check": "prettier --check src/",
         "lint": "eslint . --fix",
+        "pretest:unit": "npm run build",
         "test:unit": "vitest --run"
     },
     "dependencies": {
@@ -24,6 +26,7 @@
         "cross": "^1.0.0",
         "cross-env": "^7.0.3",
         "dotenv": "^16.4.7",
+        "dwengo-1-common": "^0.1.1",
         "express": "^5.0.1",
         "express-jwt": "^8.5.1",
         "gift-pegjs": "^1.0.2",

backend/src/controllers/assignments.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import { createAssignment, getAllAssignments, getAssignment, getAssignmentsSubmissions } from '../services/assignments.js';
-import { AssignmentDTO } from '../interfaces/assignment.js';
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 
 // Typescript is annoying with parameter forwarding from class.ts
 interface AssignmentParams {

backend/src/controllers/classes.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js';
-import { ClassDTO } from '../interfaces/class.js';
+import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 
 export async function getAllClassesHandler(req: Request, res: Response): Promise<void> {
     const full = req.query.full === 'true';

backend/src/controllers/groups.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import { createGroup, getAllGroups, getGroup, getGroupSubmissions } from '../services/groups.js';
-import { GroupDTO } from '../interfaces/group.js';
+import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 
 // Typescript is annoywith with parameter forwarding from class.ts
 interface GroupParams {

backend/src/controllers/learning-objects.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from 'express';
 import { FALLBACK_LANG } from '../config.js';
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '../interfaces/learning-content.js';
 import learningObjectService from '../services/learning-objects/learning-object-service.js';
-import { Language } from '../entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 import attachmentService from '../services/learning-objects/attachment-service.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
 import { envVars, getEnvVar } from '../util/envVars.js';
+import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 function getLearningObjectIdentifierFromRequest(req: Request): LearningObjectIdentifier {
     if (!req.params.hruid) {

backend/src/controllers/learning-paths.ts

@@ -2,7 +2,7 @@ import { Request, Response } from 'express';
 import { themes } from '../data/themes.js';
 import { FALLBACK_LANG } from '../config.js';
 import learningPathService from '../services/learning-paths/learning-path-service.js';
-import { Language } from '../entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 import {
     PersonalizationTarget,
     personalizedForGroup,

backend/src/controllers/questions.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
 import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.js';
-import { QuestionDTO, QuestionId } from '../interfaces/question.js';
 import { FALLBACK_LANG, FALLBACK_SEQ_NUM } from '../config.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { Language } from '../entities/content/language.js';
+import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
+import { Language } from '@dwengo-1/common/util/language';
 
 function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;

backend/src/controllers/students.ts

@@ -9,7 +9,8 @@ import {
     getStudentGroups,
     getStudentSubmissions,
 } from '../services/students.js';
-import { StudentDTO } from '../interfaces/student.js';
+
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 
 // TODO: accept arguments (full, ...)
 // TODO: endpoints

backend/src/controllers/submissions.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { createSubmission, deleteSubmission, getSubmission } from '../services/submissions.js';
-import { Language, languageMap } from '../entities/content/language.js';
-import { SubmissionDTO } from '../interfaces/submission';
+import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
+import { Language, languageMap } from '@dwengo-1/common/util/language';
 
 interface SubmissionParams {
     hruid: string;

backend/src/controllers/teachers.ts

@@ -8,7 +8,7 @@ import {
     getStudentsByTeacher,
     getTeacher,
 } from '../services/teachers.js';
-import { TeacherDTO } from '../interfaces/teacher.js';
+import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 
 export async function getAllTeachersHandler(req: Request, res: Response): Promise<void> {
     const full = req.query.full === 'true';

backend/src/data/content/attachment-repository.ts

@@ -1,6 +1,6 @@
 import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { Attachment } from '../../entities/content/attachment.entity.js';
-import { Language } from '../../entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier';
 
 export class AttachmentRepository extends DwengoEntityRepository<Attachment> {

backend/src/data/content/learning-object-repository.ts

@@ -1,7 +1,7 @@
 import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
-import { Language } from '../../entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 import { Teacher } from '../../entities/users/teacher.entity.js';
 
 export class LearningObjectRepository extends DwengoEntityRepository<LearningObject> {

backend/src/data/content/learning-path-repository.ts

@@ -1,6 +1,6 @@
 import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { LearningPath } from '../../entities/content/learning-path.entity.js';
-import { Language } from '../../entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 export class LearningPathRepository extends DwengoEntityRepository<LearningPath> {
     public async findByHruidAndLanguage(hruid: string, language: Language): Promise<LearningPath | null> {

backend/src/entities/assignments/assignment.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
 import { Class } from '../classes/class.entity.js';
 import { Group } from './group.entity.js';
-import { Language } from '../content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 import { AssignmentRepository } from '../../data/assignments/assignment-repository.js';
 
 @Entity({

backend/src/entities/assignments/submission.entity.ts

@@ -1,8 +1,8 @@
 import { Student } from '../users/student.entity.js';
 import { Group } from './group.entity.js';
 import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
-import { Language } from '../content/language.js';
 import { SubmissionRepository } from '../../data/assignments/submission-repository.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 @Entity({ repository: () => SubmissionRepository })
 export class Submission {

backend/src/entities/classes/class-join-request.entity.ts

@@ -2,12 +2,7 @@ import { Entity, Enum, ManyToOne } from '@mikro-orm/core';
 import { Student } from '../users/student.entity.js';
 import { Class } from './class.entity.js';
 import { ClassJoinRequestRepository } from '../../data/classes/class-join-request-repository.js';
-
-export enum ClassJoinRequestStatus {
-    Open = 'open',
-    Accepted = 'accepted',
-    Declined = 'declined',
-}
+import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
 
 @Entity({
     repository: () => ClassJoinRequestRepository,

backend/src/entities/content/language.ts

@@ -1,193 +0,0 @@
-export enum Language {
-    Afar = 'aa',
-    Abkhazian = 'ab',
-    Afrikaans = 'af',
-    Akan = 'ak',
-    Albanian = 'sq',
-    Amharic = 'am',
-    Arabic = 'ar',
-    Aragonese = 'an',
-    Armenian = 'hy',
-    Assamese = 'as',
-    Avaric = 'av',
-    Avestan = 'ae',
-    Aymara = 'ay',
-    Azerbaijani = 'az',
-    Bashkir = 'ba',
-    Bambara = 'bm',
-    Basque = 'eu',
-    Belarusian = 'be',
-    Bengali = 'bn',
-    Bihari = 'bh',
-    Bislama = 'bi',
-    Bosnian = 'bs',
-    Breton = 'br',
-    Bulgarian = 'bg',
-    Burmese = 'my',
-    Catalan = 'ca',
-    Chamorro = 'ch',
-    Chechen = 'ce',
-    Chinese = 'zh',
-    ChurchSlavic = 'cu',
-    Chuvash = 'cv',
-    Cornish = 'kw',
-    Corsican = 'co',
-    Cree = 'cr',
-    Czech = 'cs',
-    Danish = 'da',
-    Divehi = 'dv',
-    Dutch = 'nl',
-    Dzongkha = 'dz',
-    English = 'en',
-    Esperanto = 'eo',
-    Estonian = 'et',
-    Ewe = 'ee',
-    Faroese = 'fo',
-    Fijian = 'fj',
-    Finnish = 'fi',
-    French = 'fr',
-    Frisian = 'fy',
-    Fulah = 'ff',
-    Georgian = 'ka',
-    German = 'de',
-    Gaelic = 'gd',
-    Irish = 'ga',
-    Galician = 'gl',
-    Manx = 'gv',
-    Greek = 'el',
-    Guarani = 'gn',
-    Gujarati = 'gu',
-    Haitian = 'ht',
-    Hausa = 'ha',
-    Hebrew = 'he',
-    Herero = 'hz',
-    Hindi = 'hi',
-    HiriMotu = 'ho',
-    Croatian = 'hr',
-    Hungarian = 'hu',
-    Igbo = 'ig',
-    Icelandic = 'is',
-    Ido = 'io',
-    SichuanYi = 'ii',
-    Inuktitut = 'iu',
-    Interlingue = 'ie',
-    Interlingua = 'ia',
-    Indonesian = 'id',
-    Inupiaq = 'ik',
-    Italian = 'it',
-    Javanese = 'jv',
-    Japanese = 'ja',
-    Kalaallisut = 'kl',
-    Kannada = 'kn',
-    Kashmiri = 'ks',
-    Kanuri = 'kr',
-    Kazakh = 'kk',
-    Khmer = 'km',
-    Kikuyu = 'ki',
-    Kinyarwanda = 'rw',
-    Kirghiz = 'ky',
-    Komi = 'kv',
-    Kongo = 'kg',
-    Korean = 'ko',
-    Kuanyama = 'kj',
-    Kurdish = 'ku',
-    Lao = 'lo',
-    Latin = 'la',
-    Latvian = 'lv',
-    Limburgan = 'li',
-    Lingala = 'ln',
-    Lithuanian = 'lt',
-    Luxembourgish = 'lb',
-    LubaKatanga = 'lu',
-    Ganda = 'lg',
-    Macedonian = 'mk',
-    Marshallese = 'mh',
-    Malayalam = 'ml',
-    Maori = 'mi',
-    Marathi = 'mr',
-    Malay = 'ms',
-    Malagasy = 'mg',
-    Maltese = 'mt',
-    Mongolian = 'mn',
-    Nauru = 'na',
-    Navajo = 'nv',
-    SouthNdebele = 'nr',
-    NorthNdebele = 'nd',
-    Ndonga = 'ng',
-    Nepali = 'ne',
-    NorwegianNynorsk = 'nn',
-    NorwegianBokmal = 'nb',
-    Norwegian = 'no',
-    Chichewa = 'ny',
-    Occitan = 'oc',
-    Ojibwa = 'oj',
-    Oriya = 'or',
-    Oromo = 'om',
-    Ossetian = 'os',
-    Punjabi = 'pa',
-    Persian = 'fa',
-    Pali = 'pi',
-    Polish = 'pl',
-    Portuguese = 'pt',
-    Pashto = 'ps',
-    Quechua = 'qu',
-    Romansh = 'rm',
-    Romanian = 'ro',
-    Rundi = 'rn',
-    Russian = 'ru',
-    Sango = 'sg',
-    Sanskrit = 'sa',
-    Sinhala = 'si',
-    Slovak = 'sk',
-    Slovenian = 'sl',
-    NorthernSami = 'se',
-    Samoan = 'sm',
-    Shona = 'sn',
-    Sindhi = 'sd',
-    Somali = 'so',
-    Sotho = 'st',
-    Spanish = 'es',
-    Sardinian = 'sc',
-    Serbian = 'sr',
-    Swati = 'ss',
-    Sundanese = 'su',
-    Swahili = 'sw',
-    Swedish = 'sv',
-    Tahitian = 'ty',
-    Tamil = 'ta',
-    Tatar = 'tt',
-    Telugu = 'te',
-    Tajik = 'tg',
-    Tagalog = 'tl',
-    Thai = 'th',
-    Tibetan = 'bo',
-    Tigrinya = 'ti',
-    Tonga = 'to',
-    Tswana = 'tn',
-    Tsonga = 'ts',
-    Turkmen = 'tk',
-    Turkish = 'tr',
-    Twi = 'tw',
-    Uighur = 'ug',
-    Ukrainian = 'uk',
-    Urdu = 'ur',
-    Uzbek = 'uz',
-    Venda = 've',
-    Vietnamese = 'vi',
-    Volapuk = 'vo',
-    Welsh = 'cy',
-    Walloon = 'wa',
-    Wolof = 'wo',
-    Xhosa = 'xh',
-    Yiddish = 'yi',
-    Yoruba = 'yo',
-    Zhuang = 'za',
-    Zulu = 'zu',
-}
-
-export const languageMap: Record<string, Language> = {
-    nl: Language.Dutch,
-    fr: Language.French,
-    en: Language.English,
-    de: Language.German,
-};

backend/src/entities/content/learning-object-identifier.ts

@@ -1,4 +1,4 @@
-import { Language } from './language.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 export class LearningObjectIdentifier {
     constructor(

backend/src/entities/content/learning-object.entity.ts

@@ -1,5 +1,4 @@
 import { Embedded, Entity, Enum, ManyToMany, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
-import { Language } from './language.js';
 import { Attachment } from './attachment.entity.js';
 import { Teacher } from '../users/teacher.entity.js';
 import { DwengoContentType } from '../../services/learning-objects/processing/content-type.js';
@@ -7,6 +6,7 @@ import { v4 } from 'uuid';
 import { LearningObjectRepository } from '../../data/content/learning-object-repository.js';
 import { EducationalGoal } from './educational-goal.entity.js';
 import { ReturnValue } from './return-value.entity.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 @Entity({ repository: () => LearningObjectRepository })
 export class LearningObject {

backend/src/entities/content/learning-path-node.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, Enum, ManyToOne, OneToMany, PrimaryKey, Property, Rel } from '@mikro-orm/core';
-import { Language } from './language.js';
 import { LearningPath } from './learning-path.entity.js';
 import { LearningPathTransition } from './learning-path-transition.entity.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 @Entity()
 export class LearningPathNode {

backend/src/entities/content/learning-path.entity.ts

@@ -1,8 +1,8 @@
 import { Entity, Enum, ManyToMany, OneToMany, PrimaryKey, Property } from '@mikro-orm/core';
-import { Language } from './language.js';
 import { Teacher } from '../users/teacher.entity.js';
 import { LearningPathRepository } from '../../data/content/learning-path-repository.js';
 import { LearningPathNode } from './learning-path-node.entity.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 @Entity({ repository: () => LearningPathRepository })
 export class LearningPath {

backend/src/entities/questions/question.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
-import { Language } from '../content/language.js';
 import { Student } from '../users/student.entity.js';
 import { QuestionRepository } from '../../data/questions/question-repository.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {

backend/src/interfaces/answer.ts

@@ -1,14 +1,7 @@
-import { mapToUserDTO, UserDTO } from './user.js';
-import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from './question.js';
+import { mapToUserDTO } from './user.js';
+import { mapToQuestionDTO, mapToQuestionId } from './question.js';
 import { Answer } from '../entities/questions/answer.entity.js';
-
-export interface AnswerDTO {
-    author: UserDTO;
-    toQuestion: QuestionDTO;
-    sequenceNumber: number;
-    timestamp: string;
-    content: string;
-}
+import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 
 /**
  * Convert a Question entity to a DTO format.
@@ -23,12 +16,6 @@ export function mapToAnswerDTO(answer: Answer): AnswerDTO {
     };
 }
 
-export interface AnswerId {
-    author: string;
-    toQuestion: QuestionId;
-    sequenceNumber: number;
-}
-
 export function mapToAnswerId(answer: AnswerDTO): AnswerId {
     return {
         author: answer.author.username,

backend/src/interfaces/assignment.ts

@@ -1,19 +1,9 @@
+import { languageMap } from '@dwengo-1/common/util/language';
 import { FALLBACK_LANG } from '../config.js';
 import { Assignment } from '../entities/assignments/assignment.entity.js';
 import { Class } from '../entities/classes/class.entity.js';
-import { languageMap } from '../entities/content/language.js';
-import { GroupDTO } from './group.js';
 import { getLogger } from '../logging/initalize.js';
-
-export interface AssignmentDTO {
-    id: number;
-    class: string; // Id of class 'within'
-    title: string;
-    description: string;
-    learningPath: string;
-    language: string;
-    groups?: GroupDTO[] | string[]; // TODO
-}
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
 
 export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {
     return {

backend/src/interfaces/class.ts

@@ -2,14 +2,7 @@ import { Collection } from '@mikro-orm/core';
 import { Class } from '../entities/classes/class.entity.js';
 import { Student } from '../entities/users/student.entity.js';
 import { Teacher } from '../entities/users/teacher.entity.js';
-
-export interface ClassDTO {
-    id: string;
-    displayName: string;
-    teachers: string[];
-    students: string[];
-    joinRequests: string[];
-}
+import { ClassDTO } from '@dwengo-1/common/interfaces/class';
 
 export function mapToClassDTO(cls: Class): ClassDTO {
     return {

backend/src/interfaces/group.ts

@@ -1,12 +1,7 @@
 import { Group } from '../entities/assignments/group.entity.js';
-import { AssignmentDTO, mapToAssignmentDTO } from './assignment.js';
-import { mapToStudentDTO, StudentDTO } from './student.js';
-
-export interface GroupDTO {
-    assignment: number | AssignmentDTO;
-    groupNumber: number;
-    members: string[] | StudentDTO[];
-}
+import { mapToAssignmentDTO } from './assignment.js';
+import { mapToStudentDTO } from './student.js';
+import { GroupDTO } from '@dwengo-1/common/interfaces/group';
 
 export function mapToGroupDTO(group: Group): GroupDTO {
     return {

backend/src/interfaces/learning-content.ts

@@ -1,112 +0,0 @@
-import { Language } from '../entities/content/language';
-
-export interface Transition {
-    default: boolean;
-    _id: string;
-    next: {
-        _id: string;
-        hruid: string;
-        version: number;
-        language: string;
-    };
-}
-
-export interface LearningObjectIdentifier {
-    hruid: string;
-    language: Language;
-    version?: number;
-}
-
-export interface LearningObjectNode {
-    _id: string;
-    learningobject_hruid: string;
-    version: number;
-    language: Language;
-    start_node?: boolean;
-    transitions: Transition[];
-    created_at: string;
-    updatedAt: string;
-    done?: boolean; // True if a submission exists for this node by the user for whom the learning path is customized.
-}
-
-export interface LearningPath {
-    _id: string;
-    language: string;
-    hruid: string;
-    title: string;
-    description: string;
-    image?: string; // Image might be missing, so it's optional
-    num_nodes: number;
-    num_nodes_left: number;
-    nodes: LearningObjectNode[];
-    keywords: string;
-    target_ages: number[];
-    min_age: number;
-    max_age: number;
-    __order: number;
-}
-
-export interface LearningPathIdentifier {
-    hruid: string;
-    language: Language;
-}
-
-export interface EducationalGoal {
-    source: string;
-    id: string;
-}
-
-export interface ReturnValue {
-    callback_url: string;
-    callback_schema: Record<string, unknown>;
-}
-
-export interface LearningObjectMetadata {
-    _id: string;
-    uuid: string;
-    hruid: string;
-    version: number;
-    language: Language;
-    title: string;
-    description: string;
-    difficulty: number;
-    estimated_time: number;
-    available: boolean;
-    teacher_exclusive: boolean;
-    educational_goals: EducationalGoal[];
-    keywords: string[];
-    target_ages: number[];
-    content_type: string; // Markdown, image, etc.
-    content_location?: string;
-    skos_concepts?: string[];
-    return_value?: ReturnValue;
-}
-
-export interface FilteredLearningObject {
-    key: string;
-    _id: string;
-    uuid: string;
-    version: number;
-    title: string;
-    htmlUrl: string;
-    language: Language;
-    difficulty: number;
-    estimatedTime?: number;
-    available: boolean;
-    teacherExclusive: boolean;
-    educationalGoals: EducationalGoal[];
-    keywords: string[];
-    description: string;
-    targetAges: number[];
-    contentType: string;
-    contentLocation?: string;
-    skosConcepts?: string[];
-    returnValue?: ReturnValue;
-}
-
-export interface LearningPathResponse {
-    success: boolean;
-    source: string;
-    data: LearningPath[] | null;
-    message?: string;
-}

backend/src/interfaces/question.ts

@@ -1,14 +1,6 @@
 import { Question } from '../entities/questions/question.entity.js';
-import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { mapToStudentDTO, StudentDTO } from './student.js';
-
-export interface QuestionDTO {
-    learningObjectIdentifier: LearningObjectIdentifier;
-    sequenceNumber?: number;
-    author: StudentDTO;
-    timestamp?: string;
-    content: string;
-}
+import { mapToStudentDTO } from './student.js';
+import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 
 /**
  * Convert a Question entity to a DTO format.
@@ -29,11 +21,6 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
     };
 }
 
-export interface QuestionId {
-    learningObjectIdentifier: LearningObjectIdentifier;
-    sequenceNumber: number;
-}
-
 export function mapToQuestionId(question: QuestionDTO): QuestionId {
     return {
         learningObjectIdentifier: question.learningObjectIdentifier,

backend/src/interfaces/student.ts

@@ -1,18 +1,6 @@
 import { Student } from '../entities/users/student.entity.js';
 import { getStudentRepository } from '../data/repositories.js';
-
-export interface StudentDTO {
-    id: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    endpoints?: {
-        classes: string;
-        questions: string;
-        invitations: string;
-        groups: string;
-    };
-}
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 
 export function mapToStudentDTO(student: Student): StudentDTO {
     return {

backend/src/interfaces/submission.ts

@@ -1,26 +1,7 @@
 import { Submission } from '../entities/assignments/submission.entity.js';
-import { Language } from '../entities/content/language.js';
-import { GroupDTO, mapToGroupDTO } from './group.js';
-import { mapToStudent, mapToStudentDTO, StudentDTO } from './student.js';
-import { LearningObjectIdentifier } from './learning-content.js';
-
-export interface SubmissionDTO {
-    learningObjectIdentifier: LearningObjectIdentifier;
-
-    submissionNumber?: number;
-    submitter: StudentDTO;
-    time?: Date;
-    group?: GroupDTO;
-    content: string;
-}
-
-export interface SubmissionDTOId {
-    learningObjectHruid: string;
-    learningObjectLanguage: Language;
-    learningObjectVersion: number;
-
-    submissionNumber?: number;
-}
+import { mapToGroupDTO } from './group.js';
+import { mapToStudent, mapToStudentDTO } from './student.js';
+import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 
 export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
     return {

backend/src/interfaces/teacher-invitation.ts

@@ -1,12 +1,7 @@
 import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
-import { ClassDTO, mapToClassDTO } from './class.js';
-import { mapToUserDTO, UserDTO } from './user.js';
-
-export interface TeacherInvitationDTO {
-    sender: string | UserDTO;
-    receiver: string | UserDTO;
-    class: string | ClassDTO;
-}
+import { mapToClassDTO } from './class.js';
+import { mapToUserDTO } from './user.js';
+import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
 
 export function mapToTeacherInvitationDTO(invitation: TeacherInvitation): TeacherInvitationDTO {
     return {

backend/src/interfaces/teacher.ts

@@ -1,18 +1,6 @@
 import { Teacher } from '../entities/users/teacher.entity.js';
 import { getTeacherRepository } from '../data/repositories.js';
-
-export interface TeacherDTO {
-    id: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    endpoints?: {
-        classes: string;
-        questions: string;
-        invitations: string;
-        groups: string;
-    };
-}
+import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
 
 export function mapToTeacherDTO(teacher: Teacher): TeacherDTO {
     return {

backend/src/interfaces/user.ts

@@ -1,17 +1,5 @@
 import { User } from '../entities/users/user.entity.js';
-
-export interface UserDTO {
-    id?: string;
-    username: string;
-    firstName: string;
-    lastName: string;
-    endpoints?: {
-        self: string;
-        classes: string;
-        questions: string;
-        invitations: string;
-    };
-}
+import { UserDTO } from '@dwengo-1/common/interfaces/user';
 
 export function mapToUserDTO(user: User): UserDTO {
     return {

backend/src/services/assignments.ts

@@ -1,6 +1,8 @@
 import { getAssignmentRepository, getClassRepository, getGroupRepository, getSubmissionRepository } from '../data/repositories.js';
-import { AssignmentDTO, mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js';
-import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
+import { mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId } from '../interfaces/assignment.js';
+import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { getLogger } from '../logging/initalize.js';
 
 export async function getAllAssignments(classid: string, full: boolean): Promise<AssignmentDTO[]> {

backend/src/services/classes.ts

@@ -1,8 +1,11 @@
 import { getClassRepository, getStudentRepository, getTeacherInvitationRepository, getTeacherRepository } from '../data/repositories.js';
-import { ClassDTO, mapToClassDTO } from '../interfaces/class.js';
-import { mapToStudentDTO, StudentDTO } from '../interfaces/student.js';
-import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds, TeacherInvitationDTO } from '../interfaces/teacher-invitation.js';
+import { mapToClassDTO } from '../interfaces/class.js';
+import { mapToStudentDTO } from '../interfaces/student.js';
+import { mapToTeacherInvitationDTO, mapToTeacherInvitationDTOIds } from '../interfaces/teacher-invitation.js';
 import { getLogger } from '../logging/initalize.js';
+import { ClassDTO } from '@dwengo-1/common/interfaces/class';
+import { TeacherInvitationDTO } from '@dwengo-1/common/interfaces/teacher-invitation';
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 
 const logger = getLogger();
 

backend/src/services/groups.ts

@@ -6,8 +6,10 @@ import {
     getSubmissionRepository,
 } from '../data/repositories.js';
 import { Group } from '../entities/assignments/group.entity.js';
-import { GroupDTO, mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
-import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
+import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
+import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
+import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
 import { getLogger } from '../logging/initalize.js';
 
 export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number, full: boolean): Promise<GroupDTO | null> {

backend/src/services/learning-objects.ts

@@ -1,6 +1,12 @@
 import { DWENGO_API_BASE } from '../config.js';
 import { fetchWithLogging } from '../util/api-helper.js';
-import { FilteredLearningObject, LearningObjectMetadata, LearningObjectNode, LearningPathResponse } from '../interfaces/learning-content.js';
+
+import {
+    FilteredLearningObject,
+    LearningObjectMetadata,
+    LearningObjectNode,
+    LearningPathResponse,
+} from '@dwengo-1/common/interfaces/learning-content';
 import { getLogger } from '../logging/initalize.js';
 
 function filterData(data: LearningObjectMetadata, htmlUrl: string): FilteredLearningObject {

backend/src/services/learning-objects/attachment-service.ts

@@ -1,6 +1,7 @@
 import { getAttachmentRepository } from '../../data/repositories.js';
 import { Attachment } from '../../entities/content/attachment.entity.js';
-import { LearningObjectIdentifier } from '../../interfaces/learning-content.js';
+
+import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 const attachmentService = {
     async getAttachment(learningObjectId: LearningObjectIdentifier, attachmentName: string): Promise<Attachment | null> {

backend/src/services/learning-objects/database-learning-object-provider.ts

@@ -1,5 +1,4 @@
 import { LearningObjectProvider } from './learning-object-provider.js';
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '../../interfaces/learning-content.js';
 import { getLearningObjectRepository, getLearningPathRepository } from '../../data/repositories.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
 import { getUrlStringForLearningObject } from '../../util/links.js';
@@ -7,6 +6,7 @@ import processingService from './processing/processing-service.js';
 import { NotFoundError } from '@mikro-orm/core';
 import learningObjectService from './learning-object-service.js';
 import { getLogger, Logger } from '../../logging/initalize.js';
+import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 const logger: Logger = getLogger();
 

backend/src/services/learning-objects/dwengo-api-learning-object-provider.ts

@@ -1,5 +1,8 @@
 import { DWENGO_API_BASE } from '../../config.js';
 import { fetchWithLogging } from '../../util/api-helper.js';
+import dwengoApiLearningPathProvider from '../learning-paths/dwengo-api-learning-path-provider.js';
+import { LearningObjectProvider } from './learning-object-provider.js';
+import { getLogger, Logger } from '../../logging/initalize.js';
 import {
     FilteredLearningObject,
     LearningObjectIdentifier,
@@ -7,10 +10,7 @@ import {
     LearningObjectNode,
     LearningPathIdentifier,
     LearningPathResponse,
-} from '../../interfaces/learning-content.js';
-import dwengoApiLearningPathProvider from '../learning-paths/dwengo-api-learning-path-provider.js';
-import { LearningObjectProvider } from './learning-object-provider.js';
-import { getLogger, Logger } from '../../logging/initalize.js';
+} from '@dwengo-1/common/interfaces/learning-content';
 
 const logger: Logger = getLogger();
 
@@ -66,12 +66,13 @@ async function fetchLearningObjects(learningPathId: LearningPathIdentifier, full
         }
 
         const objects = await Promise.all(
-            nodes.map(async (node) =>
-                dwengoApiLearningObjectProvider.getLearningObjectById({
+            nodes.map(async (node) => {
+                const learningObjectId: LearningObjectIdentifier = {
                     hruid: node.learningobject_hruid,
                     language: learningPathId.language,
-                })
-            )
+                };
+                return dwengoApiLearningObjectProvider.getLearningObjectById(learningObjectId);
+            })
         );
         return objects.filter((obj): obj is FilteredLearningObject => obj !== null);
     } catch (error) {
@@ -90,7 +91,7 @@ const dwengoApiLearningObjectProvider: LearningObjectProvider = {
             metadataUrl,
             `Metadata for Learning Object HRUID "${id.hruid}" (language ${id.language})`,
             {
-                params: id,
+                params: { ...id },
             }
         );
 
@@ -123,7 +124,7 @@ const dwengoApiLearningObjectProvider: LearningObjectProvider = {
     async getLearningObjectHTML(id: LearningObjectIdentifier): Promise<string | null> {
         const htmlUrl = `${DWENGO_API_BASE}/learningObject/getRaw`;
         const html = await fetchWithLogging<string>(htmlUrl, `Metadata for Learning Object HRUID "${id.hruid}" (language ${id.language})`, {
-            params: id,
+            params: { ...id },
         });
 
         if (!html) {

backend/src/services/learning-objects/learning-object-provider.ts

@@ -1,4 +1,4 @@
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '../../interfaces/learning-content.js';
+import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 export interface LearningObjectProvider {
     /**

backend/src/services/learning-objects/learning-object-service.ts

@@ -1,8 +1,8 @@
-import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '../../interfaces/learning-content.js';
 import dwengoApiLearningObjectProvider from './dwengo-api-learning-object-provider.js';
 import { LearningObjectProvider } from './learning-object-provider.js';
 import { envVars, getEnvVar } from '../../util/envVars.js';
 import databaseLearningObjectProvider from './database-learning-object-provider.js';
+import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 function getProvider(id: LearningObjectIdentifier): LearningObjectProvider {
     if (id.hruid.startsWith(getEnvVar(envVars.UserContentPrefix))) {

backend/src/services/learning-objects/processing/markdown/dwengo-marked-renderer.ts

@@ -8,13 +8,12 @@ import InlineImageProcessor from '../image/inline-image-processor.js';
 import * as marked from 'marked';
 import { getUrlStringForLearningObjectHTML, isValidHttpUrl } from '../../../../util/links.js';
 import { ProcessingError } from '../processing-error.js';
-import { LearningObjectIdentifier } from '../../../../interfaces/learning-content.js';
-import { Language } from '../../../../entities/content/language.js';
-
 import Image = marked.Tokens.Image;
 import Heading = marked.Tokens.Heading;
 import Link = marked.Tokens.Link;
 import RendererObject = marked.RendererObject;
+import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { Language } from '@dwengo-1/common/util/language';
 
 const prefixes = {
     learningObject: '@learning-object',

backend/src/services/learning-objects/processing/processing-service.ts

@@ -13,9 +13,9 @@ import GiftProcessor from './gift/gift-processor.js';
 import { LearningObject } from '../../../entities/content/learning-object.entity.js';
 import Processor from './processor.js';
 import { DwengoContentType } from './content-type.js';
-import { LearningObjectIdentifier } from '../../../interfaces/learning-content.js';
-import { Language } from '../../../entities/content/language.js';
 import { replaceAsync } from '../../../util/async.js';
+import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { Language } from '@dwengo-1/common/util/language';
 
 const EMBEDDED_LEARNING_OBJECT_PLACEHOLDER = /<learning-object hruid="([^"]+)" language="([^"]+)" version="([^"]+)"\/>/g;
 const LEARNING_OBJECT_DOES_NOT_EXIST = "<div class='non-existing-learning-object' />";

backend/src/services/learning-paths/database-learning-path-provider.ts

@@ -1,12 +1,18 @@
 import { LearningPathProvider } from './learning-path-provider.js';
-import { FilteredLearningObject, LearningObjectNode, LearningPath, LearningPathResponse, Transition } from '../../interfaces/learning-content.js';
 import { LearningPath as LearningPathEntity } from '../../entities/content/learning-path.entity.js';
 import { getLearningPathRepository } from '../../data/repositories.js';
-import { Language } from '../../entities/content/language.js';
 import learningObjectService from '../learning-objects/learning-object-service.js';
 import { LearningPathNode } from '../../entities/content/learning-path-node.entity.js';
 import { LearningPathTransition } from '../../entities/content/learning-path-transition.entity.js';
 import { getLastSubmissionForCustomizationTarget, isTransitionPossible, PersonalizationTarget } from './learning-path-personalization-util.js';
+import {
+    FilteredLearningObject,
+    LearningObjectNode,
+    LearningPath,
+    LearningPathResponse,
+    Transition,
+} from '@dwengo-1/common/interfaces/learning-content';
+import { Language } from '@dwengo-1/common/util/language';
 
 /**
  * Fetches the corresponding learning object for each of the nodes and creates a map that maps each node to its

backend/src/services/learning-paths/dwengo-api-learning-path-provider.ts

@@ -1,8 +1,8 @@
 import { fetchWithLogging } from '../../util/api-helper.js';
 import { DWENGO_API_BASE } from '../../config.js';
-import { LearningPath, LearningPathResponse } from '../../interfaces/learning-content.js';
 import { LearningPathProvider } from './learning-path-provider.js';
 import { getLogger, Logger } from '../../logging/initalize.js';
+import { LearningPath, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
 
 const logger: Logger = getLogger();
 

backend/src/services/learning-paths/learning-path-provider.ts

@@ -1,6 +1,6 @@
-import { LearningPath, LearningPathResponse } from '../../interfaces/learning-content.js';
-import { Language } from '../../entities/content/language.js';
+import { LearningPath, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
 import { PersonalizationTarget } from './learning-path-personalization-util.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 /**
  * Generic interface for a service which provides access to learning paths from a data source.

backend/src/services/learning-paths/learning-path-service.ts

@@ -1,9 +1,9 @@
-import { LearningPath, LearningPathResponse } from '../../interfaces/learning-content.js';
 import dwengoApiLearningPathProvider from './dwengo-api-learning-path-provider.js';
 import databaseLearningPathProvider from './database-learning-path-provider.js';
 import { envVars, getEnvVar } from '../../util/envVars.js';
-import { Language } from '../../entities/content/language.js';
 import { PersonalizationTarget } from './learning-path-personalization-util.js';
+import { LearningPath, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
+import { Language } from '@dwengo-1/common/util/language';
 
 const userContentPrefix = getEnvVar(envVars.UserContentPrefix);
 const allProviders = [dwengoApiLearningPathProvider, databaseLearningPathProvider];

backend/src/services/questions.ts

@@ -1,11 +1,13 @@
 import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js';
-import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
+import { mapToQuestionDTO, mapToQuestionId } from '../interfaces/question.js';
 import { Question } from '../entities/questions/question.entity.js';
 import { Answer } from '../entities/questions/answer.entity.js';
-import { AnswerDTO, AnswerId, mapToAnswerDTO, mapToAnswerId } from '../interfaces/answer.js';
+import { mapToAnswerDTO, mapToAnswerId } from '../interfaces/answer.js';
 import { QuestionRepository } from '../data/questions/question-repository.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { mapToStudent } from '../interfaces/student.js';
+import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
+import { AnswerDTO, AnswerId } from '@dwengo-1/common/interfaces/answer';
 
 export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise<QuestionDTO[] | QuestionId[]> {
     const questionRepository: QuestionRepository = getQuestionRepository();
@@ -73,9 +75,14 @@ export async function createQuestion(questionDTO: QuestionDTO): Promise<Question
 
     const author = mapToStudent(questionDTO.author);
 
+    const loId: LearningObjectIdentifier = {
+        ...questionDTO.learningObjectIdentifier,
+        version: questionDTO.learningObjectIdentifier.version ?? 1,
+    };
+
     try {
         await questionRepository.createQuestion({
-            loId: questionDTO.learningObjectIdentifier,
+            loId,
             author,
             content: questionDTO.content,
         });
@@ -95,8 +102,13 @@ export async function deleteQuestion(questionId: QuestionId): Promise<QuestionDT
         return null;
     }
 
+    const loId: LearningObjectIdentifier = {
+        ...questionId.learningObjectIdentifier,
+        version: questionId.learningObjectIdentifier.version ?? 1,
+    };
+
     try {
-        await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(questionId.learningObjectIdentifier, questionId.sequenceNumber);
+        await questionRepository.removeQuestionByLearningObjectAndSequenceNumber(loId, questionId.sequenceNumber);
     } catch (_) {
         return null;
     }

backend/src/services/students.ts

@@ -1,10 +1,14 @@
 import { getClassRepository, getGroupRepository, getStudentRepository, getSubmissionRepository } from '../data/repositories.js';
-import { AssignmentDTO } from '../interfaces/assignment.js';
-import { ClassDTO, mapToClassDTO } from '../interfaces/class.js';
-import { GroupDTO, mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
-import { mapToStudent, mapToStudentDTO, StudentDTO } from '../interfaces/student.js';
-import { mapToSubmissionDTO, mapToSubmissionDTOId, SubmissionDTO, SubmissionDTOId } from '../interfaces/submission.js';
+import { mapToClassDTO } from '../interfaces/class.js';
+import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js';
+import { mapToStudent, mapToStudentDTO } from '../interfaces/student.js';
+import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js';
 import { getAllAssignments } from './assignments.js';
+import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
+import { ClassDTO } from '@dwengo-1/common/interfaces/class';
+import { GroupDTO } from '@dwengo-1/common/interfaces/group';
+import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
 import { getLogger } from '../logging/initalize.js';
 
 export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {

backend/src/services/submissions.ts

@@ -1,7 +1,8 @@
 import { getSubmissionRepository } from '../data/repositories.js';
-import { Language } from '../entities/content/language.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
-import { mapToSubmission, mapToSubmissionDTO, SubmissionDTO } from '../interfaces/submission.js';
+import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
+import { SubmissionDTO } from '@dwengo-1/common/interfaces/submission';
+import { Language } from '@dwengo-1/common/util/language';
 
 export async function getSubmission(
     learningObjectHruid: string,

backend/src/services/teachers.ts

@@ -1,9 +1,12 @@
 import { getClassRepository, getLearningObjectRepository, getQuestionRepository, getTeacherRepository } from '../data/repositories.js';
-import { ClassDTO, mapToClassDTO } from '../interfaces/class.js';
+import { mapToClassDTO } from '../interfaces/class.js';
 import { getClassStudents } from './classes.js';
-import { StudentDTO } from '../interfaces/student.js';
-import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js';
-import { mapToTeacher, mapToTeacherDTO, TeacherDTO } from '../interfaces/teacher.js';
+import { mapToQuestionDTO, mapToQuestionId } from '../interfaces/question.js';
+import { mapToTeacher, mapToTeacherDTO } from '../interfaces/teacher.js';
+import { ClassDTO } from '@dwengo-1/common/interfaces/class';
+import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
+import { StudentDTO } from '@dwengo-1/common/interfaces/student';
+import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
 import { getLogger } from '../logging/initalize.js';
 
 export async function getAllTeachers(full: boolean): Promise<TeacherDTO[] | string[]> {

backend/src/util/api-helper.ts

@@ -1,6 +1,6 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import { getLogger, Logger } from '../logging/initalize.js';
-import { LearningObjectIdentifier } from '../interfaces/learning-content.js';
+import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 
 const logger: Logger = getLogger();
 

backend/src/util/links.ts

@@ -1,4 +1,4 @@
-import { LearningObjectIdentifier } from '../interfaces/learning-content';
+import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
 
 export function isValidHttpUrl(url: string): boolean {
     try {

backend/tests/data/assignments/submissions.test.ts

@@ -9,7 +9,7 @@ import {
     getSubmissionRepository,
 } from '../../../src/data/repositories';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { StudentRepository } from '../../../src/data/users/student-repository';
 import { GroupRepository } from '../../../src/data/assignments/group-repository';
 import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';

backend/tests/data/content/attachments.test.ts

@@ -4,7 +4,7 @@ import { getAttachmentRepository, getLearningObjectRepository } from '../../../s
 import { AttachmentRepository } from '../../../src/data/content/attachment-repository.js';
 import { LearningObjectRepository } from '../../../src/data/content/learning-object-repository.js';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier.js';
-import { Language } from '../../../src/entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 describe('AttachmentRepository', () => {
     let attachmentRepository: AttachmentRepository;

backend/tests/data/content/learning-objects.test.ts

@@ -3,7 +3,7 @@ import { LearningObjectRepository } from '../../../src/data/content/learning-obj
 import { getLearningObjectRepository } from '../../../src/data/repositories';
 import { setupTestApp } from '../../setup-tests';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 
 describe('LearningObjectRepository', () => {
     let learningObjectRepository: LearningObjectRepository;

backend/tests/data/content/learning-path-repository.test.ts

@@ -5,7 +5,7 @@ import { LearningPathRepository } from '../../../src/data/content/learning-path-
 import example from '../../test-assets/learning-paths/pn-werking-example.js';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity.js';
 import { expectToBeCorrectEntity } from '../../test-utils/expectations.js';
-import { Language } from '../../../src/entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 
 function expectToHaveFoundPrecisely(expected: LearningPath, result: LearningPath[]): void {
     expect(result).toHaveProperty('length');

backend/tests/data/content/learning-paths.test.ts

@@ -2,7 +2,7 @@ import { beforeAll, describe, expect, it } from 'vitest';
 import { getLearningPathRepository } from '../../../src/data/repositories';
 import { LearningPathRepository } from '../../../src/data/content/learning-path-repository';
 import { setupTestApp } from '../../setup-tests';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 
 describe('LearningPathRepository', () => {
     let learningPathRepository: LearningPathRepository;

backend/tests/data/questions/answers.test.ts

@@ -4,7 +4,7 @@ import { AnswerRepository } from '../../../src/data/questions/answer-repository'
 import { getAnswerRepository, getQuestionRepository, getTeacherRepository } from '../../../src/data/repositories';
 import { QuestionRepository } from '../../../src/data/questions/question-repository';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { TeacherRepository } from '../../../src/data/users/teacher-repository';
 
 describe('AnswerRepository', () => {

backend/tests/data/questions/questions.test.ts

@@ -4,7 +4,7 @@ import { QuestionRepository } from '../../../src/data/questions/question-reposit
 import { getQuestionRepository, getStudentRepository } from '../../../src/data/repositories';
 import { StudentRepository } from '../../../src/data/users/student-repository';
 import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 
 describe('QuestionRepository', () => {
     let questionRepository: QuestionRepository;

backend/tests/services/learning-objects/database-learning-object-provider.test.ts

@@ -5,11 +5,11 @@ import example from '../../test-assets/learning-objects/pn-werkingnotebooks/pn-w
 import { LearningObject } from '../../../src/entities/content/learning-object.entity';
 import databaseLearningObjectProvider from '../../../src/services/learning-objects/database-learning-object-provider';
 import { expectToBeCorrectFilteredLearningObject } from '../../test-utils/expectations';
-import { FilteredLearningObject } from '../../../src/interfaces/learning-content';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import learningObjectExample from '../../test-assets/learning-objects/pn-werkingnotebooks/pn-werkingnotebooks-example';
 import learningPathExample from '../../test-assets/learning-paths/pn-werking-example';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
+import { FilteredLearningObject } from '@dwengo-1/common/interfaces/learning-content';
 
 async function initExampleData(): Promise<{ learningObject: LearningObject; learningPath: LearningPath }> {
     const learningObjectRepo = getLearningObjectRepository();
@@ -37,7 +37,7 @@ describe('DatabaseLearningObjectProvider', () => {
         it('should return the learning object when it is queried by its id', async () => {
             const result: FilteredLearningObject | null = await databaseLearningObjectProvider.getLearningObjectById(exampleLearningObject);
             expect(result).toBeTruthy();
-            expectToBeCorrectFilteredLearningObject(result!, exampleLearningObject);
+            expectToBeCorrectFilteredLearningObject(result, exampleLearningObject);
         });
 
         it('should return the learning object when it is queried by only hruid and language (but not version)', async () => {
@@ -46,7 +46,7 @@ describe('DatabaseLearningObjectProvider', () => {
                 language: exampleLearningObject.language,
             });
             expect(result).toBeTruthy();
-            expectToBeCorrectFilteredLearningObject(result!, exampleLearningObject);
+            expectToBeCorrectFilteredLearningObject(result, exampleLearningObject);
         });
 
         it('should return null when queried with an id that does not exist', async () => {

backend/tests/services/learning-objects/learning-object-service.test.ts

@@ -4,11 +4,11 @@ import { LearningObject } from '../../../src/entities/content/learning-object.en
 import { getLearningObjectRepository, getLearningPathRepository } from '../../../src/data/repositories';
 import learningObjectExample from '../../test-assets/learning-objects/pn-werkingnotebooks/pn-werkingnotebooks-example';
 import learningObjectService from '../../../src/services/learning-objects/learning-object-service';
-import { LearningObjectIdentifier, LearningPathIdentifier } from '../../../src/interfaces/learning-content';
-import { Language } from '../../../src/entities/content/language';
 import { envVars, getEnvVar } from '../../../src/util/envVars';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
 import learningPathExample from '../../test-assets/learning-paths/pn-werking-example';
+import { LearningObjectIdentifier, LearningPathIdentifier } from '@dwengo-1/common/interfaces/learning-content';
+import { Language } from '@dwengo-1/common/util/language';
 
 const EXPECTED_DWENGO_LEARNING_OBJECT_TITLE = 'Werken met notebooks';
 const DWENGO_TEST_LEARNING_OBJECT_ID: LearningObjectIdentifier = {
@@ -105,8 +105,11 @@ describe('LearningObjectService', () => {
             expect(new Set(result.map((it) => it.key))).toEqual(DWENGO_TEST_LEARNING_PATH_HRUIDS);
         });
         it('returns an empty list when queried with a non-existing learning path id', async () => {
-            const result = await learningObjectService.getLearningObjectsFromPath({ hruid: 'non_existing', language: Language.Dutch });
-            expect(result).toEqual([]);
+            const result = await learningObjectService.getLearningObjectsFromPath({
+                hruid: 'non_existing',
+                language: Language.Dutch,
+            });
+            expect(result).toStrictEqual([]);
         });
     });
 
@@ -120,8 +123,11 @@ describe('LearningObjectService', () => {
             expect(new Set(result)).toEqual(DWENGO_TEST_LEARNING_PATH_HRUIDS);
         });
         it('returns an empty list when queried with a non-existing learning path id', async () => {
-            const result = await learningObjectService.getLearningObjectIdsFromPath({ hruid: 'non_existing', language: Language.Dutch });
-            expect(result).toEqual([]);
+            const result = await learningObjectService.getLearningObjectIdsFromPath({
+                hruid: 'non_existing',
+                language: Language.Dutch,
+            });
+            expect(result).toStrictEqual([]);
         });
     });
 });

backend/tests/services/learning-path/database-learning-path-provider.test.ts

@@ -13,13 +13,14 @@ import learningPathExample from '../../test-assets/learning-paths/pn-werking-exa
 import databaseLearningPathProvider from '../../../src/services/learning-paths/database-learning-path-provider.js';
 import { expectToBeCorrectLearningPath } from '../../test-utils/expectations.js';
 import learningObjectService from '../../../src/services/learning-objects/learning-object-service.js';
-import { Language } from '../../../src/entities/content/language.js';
+import { Language } from '@dwengo-1/common/util/language';
 import {
     ConditionTestLearningPathAndLearningObjects,
     createConditionTestLearningPathAndLearningObjects,
 } from '../../test-assets/learning-paths/test-conditions-example.js';
 import { Student } from '../../../src/entities/users/student.entity.js';
-import { LearningObjectNode, LearningPathResponse } from '../../../src/interfaces/learning-content.js';
+
+import { LearningObjectNode, LearningPathResponse } from '@dwengo-1/common/interfaces/learning-content';
 
 async function initExampleData(): Promise<{ learningObject: LearningObject; learningPath: LearningPath }> {
     const learningObjectRepo = getLearningObjectRepository();

backend/tests/services/learning-path/learning-path-service.test.ts

@@ -5,8 +5,8 @@ import { LearningPath } from '../../../src/entities/content/learning-path.entity
 import { getLearningObjectRepository, getLearningPathRepository } from '../../../src/data/repositories';
 import learningObjectExample from '../../test-assets/learning-objects/pn-werkingnotebooks/pn-werkingnotebooks-example';
 import learningPathExample from '../../test-assets/learning-paths/pn-werking-example';
-import { Language } from '../../../src/entities/content/language';
 import learningPathService from '../../../src/services/learning-paths/learning-path-service';
+import { Language } from '@dwengo-1/common/util/language';
 
 async function initExampleData(): Promise<{ learningObject: LearningObject; learningPath: LearningPath }> {
     const learningObjectRepo = getLearningObjectRepository();
@@ -48,8 +48,8 @@ describe('LearningPathService', () => {
             expect(result.data?.length).toBe(1);
 
             // Should include all the nodes, even those pointing to foreign learning objects.
-            expect([...result.data![0].nodes.map((it) => it.learningobject_hruid)].sort()).toEqual(
-                example.learningPath.nodes.map((it) => it.learningObjectHruid).sort()
+            expect([...result.data![0].nodes.map((it) => it.learningobject_hruid)].sort((a, b) => a.localeCompare(b))).toEqual(
+                example.learningPath.nodes.map((it) => it.learningObjectHruid).sort((a, b) => a.localeCompare(b))
             );
         });
     });

backend/tests/test-assets/learning-objects/dummy/dummy-learning-object-example.ts

@@ -1,6 +1,6 @@
 import { LearningObjectExample } from '../learning-object-example';
 import { LearningObject } from '../../../../src/entities/content/learning-object.entity';
-import { Language } from '../../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { loadTestAsset } from '../../../test-utils/load-test-asset';
 import { DwengoContentType } from '../../../../src/services/learning-objects/processing/content-type';
 import { envVars, getEnvVar } from '../../../../src/util/envVars';

backend/tests/test-assets/learning-objects/pn-werkingnotebooks/pn-werkingnotebooks-example.ts

@@ -1,5 +1,5 @@
 import { LearningObjectExample } from '../learning-object-example';
-import { Language } from '../../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { DwengoContentType } from '../../../../src/services/learning-objects/processing/content-type';
 import { loadTestAsset } from '../../../test-utils/load-test-asset';
 import { LearningObject } from '../../../../src/entities/content/learning-object.entity';

backend/tests/test-assets/learning-objects/test-essay/test-essay-example.ts

@@ -2,7 +2,7 @@ import { LearningObjectExample } from '../learning-object-example';
 import { LearningObject } from '../../../../src/entities/content/learning-object.entity';
 import { loadTestAsset } from '../../../test-utils/load-test-asset';
 import { envVars, getEnvVar } from '../../../../src/util/envVars';
-import { Language } from '../../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { DwengoContentType } from '../../../../src/services/learning-objects/processing/content-type';
 
 const example: LearningObjectExample = {

backend/tests/test-assets/learning-objects/test-multiple-choice/test-multiple-choice-example.ts

@@ -2,8 +2,8 @@ import { LearningObjectExample } from '../learning-object-example';
 import { LearningObject } from '../../../../src/entities/content/learning-object.entity';
 import { loadTestAsset } from '../../../test-utils/load-test-asset';
 import { envVars, getEnvVar } from '../../../../src/util/envVars';
-import { Language } from '../../../../src/entities/content/language';
 import { DwengoContentType } from '../../../../src/services/learning-objects/processing/content-type';
+import { Language } from '@dwengo-1/common/util/language';
 
 const example: LearningObjectExample = {
     createLearningObject: () => {

backend/tests/test-assets/learning-paths/learning-path-utils.ts

@@ -1,4 +1,4 @@
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { LearningPathTransition } from '../../../src/entities/content/learning-path-transition.entity';
 import { LearningPathNode } from '../../../src/entities/content/learning-path-node.entity';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';

backend/tests/test-assets/learning-paths/pn-werking-example.ts

@@ -1,5 +1,5 @@
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { envVars, getEnvVar } from '../../../src/util/envVars';
 import { createLearningPathNode, createLearningPathTransition } from './learning-path-utils';
 import { LearningPathNode } from '../../../src/entities/content/learning-path-node.entity';

backend/tests/test-assets/learning-paths/test-conditions-example.ts

@@ -1,5 +1,5 @@
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import testMultipleChoiceExample from '../learning-objects/test-multiple-choice/test-multiple-choice-example';
 import { dummyLearningObject } from '../learning-objects/dummy/dummy-learning-object-example';
 import { createLearningPathNode, createLearningPathTransition } from './learning-path-utils';

backend/tests/test-utils/expectations.ts

@@ -1,8 +1,8 @@
 import { AssertionError } from 'node:assert';
 import { LearningObject } from '../../src/entities/content/learning-object.entity';
-import { FilteredLearningObject, LearningPath } from '../../src/interfaces/learning-content';
 import { LearningPath as LearningPathEntity } from '../../src/entities/content/learning-path.entity';
 import { expect } from 'vitest';
+import { FilteredLearningObject, LearningPath } from '@dwengo-1/common/interfaces/learning-content';
 
 // Ignored properties because they belang for example to the class, not to the entity itself.
 const IGNORE_PROPERTIES = ['parent'];

backend/tests/test_assets/assignments/assignments.testdata.ts

@@ -1,7 +1,7 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Assignment } from '../../../src/entities/assignments/assignment.entity';
 import { Class } from '../../../src/entities/classes/class.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 
 export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assignment[] {
     const assignment01 = em.create(Assignment, {

backend/tests/test_assets/assignments/submission.testdata.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Submission } from '../../../src/entities/assignments/submission.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { Student } from '../../../src/entities/users/student.entity';
 import { Group } from '../../../src/entities/assignments/group.entity';
 

backend/tests/test_assets/classes/class-join-requests.testdata.ts

@@ -1,7 +1,8 @@
 import { EntityManager } from '@mikro-orm/core';
-import { ClassJoinRequest, ClassJoinRequestStatus } from '../../../src/entities/classes/class-join-request.entity';
+import { ClassJoinRequest } from '../../../src/entities/classes/class-join-request.entity';
 import { Student } from '../../../src/entities/users/student.entity';
 import { Class } from '../../../src/entities/classes/class.entity';
+import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
 
 export function makeTestClassJoinRequests(em: EntityManager, students: Student[], classes: Class[]): ClassJoinRequest[] {
     const classJoinRequest01 = em.create(ClassJoinRequest, {

backend/tests/test_assets/content/learning-objects.testdata.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from '@mikro-orm/core';
 import { LearningObject } from '../../../src/entities/content/learning-object.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { DwengoContentType } from '../../../src/services/learning-objects/processing/content-type';
 import { ReturnValue } from '../../../src/entities/content/return-value.entity';
 

backend/tests/test_assets/content/learning-paths.testdata.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from '@mikro-orm/core';
 import { LearningPath } from '../../../src/entities/content/learning-path.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { LearningPathTransition } from '../../../src/entities/content/learning-path-transition.entity';
 import { LearningPathNode } from '../../../src/entities/content/learning-path-node.entity';
 

backend/tests/test_assets/questions/questions.testdata.ts

@@ -1,6 +1,6 @@
 import { EntityManager } from '@mikro-orm/core';
 import { Question } from '../../../src/entities/questions/question.entity';
-import { Language } from '../../../src/entities/content/language';
+import { Language } from '@dwengo-1/common/util/language';
 import { Student } from '../../../src/entities/users/student.entity';
 
 export function makeTestQuestions(em: EntityManager, students: Student[]): Question[] {

backend/tsconfig.json

@@ -3,7 +3,11 @@
     "include": ["src/**/*.ts"],
     "compilerOptions": {
         "rootDir": "./src",
-        "outDir": "./dist",
-        "resolveJsonModule": true
-    }
+        "outDir": "./dist"
+    },
+    "references": [
+        {
+            "path": "../common"
+        }
+    ]
 }