fix(backend): .js aan alle imports toegevoegd
Dit was nodig om ervoor te zorgen dat de gebouwde applicatie ook haar dependencies vindt.
This commit is contained in:
Gerald Schmittinger
parent
48c8ce7c57
commit
73a84fa3ef
31 changed files with 107 additions and 107 deletions
|
|
@ -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<Assignment> {
|
||||
public findByClassAndId(
|
||||
|
|
|
|||
|
|
@ -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<Group> {
|
||||
public findByAssignmentAndGroupNumber(
|
||||
|
|
|
|||
|
|
@ -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<Submission> {
|
||||
public findSubmissionByLearningObjectAndSubmissionNumber(
|
||||
|
|
|
|||
|
|
@ -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<ClassJoinRequest> {
|
||||
public findAllRequestsBy(requester: Student): Promise<ClassJoinRequest[]> {
|
||||
|
|
|
|||
|
|
@ -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<Class> {
|
||||
public findById(id: string): Promise<Class | null> {
|
||||
|
|
|
|||
|
|
@ -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<TeacherInvitation> {
|
||||
public findAllInvitationsForClass(
|
||||
|
|
|
|||
|
|
@ -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<Attachment> {
|
||||
public findByLearningObjectAndNumber(
|
||||
|
|
|
|||
|
|
@ -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<LearningObject> {
|
||||
public findByIdentifier(
|
||||
|
|
|
|||
|
|
@ -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<LearningPath> {
|
||||
public findByHruidAndLanguage(
|
||||
|
|
|
|||
|
|
@ -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<Answer> {
|
||||
public createAnswer(answer: {
|
||||
|
|
|
|||
|
|
@ -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<Question> {
|
||||
public createQuestion(question: {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Student> {
|
||||
public findByUsername(username: string): Promise<Student | null> {
|
||||
|
|
|
|||
|
|
@ -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<Teacher> {
|
||||
public findByUsername(username: string): Promise<Teacher | null> {
|
||||
|
|
|
|||
|
|
@ -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<User> {
|
||||
public findByUsername(username: string): Promise<User | null> {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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).
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { Language } from './language';
|
||||
import { Language } from './language.js';
|
||||
|
||||
export class LearningObjectIdentifier {
|
||||
constructor(
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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'];
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import {initORM} from "../src/orm";
|
||||
import {initORM} from "../src/orm.js";
|
||||
import dotenv from "dotenv";
|
||||
|
||||
export async function setupTestApp() {
|
||||
|
|
|
|||
Reference in a new issue