refactor(common): Language

backend/src/controllers/learning-objects.ts

@@ -2,11 +2,11 @@ import { Request, Response } from 'express';
 import { FALLBACK_LANG } from '../config.js';
 import learningObjectService from '../services/learning-objects/learning-object-service.js';
 import { EnvVars, getEnvVar } from '../util/envvars.js';
-import { Language } from '../entities/content/language.js';
 import attachmentService from '../services/learning-objects/attachment-service.js';
 import { NotFoundError } from '@mikro-orm/core';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { FilteredLearningObject, LearningObjectIdentifier, LearningPathIdentifier } from 'dwengo-1-common/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 function getLearningObjectIdentifierFromRequest(req: Request): LearningObjectIdentifier {
     if (!req.params.hruid) {

backend/src/controllers/learning-paths.ts

@@ -2,7 +2,6 @@ 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 {
     PersonalizationTarget,
     personalizedForGroup,
@@ -10,6 +9,7 @@ import {
 } from '../services/learning-paths/learning-path-personalization-util.js';
 import { BadRequestException } from '../exceptions/bad-request-exception.js';
 import { NotFoundException } from '../exceptions/not-found-exception.js';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 /**
  * Fetch learning paths based on query parameters.

backend/src/controllers/questions.ts

@@ -2,8 +2,8 @@ import { Request, Response } from 'express';
 import { createQuestion, deleteQuestion, getAllQuestions, getAnswersByQuestion, getQuestion } from '../services/questions.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/src/interfaces/question';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 function getObjectId(req: Request, res: Response): LearningObjectIdentifier | null {
     const { hruid, version } = req.params;

backend/src/controllers/submissions.ts

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

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

@@ -1,7 +1,7 @@
 import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
 import { Attachment } from '../../entities/content/attachment.entity.js';
-import { Language } from '../../entities/content/language';
 import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 export class AttachmentRepository extends DwengoEntityRepository<Attachment> {
     public findByLearningObjectIdAndName(learningObjectId: LearningObjectIdentifier, name: string): Promise<Attachment | null> {

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

@@ -1,7 +1,6 @@
 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 { 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/src/util/language.js';
 
 export class LearningPathRepository extends DwengoEntityRepository<LearningPath> {
     public findByHruidAndLanguage(hruid: string, language: Language): Promise<LearningPath | null> {

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

@@ -1,8 +1,8 @@
 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 { AssignmentRepository } from '../../data/assignments/assignment-repository.js';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 @Entity({
     repository: () => AssignmentRepository,

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/src/util/language.js';
 
 @Entity({ repository: () => SubmissionRepository })
 export class Submission {

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/src/util/language';
 
 export class LearningObjectIdentifier {
     constructor(

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

@@ -1,10 +1,10 @@
 import { Embeddable, 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';
 import { v4 } from 'uuid';
 import { LearningObjectRepository } from '../../data/content/learning-object-repository.js';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 @Embeddable()
 export class EducationalGoal {

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/src/util/language.js';
 
 @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/src/util/language.js';
 
 @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/src/util/language.js';
 
 @Entity({ repository: () => QuestionRepository })
 export class Question {

backend/src/interfaces/assignment.ts

@@ -1,7 +1,7 @@
+import { languageMap } from 'dwengo-1-common/src/util/language.js';
 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 { AssignmentDTO } from 'dwengo-1-common/src/interfaces/assignment';
 
 export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {

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

@@ -1,6 +1,5 @@
 import { LearningObjectProvider } from './learning-object-provider.js';
 import { getLearningObjectRepository, getLearningPathRepository } from '../../data/repositories.js';
-import { Language } from '../../entities/content/language.js';
 import { LearningObject } from '../../entities/content/learning-object.entity.js';
 import { getUrlStringForLearningObject } from '../../util/links.js';
 import processingService from './processing/processing-service.js';
@@ -8,6 +7,7 @@ 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/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 const logger: Logger = getLogger();
 

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

@@ -8,13 +8,13 @@ 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 { 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/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 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 { Language } from '../../../entities/content/language.js';
 import { replaceAsync } from '../../../util/async.js';
 import { LearningObjectIdentifier } from 'dwengo-1-common/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 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,7 +1,6 @@
 import { LearningPathProvider } from './learning-path-provider.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';
@@ -13,6 +12,7 @@ import {
     LearningPathResponse,
     Transition,
 } from 'dwengo-1-common/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 /**
  * 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/learning-path-provider.ts

@@ -1,4 +1,4 @@
-import { Language } from '../../entities/content/language.js';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 import { PersonalizationTarget } from './learning-path-personalization-util.js';
 import { LearningPath, LearningPathResponse } from 'dwengo-1-common/src/interfaces/learning-content';
 

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

@@ -1,9 +1,9 @@
 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/src/interfaces/learning-content';
+import { Language } from 'dwengo-1-common/src/util/language.js';
 
 const userContentPrefix = getEnvVar(EnvVars.UserContentPrefix);
 const allProviders = [dwengoApiLearningPathProvider, databaseLearningPathProvider];

backend/src/services/submissions.ts

@@ -1,5 +1,5 @@
-import { getGroupRepository, getSubmissionRepository } from '../data/repositories.js';
-import { Language } from '../entities/content/language.js';
+import { Language } from 'dwengo-1-common/src/util/language.js';
+import { getSubmissionRepository } from '../data/repositories.js';
 import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js';
 import { mapToSubmission, mapToSubmissionDTO } from '../interfaces/submission.js';
 import { SubmissionDTO } from 'dwengo-1-common/src/interfaces/submission';