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

fix(backend): .js aan alle imports toegevoegd

Browse source 
Dit was nodig om ervoor te zorgen dat de gebouwde applicatie ook haar dependencies vindt.
This commit is contained in:
Gerald Schmittinger 2025-02-26 22:43:16 +01:00
parent 48c8ce7c57
commit 73a84fa3ef
31 changed files with 107 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/data/assignments/assignment-repository.ts
View file

@ -1,6 +1,6 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Assignment } from '../../entities/assignments/assignment.entity'; import { Assignment } from '../../entities/assignments/assignment.entity.js';
import { Class } from '../../entities/classes/class.entity'; import { Class } from '../../entities/classes/class.entity.js';
export class AssignmentRepository extends DwengoEntityRepository<Assignment> { export class AssignmentRepository extends DwengoEntityRepository<Assignment> {
public findByClassAndId( public findByClassAndId(

6
backend/src/data/assignments/group-repository.ts
View file

@ -1,6 +1,6 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Group } from '../../entities/assignments/group.entity'; import { Group } from '../../entities/assignments/group.entity.js';
import { Assignment } from '../../entities/assignments/assignment.entity'; import { Assignment } from '../../entities/assignments/assignment.entity.js';
export class GroupRepository extends DwengoEntityRepository<Group> { export class GroupRepository extends DwengoEntityRepository<Group> {
public findByAssignmentAndGroupNumber( public findByAssignmentAndGroupNumber(

10
backend/src/data/assignments/submission-repository.ts
View file

@ -1,8 +1,8 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Group } from '../../entities/assignments/group.entity'; import { Group } from '../../entities/assignments/group.entity.js';
import { Submission } from '../../entities/assignments/submission.entity'; import { Submission } from '../../entities/assignments/submission.entity.js';
import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
import { Student } from '../../entities/users/student.entity'; import { Student } from '../../entities/users/student.entity.js';
export class SubmissionRepository extends DwengoEntityRepository<Submission> { export class SubmissionRepository extends DwengoEntityRepository<Submission> {
public findSubmissionByLearningObjectAndSubmissionNumber( public findSubmissionByLearningObjectAndSubmissionNumber(

8
backend/src/data/classes/class-join-request-repository.ts
View file

@ -1,7 +1,7 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Class } from '../../entities/classes/class.entity'; import { Class } from '../../entities/classes/class.entity.js';
import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity'; import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity.js';
import { Student } from '../../entities/users/student.entity'; import { Student } from '../../entities/users/student.entity.js';
export class ClassJoinRequestRepository extends DwengoEntityRepository<ClassJoinRequest> { export class ClassJoinRequestRepository extends DwengoEntityRepository<ClassJoinRequest> {
public findAllRequestsBy(requester: Student): Promise<ClassJoinRequest[]> { public findAllRequestsBy(requester: Student): Promise<ClassJoinRequest[]> {

4
backend/src/data/classes/class-repository.ts
View file

@ -1,5 +1,5 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Class } from '../../entities/classes/class.entity'; import { Class } from '../../entities/classes/class.entity.js';
export class ClassRepository extends DwengoEntityRepository<Class> { export class ClassRepository extends DwengoEntityRepository<Class> {
public findById(id: string): Promise<Class | null> { public findById(id: string): Promise<Class | null> {

8
backend/src/data/classes/teacher-invitation-repository.ts
View file

@ -1,7 +1,7 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Class } from '../../entities/classes/class.entity'; import { Class } from '../../entities/classes/class.entity.js';
import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity'; import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity.js';
import { Teacher } from '../../entities/users/teacher.entity'; import { Teacher } from '../../entities/users/teacher.entity.js';
export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherInvitation> { export class TeacherInvitationRepository extends DwengoEntityRepository<TeacherInvitation> {
public findAllInvitationsForClass( public findAllInvitationsForClass(

6
backend/src/data/content/attachment-repository.ts
View file

@ -1,6 +1,6 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Attachment } from '../../entities/content/attachment.entity'; import { Attachment } from '../../entities/content/attachment.entity.js';
import { LearningObject } from '../../entities/content/learning-object.entity'; import { LearningObject } from '../../entities/content/learning-object.entity.js';
export class AttachmentRepository extends DwengoEntityRepository<Attachment> { export class AttachmentRepository extends DwengoEntityRepository<Attachment> {
public findByLearningObjectAndNumber( public findByLearningObjectAndNumber(

6
backend/src/data/content/learning-object-repository.ts
View file

@ -1,6 +1,6 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { LearningObject } from '../../entities/content/learning-object.entity'; import { LearningObject } from '../../entities/content/learning-object.entity.js';
import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
export class LearningObjectRepository extends DwengoEntityRepository<LearningObject> { export class LearningObjectRepository extends DwengoEntityRepository<LearningObject> {
public findByIdentifier( public findByIdentifier(

6
backend/src/data/content/learning-path-repository.ts
View file

@ -1,6 +1,6 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { LearningPath } from '../../entities/content/learning-path.entity'; import { LearningPath } from '../../entities/content/learning-path.entity.js';
import { Language } from '../../entities/content/language'; import { Language } from '../../entities/content/language.js';
export class LearningPathRepository extends DwengoEntityRepository<LearningPath> { export class LearningPathRepository extends DwengoEntityRepository<LearningPath> {
public findByHruidAndLanguage( public findByHruidAndLanguage(

8
backend/src/data/questions/answer-repository.ts
View file

@ -1,7 +1,7 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Answer } from '../../entities/questions/answer.entity'; import { Answer } from '../../entities/questions/answer.entity.js';
import { Question } from '../../entities/questions/question.entity'; import { Question } from '../../entities/questions/question.entity.js';
import { Teacher } from '../../entities/users/teacher.entity'; import { Teacher } from '../../entities/users/teacher.entity.js';
export class AnswerRepository extends DwengoEntityRepository<Answer> { export class AnswerRepository extends DwengoEntityRepository<Answer> {
public createAnswer(answer: { public createAnswer(answer: {

8
backend/src/data/questions/question-repository.ts
View file

@ -1,7 +1,7 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Question } from '../../entities/questions/question.entity'; import { Question } from '../../entities/questions/question.entity.js';
import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
import { Student } from '../../entities/users/student.entity'; import { Student } from '../../entities/users/student.entity.js';
export class QuestionRepository extends DwengoEntityRepository<Question> { export class QuestionRepository extends DwengoEntityRepository<Question> {
public createQuestion(question: { public createQuestion(question: {

58
backend/src/data/repositories.ts
View file

@ -4,35 +4,35 @@ import {
EntityName, EntityName,
EntityRepository, EntityRepository,
} from '@mikro-orm/core'; } from '@mikro-orm/core';
import { forkEntityManager } from '../orm'; import { forkEntityManager } from '../orm.js';
import { StudentRepository } from './users/student-repository'; import { StudentRepository } from './users/student-repository.js';
import { Student } from '../entities/users/student.entity'; import { Student } from '../entities/users/student.entity.js';
import { User } from '../entities/users/user.entity'; import { User } from '../entities/users/user.entity.js';
import { UserRepository } from './users/user-repository'; import { UserRepository } from './users/user-repository.js';
import { Teacher } from '../entities/users/teacher.entity'; import { Teacher } from '../entities/users/teacher.entity.js';
import { TeacherRepository } from './users/teacher-repository'; import { TeacherRepository } from './users/teacher-repository.js';
import { Class } from '../entities/classes/class.entity'; import { Class } from '../entities/classes/class.entity.js';
import { ClassRepository } from './classes/class-repository'; import { ClassRepository } from './classes/class-repository.js';
import { ClassJoinRequest } from '../entities/classes/class-join-request.entity'; import { ClassJoinRequest } from '../entities/classes/class-join-request.entity.js';
import { ClassJoinRequestRepository } from './classes/class-join-request-repository'; import { ClassJoinRequestRepository } from './classes/class-join-request-repository.js';
import { TeacherInvitationRepository } from './classes/teacher-invitation-repository'; import { TeacherInvitationRepository } from './classes/teacher-invitation-repository.js';
import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity'; import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js';
import { Assignment } from '../entities/assignments/assignment.entity'; import { Assignment } from '../entities/assignments/assignment.entity.js';
import { AssignmentRepository } from './assignments/assignment-repository'; import { AssignmentRepository } from './assignments/assignment-repository.js';
import { GroupRepository } from './assignments/group-repository'; import { GroupRepository } from './assignments/group-repository.js';
import { Group } from '../entities/assignments/group.entity'; import { Group } from '../entities/assignments/group.entity.js';
import { Submission } from '../entities/assignments/submission.entity'; import { Submission } from '../entities/assignments/submission.entity.js';
import { SubmissionRepository } from './assignments/submission-repository'; import { SubmissionRepository } from './assignments/submission-repository.js';
import { Question } from '../entities/questions/question.entity'; import { Question } from '../entities/questions/question.entity.js';
import { QuestionRepository } from './questions/question-repository'; import { QuestionRepository } from './questions/question-repository.js';
import { Answer } from '../entities/questions/answer.entity'; import { Answer } from '../entities/questions/answer.entity.js';
import { AnswerRepository } from './questions/answer-repository'; import { AnswerRepository } from './questions/answer-repository.js';
import { LearningObject } from '../entities/content/learning-object.entity'; import { LearningObject } from '../entities/content/learning-object.entity.js';
import { LearningObjectRepository } from './content/learning-object-repository'; import { LearningObjectRepository } from './content/learning-object-repository.js';
import { LearningPath } from '../entities/content/learning-path.entity'; import { LearningPath } from '../entities/content/learning-path.entity.js';
import { LearningPathRepository } from './content/learning-path-repository'; import { LearningPathRepository } from './content/learning-path-repository.js';
import { AttachmentRepository } from './content/attachment-repository'; import { AttachmentRepository } from './content/attachment-repository.js';
import { Attachment } from '../entities/content/attachment.entity'; import { Attachment } from '../entities/content/attachment.entity.js';
let entityManager: EntityManager | undefined; let entityManager: EntityManager | undefined;

4
backend/src/data/users/student-repository.ts
View file

@ -1,5 +1,5 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Student } from '../../entities/users/student.entity'; import { Student } from '../../entities/users/student.entity.js';
export class StudentRepository extends DwengoEntityRepository<Student> { export class StudentRepository extends DwengoEntityRepository<Student> {
public findByUsername(username: string): Promise<Student | null> { public findByUsername(username: string): Promise<Student | null> {

4
backend/src/data/users/teacher-repository.ts
View file

@ -1,5 +1,5 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Teacher } from '../../entities/users/teacher.entity'; import { Teacher } from '../../entities/users/teacher.entity.js';
export class TeacherRepository extends DwengoEntityRepository<Teacher> { export class TeacherRepository extends DwengoEntityRepository<Teacher> {
public findByUsername(username: string): Promise<Teacher | null> { public findByUsername(username: string): Promise<Teacher | null> {

4
backend/src/data/users/user-repository.ts
View file

@ -1,5 +1,5 @@
import { DwengoEntityRepository } from '../dwengo-entity-repository'; import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { User } from '../../entities/users/user.entity'; import { User } from '../../entities/users/user.entity.js';
export class UserRepository extends DwengoEntityRepository<User> { export class UserRepository extends DwengoEntityRepository<User> {
public findByUsername(username: string): Promise<User | null> { public findByUsername(username: string): Promise<User | null> {

6
backend/src/entities/assignments/assignment.entity.ts
View file

@ -6,9 +6,9 @@ import {
PrimaryKey, PrimaryKey,
Property, Property,
} from '@mikro-orm/core'; } from '@mikro-orm/core';
import { Class } from '../classes/class.entity'; import { Class } from '../classes/class.entity.js';
import { Group } from './group.entity'; import { Group } from './group.entity.js';
import { Language } from '../content/language'; import { Language } from '../content/language.js';
@Entity() @Entity()
export class Assignment { export class Assignment {

4
backend/src/entities/assignments/group.entity.ts
View file

@ -1,6 +1,6 @@
import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core'; import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core';
import { Assignment } from './assignment.entity'; import { Assignment } from './assignment.entity.js';
import { Student } from '../users/student.entity'; import { Student } from '../users/student.entity.js';
@Entity() @Entity()
export class Group { export class Group {

6
backend/src/entities/assignments/submission.entity.ts
View file

@ -1,7 +1,7 @@
import { Student } from '../users/student.entity'; import { Student } from '../users/student.entity.js';
import { Group } from './group.entity'; import { Group } from './group.entity.js';
import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
import { Language } from '../content/language'; import { Language } from '../content/language.js';
@Entity() @Entity()
export class Submission { export class Submission {

4
backend/src/entities/classes/class.entity.ts
View file

@ -6,8 +6,8 @@ import {
Property, Property,
} from '@mikro-orm/core'; } from '@mikro-orm/core';
import { v4 } from 'uuid'; import { v4 } from 'uuid';
import { Teacher } from '../users/teacher.entity'; import { Teacher } from '../users/teacher.entity.js';
import { Student } from '../users/student.entity'; import { Student } from '../users/student.entity.js';
@Entity() @Entity()
export class Class { export class Class {

4
backend/src/entities/classes/teacher-invitation.entity.ts
View file

@ -1,6 +1,6 @@
import { Entity, ManyToOne } from '@mikro-orm/core'; import { Entity, ManyToOne } from '@mikro-orm/core';
import { Teacher } from '../users/teacher.entity'; import { Teacher } from '../users/teacher.entity.js';
import { Class } from './class.entity'; import { Class } from './class.entity.js';
/** /**
* Invitation of a teacher into a class (in order to teach it). * Invitation of a teacher into a class (in order to teach it).

2
backend/src/entities/content/attachment.entity.ts
View file

@ -1,5 +1,5 @@
import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
import { LearningObject } from './learning-object.entity'; import { LearningObject } from './learning-object.entity.js';
@Entity() @Entity()
export class Attachment { export class Attachment {

2
backend/src/entities/content/learning-object-identifier.ts
View file

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

6
backend/src/entities/content/learning-object.entity.ts
View file

@ -8,9 +8,9 @@ import {
PrimaryKey, PrimaryKey,
Property, Property,
} from '@mikro-orm/core'; } from '@mikro-orm/core';
import { Language } from './language'; import { Language } from './language.js';
import { Attachment } from './attachment.entity'; import { Attachment } from './attachment.entity.js';
import { Teacher } from '../users/teacher.entity'; import { Teacher } from '../users/teacher.entity.js';
@Entity() @Entity()
export class LearningObject { export class LearningObject {

4
backend/src/entities/content/learning-path.entity.ts
View file

@ -8,8 +8,8 @@ import {
PrimaryKey, PrimaryKey,
Property, Property,
} from '@mikro-orm/core'; } from '@mikro-orm/core';
import { Language } from './language'; import { Language } from './language.js';
import { Teacher } from '../users/teacher.entity'; import { Teacher } from '../users/teacher.entity.js';
@Entity() @Entity()
export class LearningPath { export class LearningPath {

4
backend/src/entities/questions/question.entity.ts
View file

@ -1,6 +1,6 @@
import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core';
import { Language } from '../content/language'; import { Language } from '../content/language.js';
import { Student } from '../users/student.entity'; import { Student } from '../users/student.entity.js';
@Entity() @Entity()
export class Question { export class Question {

8
backend/src/entities/users/student.entity.ts
View file

@ -1,8 +1,8 @@
import { User } from './user.entity'; import { User } from './user.entity.js';
import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; import { Collection, Entity, ManyToMany } from '@mikro-orm/core';
import { Class } from '../classes/class.entity'; import { Class } from '../classes/class.entity.js';
import { Group } from '../assignments/group.entity'; import { Group } from '../assignments/group.entity.js';
import { StudentRepository } from '../../data/users/student-repository'; import { StudentRepository } from '../../data/users/student-repository.js';
@Entity({ repository: () => StudentRepository }) @Entity({ repository: () => StudentRepository })
export class Student extends User { export class Student extends User {

4
backend/src/entities/users/teacher.entity.ts
View file

@ -1,6 +1,6 @@
import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; import { Collection, Entity, ManyToMany } from '@mikro-orm/core';
import { User } from './user.entity'; import { User } from './user.entity.js';
import { Class } from '../classes/class.entity'; import { Class } from '../classes/class.entity.js';
@Entity() @Entity()
export class Teacher extends User { export class Teacher extends User {

2
backend/src/mikro-orm.config.ts
View file

@ -1,6 +1,6 @@
import { Options } from '@mikro-orm/core'; import { Options } from '@mikro-orm/core';
import { PostgreSqlDriver } from '@mikro-orm/postgresql'; import { PostgreSqlDriver } from '@mikro-orm/postgresql';
import { EnvVars, getEnvVar, getNumericEnvVar } from './util/envvars'; import { EnvVars, getEnvVar, getNumericEnvVar } from './util/envvars.js';
import { SqliteDriver } from '@mikro-orm/sqlite'; import { SqliteDriver } from '@mikro-orm/sqlite';
const entities = ['dist/**/*.entity.js']; const entities = ['dist/**/*.entity.js'];

2
backend/src/orm.ts
View file

@ -1,6 +1,6 @@
import { EntityManager, MikroORM } from '@mikro-orm/core'; import { EntityManager, MikroORM } from '@mikro-orm/core';
import config from './mikro-orm.config.js'; import config from './mikro-orm.config.js';
import { EnvVars, getEnvVar } from './util/envvars'; import { EnvVars, getEnvVar } from './util/envvars.js';
let orm: MikroORM | undefined; let orm: MikroORM | undefined;
export async function initORM(testingMode: boolean = false) { export async function initORM(testingMode: boolean = false) {

8
backend/tests/data/users.test.ts
View file

@ -1,8 +1,8 @@
import {setupTestApp} from "../setup-tests" import {setupTestApp} from "../setup-tests.js"
import {Student} from "../../src/entities/users/student.entity"; import {Student} from "../../src/entities/users/student.entity.js";
import {describe, it, expect, beforeAll} from "vitest"; import {describe, it, expect, beforeAll} from "vitest";
import {StudentRepository} from "../../src/data/users/student-repository"; import {StudentRepository} from "../../src/data/users/student-repository.js";
import {getStudentRepository} from "../../src/data/repositories"; import {getStudentRepository} from "../../src/data/repositories.js";
const username = "teststudent"; const username = "teststudent";
const firstName = "John"; const firstName = "John";

2
backend/tests/setup-tests.ts
View file

@ -1,4 +1,4 @@
import {initORM} from "../src/orm"; import {initORM} from "../src/orm.js";
import dotenv from "dotenv"; import dotenv from "dotenv";
export async function setupTestApp() { export async function setupTestApp() {