From 73a84fa3efc922e0f7499cdcfa468e484564552d Mon Sep 17 00:00:00 2001 From: Gerald Schmittinger Date: Wed, 26 Feb 2025 22:43:16 +0100 Subject: [PATCH] fix(backend): .js aan alle imports toegevoegd Dit was nodig om ervoor te zorgen dat de gebouwde applicatie ook haar dependencies vindt. --- .../data/assignments/assignment-repository.ts | 6 +- .../src/data/assignments/group-repository.ts | 6 +- .../data/assignments/submission-repository.ts | 10 ++-- .../classes/class-join-request-repository.ts | 8 +-- backend/src/data/classes/class-repository.ts | 4 +- .../classes/teacher-invitation-repository.ts | 8 +-- .../src/data/content/attachment-repository.ts | 6 +- .../content/learning-object-repository.ts | 6 +- .../data/content/learning-path-repository.ts | 6 +- .../src/data/questions/answer-repository.ts | 8 +-- .../src/data/questions/question-repository.ts | 8 +-- backend/src/data/repositories.ts | 58 +++++++++---------- backend/src/data/users/student-repository.ts | 4 +- backend/src/data/users/teacher-repository.ts | 4 +- backend/src/data/users/user-repository.ts | 4 +- .../entities/assignments/assignment.entity.ts | 6 +- .../src/entities/assignments/group.entity.ts | 4 +- .../entities/assignments/submission.entity.ts | 6 +- backend/src/entities/classes/class.entity.ts | 4 +- .../classes/teacher-invitation.entity.ts | 4 +- .../src/entities/content/attachment.entity.ts | 2 +- .../content/learning-object-identifier.ts | 2 +- .../content/learning-object.entity.ts | 6 +- .../entities/content/learning-path.entity.ts | 4 +- .../src/entities/questions/question.entity.ts | 4 +- backend/src/entities/users/student.entity.ts | 8 +-- backend/src/entities/users/teacher.entity.ts | 4 +- backend/src/mikro-orm.config.ts | 2 +- backend/src/orm.ts | 2 +- backend/tests/data/users.test.ts | 8 +-- backend/tests/setup-tests.ts | 2 +- 31 files changed, 107 insertions(+), 107 deletions(-) diff --git a/backend/src/data/assignments/assignment-repository.ts b/backend/src/data/assignments/assignment-repository.ts index de5431dc..c55bee00 100644 --- a/backend/src/data/assignments/assignment-repository.ts +++ b/backend/src/data/assignments/assignment-repository.ts @@ -1,6 +1,6 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Assignment } from '../../entities/assignments/assignment.entity'; -import { Class } from '../../entities/classes/class.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Assignment } from '../../entities/assignments/assignment.entity.js'; +import { Class } from '../../entities/classes/class.entity.js'; export class AssignmentRepository extends DwengoEntityRepository { public findByClassAndId( diff --git a/backend/src/data/assignments/group-repository.ts b/backend/src/data/assignments/group-repository.ts index a77bdd53..ff8ca507 100644 --- a/backend/src/data/assignments/group-repository.ts +++ b/backend/src/data/assignments/group-repository.ts @@ -1,6 +1,6 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Group } from '../../entities/assignments/group.entity'; -import { Assignment } from '../../entities/assignments/assignment.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Group } from '../../entities/assignments/group.entity.js'; +import { Assignment } from '../../entities/assignments/assignment.entity.js'; export class GroupRepository extends DwengoEntityRepository { public findByAssignmentAndGroupNumber( diff --git a/backend/src/data/assignments/submission-repository.ts b/backend/src/data/assignments/submission-repository.ts index d8fb5508..5332d050 100644 --- a/backend/src/data/assignments/submission-repository.ts +++ b/backend/src/data/assignments/submission-repository.ts @@ -1,8 +1,8 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Group } from '../../entities/assignments/group.entity'; -import { Submission } from '../../entities/assignments/submission.entity'; -import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; -import { Student } from '../../entities/users/student.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Group } from '../../entities/assignments/group.entity.js'; +import { Submission } from '../../entities/assignments/submission.entity.js'; +import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js'; +import { Student } from '../../entities/users/student.entity.js'; export class SubmissionRepository extends DwengoEntityRepository { public findSubmissionByLearningObjectAndSubmissionNumber( diff --git a/backend/src/data/classes/class-join-request-repository.ts b/backend/src/data/classes/class-join-request-repository.ts index fe96b259..c1443c1c 100644 --- a/backend/src/data/classes/class-join-request-repository.ts +++ b/backend/src/data/classes/class-join-request-repository.ts @@ -1,7 +1,7 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Class } from '../../entities/classes/class.entity'; -import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity'; -import { Student } from '../../entities/users/student.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Class } from '../../entities/classes/class.entity.js'; +import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity.js'; +import { Student } from '../../entities/users/student.entity.js'; export class ClassJoinRequestRepository extends DwengoEntityRepository { public findAllRequestsBy(requester: Student): Promise { diff --git a/backend/src/data/classes/class-repository.ts b/backend/src/data/classes/class-repository.ts index 0f511284..e3b9f959 100644 --- a/backend/src/data/classes/class-repository.ts +++ b/backend/src/data/classes/class-repository.ts @@ -1,5 +1,5 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Class } from '../../entities/classes/class.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Class } from '../../entities/classes/class.entity.js'; export class ClassRepository extends DwengoEntityRepository { public findById(id: string): Promise { diff --git a/backend/src/data/classes/teacher-invitation-repository.ts b/backend/src/data/classes/teacher-invitation-repository.ts index b983eed9..ae2713c8 100644 --- a/backend/src/data/classes/teacher-invitation-repository.ts +++ b/backend/src/data/classes/teacher-invitation-repository.ts @@ -1,7 +1,7 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Class } from '../../entities/classes/class.entity'; -import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity'; -import { Teacher } from '../../entities/users/teacher.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Class } from '../../entities/classes/class.entity.js'; +import { TeacherInvitation } from '../../entities/classes/teacher-invitation.entity.js'; +import { Teacher } from '../../entities/users/teacher.entity.js'; export class TeacherInvitationRepository extends DwengoEntityRepository { public findAllInvitationsForClass( diff --git a/backend/src/data/content/attachment-repository.ts b/backend/src/data/content/attachment-repository.ts index 8578c71d..3268be90 100644 --- a/backend/src/data/content/attachment-repository.ts +++ b/backend/src/data/content/attachment-repository.ts @@ -1,6 +1,6 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Attachment } from '../../entities/content/attachment.entity'; -import { LearningObject } from '../../entities/content/learning-object.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Attachment } from '../../entities/content/attachment.entity.js'; +import { LearningObject } from '../../entities/content/learning-object.entity.js'; export class AttachmentRepository extends DwengoEntityRepository { public findByLearningObjectAndNumber( diff --git a/backend/src/data/content/learning-object-repository.ts b/backend/src/data/content/learning-object-repository.ts index 41749a62..5d30b956 100644 --- a/backend/src/data/content/learning-object-repository.ts +++ b/backend/src/data/content/learning-object-repository.ts @@ -1,6 +1,6 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { LearningObject } from '../../entities/content/learning-object.entity'; -import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; +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'; export class LearningObjectRepository extends DwengoEntityRepository { public findByIdentifier( diff --git a/backend/src/data/content/learning-path-repository.ts b/backend/src/data/content/learning-path-repository.ts index 695bd90d..3ffb1e7f 100644 --- a/backend/src/data/content/learning-path-repository.ts +++ b/backend/src/data/content/learning-path-repository.ts @@ -1,6 +1,6 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { LearningPath } from '../../entities/content/learning-path.entity'; -import { Language } from '../../entities/content/language'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { LearningPath } from '../../entities/content/learning-path.entity.js'; +import { Language } from '../../entities/content/language.js'; export class LearningPathRepository extends DwengoEntityRepository { public findByHruidAndLanguage( diff --git a/backend/src/data/questions/answer-repository.ts b/backend/src/data/questions/answer-repository.ts index 5981b3f9..6a2629f4 100644 --- a/backend/src/data/questions/answer-repository.ts +++ b/backend/src/data/questions/answer-repository.ts @@ -1,7 +1,7 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Answer } from '../../entities/questions/answer.entity'; -import { Question } from '../../entities/questions/question.entity'; -import { Teacher } from '../../entities/users/teacher.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Answer } from '../../entities/questions/answer.entity.js'; +import { Question } from '../../entities/questions/question.entity.js'; +import { Teacher } from '../../entities/users/teacher.entity.js'; export class AnswerRepository extends DwengoEntityRepository { public createAnswer(answer: { diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 8ea9eb9c..517305f1 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -1,7 +1,7 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Question } from '../../entities/questions/question.entity'; -import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier'; -import { Student } from '../../entities/users/student.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Question } from '../../entities/questions/question.entity.js'; +import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js'; +import { Student } from '../../entities/users/student.entity.js'; export class QuestionRepository extends DwengoEntityRepository { public createQuestion(question: { diff --git a/backend/src/data/repositories.ts b/backend/src/data/repositories.ts index 85b1ac49..843eb1ac 100644 --- a/backend/src/data/repositories.ts +++ b/backend/src/data/repositories.ts @@ -4,35 +4,35 @@ import { EntityName, EntityRepository, } from '@mikro-orm/core'; -import { forkEntityManager } from '../orm'; -import { StudentRepository } from './users/student-repository'; -import { Student } from '../entities/users/student.entity'; -import { User } from '../entities/users/user.entity'; -import { UserRepository } from './users/user-repository'; -import { Teacher } from '../entities/users/teacher.entity'; -import { TeacherRepository } from './users/teacher-repository'; -import { Class } from '../entities/classes/class.entity'; -import { ClassRepository } from './classes/class-repository'; -import { ClassJoinRequest } from '../entities/classes/class-join-request.entity'; -import { ClassJoinRequestRepository } from './classes/class-join-request-repository'; -import { TeacherInvitationRepository } from './classes/teacher-invitation-repository'; -import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity'; -import { Assignment } from '../entities/assignments/assignment.entity'; -import { AssignmentRepository } from './assignments/assignment-repository'; -import { GroupRepository } from './assignments/group-repository'; -import { Group } from '../entities/assignments/group.entity'; -import { Submission } from '../entities/assignments/submission.entity'; -import { SubmissionRepository } from './assignments/submission-repository'; -import { Question } from '../entities/questions/question.entity'; -import { QuestionRepository } from './questions/question-repository'; -import { Answer } from '../entities/questions/answer.entity'; -import { AnswerRepository } from './questions/answer-repository'; -import { LearningObject } from '../entities/content/learning-object.entity'; -import { LearningObjectRepository } from './content/learning-object-repository'; -import { LearningPath } from '../entities/content/learning-path.entity'; -import { LearningPathRepository } from './content/learning-path-repository'; -import { AttachmentRepository } from './content/attachment-repository'; -import { Attachment } from '../entities/content/attachment.entity'; +import { forkEntityManager } from '../orm.js'; +import { StudentRepository } from './users/student-repository.js'; +import { Student } from '../entities/users/student.entity.js'; +import { User } from '../entities/users/user.entity.js'; +import { UserRepository } from './users/user-repository.js'; +import { Teacher } from '../entities/users/teacher.entity.js'; +import { TeacherRepository } from './users/teacher-repository.js'; +import { Class } from '../entities/classes/class.entity.js'; +import { ClassRepository } from './classes/class-repository.js'; +import { ClassJoinRequest } from '../entities/classes/class-join-request.entity.js'; +import { ClassJoinRequestRepository } from './classes/class-join-request-repository.js'; +import { TeacherInvitationRepository } from './classes/teacher-invitation-repository.js'; +import { TeacherInvitation } from '../entities/classes/teacher-invitation.entity.js'; +import { Assignment } from '../entities/assignments/assignment.entity.js'; +import { AssignmentRepository } from './assignments/assignment-repository.js'; +import { GroupRepository } from './assignments/group-repository.js'; +import { Group } from '../entities/assignments/group.entity.js'; +import { Submission } from '../entities/assignments/submission.entity.js'; +import { SubmissionRepository } from './assignments/submission-repository.js'; +import { Question } from '../entities/questions/question.entity.js'; +import { QuestionRepository } from './questions/question-repository.js'; +import { Answer } from '../entities/questions/answer.entity.js'; +import { AnswerRepository } from './questions/answer-repository.js'; +import { LearningObject } from '../entities/content/learning-object.entity.js'; +import { LearningObjectRepository } from './content/learning-object-repository.js'; +import { LearningPath } from '../entities/content/learning-path.entity.js'; +import { LearningPathRepository } from './content/learning-path-repository.js'; +import { AttachmentRepository } from './content/attachment-repository.js'; +import { Attachment } from '../entities/content/attachment.entity.js'; let entityManager: EntityManager | undefined; diff --git a/backend/src/data/users/student-repository.ts b/backend/src/data/users/student-repository.ts index 7b424b01..1c3a6fae 100644 --- a/backend/src/data/users/student-repository.ts +++ b/backend/src/data/users/student-repository.ts @@ -1,5 +1,5 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Student } from '../../entities/users/student.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Student } from '../../entities/users/student.entity.js'; export class StudentRepository extends DwengoEntityRepository { public findByUsername(username: string): Promise { diff --git a/backend/src/data/users/teacher-repository.ts b/backend/src/data/users/teacher-repository.ts index ab0c87bf..704ef409 100644 --- a/backend/src/data/users/teacher-repository.ts +++ b/backend/src/data/users/teacher-repository.ts @@ -1,5 +1,5 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { Teacher } from '../../entities/users/teacher.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { Teacher } from '../../entities/users/teacher.entity.js'; export class TeacherRepository extends DwengoEntityRepository { public findByUsername(username: string): Promise { diff --git a/backend/src/data/users/user-repository.ts b/backend/src/data/users/user-repository.ts index 1cf4ae6f..7e2a42ad 100644 --- a/backend/src/data/users/user-repository.ts +++ b/backend/src/data/users/user-repository.ts @@ -1,5 +1,5 @@ -import { DwengoEntityRepository } from '../dwengo-entity-repository'; -import { User } from '../../entities/users/user.entity'; +import { DwengoEntityRepository } from '../dwengo-entity-repository.js'; +import { User } from '../../entities/users/user.entity.js'; export class UserRepository extends DwengoEntityRepository { public findByUsername(username: string): Promise { diff --git a/backend/src/entities/assignments/assignment.entity.ts b/backend/src/entities/assignments/assignment.entity.ts index 42f459f7..e883632b 100644 --- a/backend/src/entities/assignments/assignment.entity.ts +++ b/backend/src/entities/assignments/assignment.entity.ts @@ -6,9 +6,9 @@ import { PrimaryKey, Property, } from '@mikro-orm/core'; -import { Class } from '../classes/class.entity'; -import { Group } from './group.entity'; -import { Language } from '../content/language'; +import { Class } from '../classes/class.entity.js'; +import { Group } from './group.entity.js'; +import { Language } from '../content/language.js'; @Entity() export class Assignment { diff --git a/backend/src/entities/assignments/group.entity.ts b/backend/src/entities/assignments/group.entity.ts index 3b3e84ad..80da7d8b 100644 --- a/backend/src/entities/assignments/group.entity.ts +++ b/backend/src/entities/assignments/group.entity.ts @@ -1,6 +1,6 @@ import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core'; -import { Assignment } from './assignment.entity'; -import { Student } from '../users/student.entity'; +import { Assignment } from './assignment.entity.js'; +import { Student } from '../users/student.entity.js'; @Entity() export class Group { diff --git a/backend/src/entities/assignments/submission.entity.ts b/backend/src/entities/assignments/submission.entity.ts index d78697fd..02cbeeae 100644 --- a/backend/src/entities/assignments/submission.entity.ts +++ b/backend/src/entities/assignments/submission.entity.ts @@ -1,7 +1,7 @@ -import { Student } from '../users/student.entity'; -import { Group } from './group.entity'; +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'; +import { Language } from '../content/language.js'; @Entity() export class Submission { diff --git a/backend/src/entities/classes/class.entity.ts b/backend/src/entities/classes/class.entity.ts index e28270a5..1f5835d2 100644 --- a/backend/src/entities/classes/class.entity.ts +++ b/backend/src/entities/classes/class.entity.ts @@ -6,8 +6,8 @@ import { Property, } from '@mikro-orm/core'; import { v4 } from 'uuid'; -import { Teacher } from '../users/teacher.entity'; -import { Student } from '../users/student.entity'; +import { Teacher } from '../users/teacher.entity.js'; +import { Student } from '../users/student.entity.js'; @Entity() export class Class { diff --git a/backend/src/entities/classes/teacher-invitation.entity.ts b/backend/src/entities/classes/teacher-invitation.entity.ts index b8250db5..375bf719 100644 --- a/backend/src/entities/classes/teacher-invitation.entity.ts +++ b/backend/src/entities/classes/teacher-invitation.entity.ts @@ -1,6 +1,6 @@ import { Entity, ManyToOne } from '@mikro-orm/core'; -import { Teacher } from '../users/teacher.entity'; -import { Class } from './class.entity'; +import { Teacher } from '../users/teacher.entity.js'; +import { Class } from './class.entity.js'; /** * Invitation of a teacher into a class (in order to teach it). diff --git a/backend/src/entities/content/attachment.entity.ts b/backend/src/entities/content/attachment.entity.ts index dea2ad98..5a77d4b7 100644 --- a/backend/src/entities/content/attachment.entity.ts +++ b/backend/src/entities/content/attachment.entity.ts @@ -1,5 +1,5 @@ import { Entity, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; -import { LearningObject } from './learning-object.entity'; +import { LearningObject } from './learning-object.entity.js'; @Entity() export class Attachment { diff --git a/backend/src/entities/content/learning-object-identifier.ts b/backend/src/entities/content/learning-object-identifier.ts index 00d6d81b..48d173c1 100644 --- a/backend/src/entities/content/learning-object-identifier.ts +++ b/backend/src/entities/content/learning-object-identifier.ts @@ -1,4 +1,4 @@ -import { Language } from './language'; +import { Language } from './language.js'; export class LearningObjectIdentifier { constructor( diff --git a/backend/src/entities/content/learning-object.entity.ts b/backend/src/entities/content/learning-object.entity.ts index bafd638f..aeee268d 100644 --- a/backend/src/entities/content/learning-object.entity.ts +++ b/backend/src/entities/content/learning-object.entity.ts @@ -8,9 +8,9 @@ import { PrimaryKey, Property, } from '@mikro-orm/core'; -import { Language } from './language'; -import { Attachment } from './attachment.entity'; -import { Teacher } from '../users/teacher.entity'; +import { Language } from './language.js'; +import { Attachment } from './attachment.entity.js'; +import { Teacher } from '../users/teacher.entity.js'; @Entity() export class LearningObject { diff --git a/backend/src/entities/content/learning-path.entity.ts b/backend/src/entities/content/learning-path.entity.ts index 530eac95..f426cdfe 100644 --- a/backend/src/entities/content/learning-path.entity.ts +++ b/backend/src/entities/content/learning-path.entity.ts @@ -8,8 +8,8 @@ import { PrimaryKey, Property, } from '@mikro-orm/core'; -import { Language } from './language'; -import { Teacher } from '../users/teacher.entity'; +import { Language } from './language.js'; +import { Teacher } from '../users/teacher.entity.js'; @Entity() export class LearningPath { diff --git a/backend/src/entities/questions/question.entity.ts b/backend/src/entities/questions/question.entity.ts index 67ad5860..6c0d07e5 100644 --- a/backend/src/entities/questions/question.entity.ts +++ b/backend/src/entities/questions/question.entity.ts @@ -1,6 +1,6 @@ import { Entity, Enum, ManyToOne, PrimaryKey, Property } from '@mikro-orm/core'; -import { Language } from '../content/language'; -import { Student } from '../users/student.entity'; +import { Language } from '../content/language.js'; +import { Student } from '../users/student.entity.js'; @Entity() export class Question { diff --git a/backend/src/entities/users/student.entity.ts b/backend/src/entities/users/student.entity.ts index 735a298f..dc791adc 100644 --- a/backend/src/entities/users/student.entity.ts +++ b/backend/src/entities/users/student.entity.ts @@ -1,8 +1,8 @@ -import { User } from './user.entity'; +import { User } from './user.entity.js'; import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; -import { Class } from '../classes/class.entity'; -import { Group } from '../assignments/group.entity'; -import { StudentRepository } from '../../data/users/student-repository'; +import { Class } from '../classes/class.entity.js'; +import { Group } from '../assignments/group.entity.js'; +import { StudentRepository } from '../../data/users/student-repository.js'; @Entity({ repository: () => StudentRepository }) export class Student extends User { diff --git a/backend/src/entities/users/teacher.entity.ts b/backend/src/entities/users/teacher.entity.ts index bbd0ec18..2327527c 100644 --- a/backend/src/entities/users/teacher.entity.ts +++ b/backend/src/entities/users/teacher.entity.ts @@ -1,6 +1,6 @@ import { Collection, Entity, ManyToMany } from '@mikro-orm/core'; -import { User } from './user.entity'; -import { Class } from '../classes/class.entity'; +import { User } from './user.entity.js'; +import { Class } from '../classes/class.entity.js'; @Entity() export class Teacher extends User { diff --git a/backend/src/mikro-orm.config.ts b/backend/src/mikro-orm.config.ts index e4e1e229..da118827 100644 --- a/backend/src/mikro-orm.config.ts +++ b/backend/src/mikro-orm.config.ts @@ -1,6 +1,6 @@ import { Options } from '@mikro-orm/core'; 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'; const entities = ['dist/**/*.entity.js']; diff --git a/backend/src/orm.ts b/backend/src/orm.ts index 1e066f85..37f83d8f 100644 --- a/backend/src/orm.ts +++ b/backend/src/orm.ts @@ -1,6 +1,6 @@ import { EntityManager, MikroORM } from '@mikro-orm/core'; import config from './mikro-orm.config.js'; -import { EnvVars, getEnvVar } from './util/envvars'; +import { EnvVars, getEnvVar } from './util/envvars.js'; let orm: MikroORM | undefined; export async function initORM(testingMode: boolean = false) { diff --git a/backend/tests/data/users.test.ts b/backend/tests/data/users.test.ts index 1a538ba7..c7cc875d 100644 --- a/backend/tests/data/users.test.ts +++ b/backend/tests/data/users.test.ts @@ -1,8 +1,8 @@ -import {setupTestApp} from "../setup-tests" -import {Student} from "../../src/entities/users/student.entity"; +import {setupTestApp} from "../setup-tests.js" +import {Student} from "../../src/entities/users/student.entity.js"; import {describe, it, expect, beforeAll} from "vitest"; -import {StudentRepository} from "../../src/data/users/student-repository"; -import {getStudentRepository} from "../../src/data/repositories"; +import {StudentRepository} from "../../src/data/users/student-repository.js"; +import {getStudentRepository} from "../../src/data/repositories.js"; const username = "teststudent"; const firstName = "John"; diff --git a/backend/tests/setup-tests.ts b/backend/tests/setup-tests.ts index 0fef6675..6738ad56 100644 --- a/backend/tests/setup-tests.ts +++ b/backend/tests/setup-tests.ts @@ -1,4 +1,4 @@ -import {initORM} from "../src/orm"; +import {initORM} from "../src/orm.js"; import dotenv from "dotenv"; export async function setupTestApp() {