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

Merge remote-tracking branch 'origin/fix/class-id' into fix/class-id

Browse source 
# Conflicts:
#	frontend/tests/controllers/assignments-controller.test.ts
#	frontend/tests/controllers/groups.controller.test.ts
#	frontend/tests/controllers/submissions-controller.test.ts
This commit is contained in:
Gabriellvl 2025-05-04 14:18:35 +02:00
commit bcf61e1179
12 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,10 @@ import { Collection, Entity, ManyToMany, PrimaryKey, Property } from '@mikro-orm
import { Teacher } from '../users/teacher.entity.js';
import { Student } from '../users/student.entity.js';
import { ClassRepository } from '../../data/classes/class-repository.js';
import { customAlphabet } from "nanoid";
import { customAlphabet } from 'nanoid';
const generateClassId = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 6);
@Entity({
repository: () => ClassRepository,
})

4
backend/tests/controllers/classes.test.ts
View file

@ -1,7 +1,7 @@
import { setupTestApp } from '../setup-tests.js';
import { describe, it, expect, beforeAll, beforeEach, vi, Mock } from 'vitest';
import { Request, Response } from 'express';
import {createClassHandler, deleteClassHandler} from "../../src/controllers/classes";
import { createClassHandler, deleteClassHandler } from '../../src/controllers/classes';
describe('Class controllers', () => {
let req: Partial<Request>;
@ -44,6 +44,4 @@ describe('Class controllers', () => {
expect(jsonMock).toHaveBeenCalledWith(expect.objectContaining({ class: expect.anything() }));
});
});

2
backend/tests/controllers/students.test.ts
View file

@ -21,7 +21,7 @@ import { BadRequestException } from '../../src/exceptions/bad-request-exception.
import { ConflictException } from '../../src/exceptions/conflict-exception.js';
import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js';
import { StudentDTO } from '@dwengo-1/common/interfaces/student';
import {getClass02} from "../test_assets/classes/classes.testdata";
import { getClass02 } from '../test_assets/classes/classes.testdata';
describe('Student controllers', () => {
let req: Partial<Request>;

2
backend/tests/controllers/teacher-invitations.test.ts
View file

@ -12,7 +12,7 @@ import { TeacherInvitationData } from '@dwengo-1/common/interfaces/teacher-invit
import { getClassHandler } from '../../src/controllers/classes';
import { BadRequestException } from '../../src/exceptions/bad-request-exception';
import { ClassStatus } from '@dwengo-1/common/util/class-join-request';
import {getClass02} from "../test_assets/classes/classes.testdata";
import { getClass02 } from '../test_assets/classes/classes.testdata';
describe('Teacher controllers', () => {
let req: Partial<Request>;

2
backend/tests/controllers/teachers.test.ts
View file

@ -17,7 +17,7 @@ import { EntityAlreadyExistsException } from '../../src/exceptions/entity-alread
import { getStudentRequestsHandler } from '../../src/controllers/students.js';
import { TeacherDTO } from '@dwengo-1/common/interfaces/teacher';
import { getClassHandler } from '../../src/controllers/classes';
import {getClass02} from "../test_assets/classes/classes.testdata";
import { getClass02 } from '../test_assets/classes/classes.testdata';
describe('Teacher controllers', () => {
let req: Partial<Request>;

2
backend/tests/data/assignments/assignments.test.ts
View file

@ -3,7 +3,7 @@ import { setupTestApp } from '../../setup-tests';
import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';
import { getAssignmentRepository, getClassRepository } from '../../../src/data/repositories';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import {getClass02} from "../../test_assets/classes/classes.testdata";
import { getClass02 } from '../../test_assets/classes/classes.testdata';
describe('AssignmentRepository', () => {
let assignmentRepository: AssignmentRepository;

2
backend/tests/data/assignments/groups.test.ts
View file

@ -4,7 +4,7 @@ import { GroupRepository } from '../../../src/data/assignments/group-repository'
import { getAssignmentRepository, getClassRepository, getGroupRepository } from '../../../src/data/repositories';
import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import {getClass01, getClass02} from "../../test_assets/classes/classes.testdata";
import { getClass01, getClass02 } from '../../test_assets/classes/classes.testdata';
describe('GroupRepository', () => {
let groupRepository: GroupRepository;

2
backend/tests/data/assignments/submissions.test.ts
View file

@ -18,7 +18,7 @@ import { Submission } from '../../../src/entities/assignments/submission.entity'
import { Class } from '../../../src/entities/classes/class.entity';
import { Assignment } from '../../../src/entities/assignments/assignment.entity';
import { testLearningObject01 } from '../../test_assets/content/learning-objects.testdata';
import {getClass01} from "../../test_assets/classes/classes.testdata";
import { getClass01 } from '../../test_assets/classes/classes.testdata';
describe('SubmissionRepository', () => {
let submissionRepository: SubmissionRepository;

2
backend/tests/data/classes/class-join-request.test.ts
View file

@ -4,7 +4,7 @@ import { ClassJoinRequestRepository } from '../../../src/data/classes/class-join
import { getClassJoinRequestRepository, getClassRepository, getStudentRepository } from '../../../src/data/repositories';
import { StudentRepository } from '../../../src/data/users/student-repository';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import {getClass02, getClass03} from "../../test_assets/classes/classes.testdata";
import { getClass02, getClass03 } from '../../test_assets/classes/classes.testdata';
describe('ClassJoinRequestRepository', () => {
let classJoinRequestRepository: ClassJoinRequestRepository;

2
backend/tests/data/classes/classes.test.ts
View file

@ -2,7 +2,7 @@ import { beforeAll, describe, expect, it } from 'vitest';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import { setupTestApp } from '../../setup-tests';
import { getClassRepository } from '../../../src/data/repositories';
import {getClass01, getClass04} from "../../test_assets/classes/classes.testdata";
import { getClass01, getClass04 } from '../../test_assets/classes/classes.testdata';
describe('ClassRepository', () => {
let classRepository: ClassRepository;

2
backend/tests/data/classes/teacher-invitation.test.ts
View file

@ -4,7 +4,7 @@ import { getClassRepository, getTeacherInvitationRepository, getTeacherRepositor
import { TeacherInvitationRepository } from '../../../src/data/classes/teacher-invitation-repository';
import { TeacherRepository } from '../../../src/data/users/teacher-repository';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import {getClass01, getClass02} from "../../test_assets/classes/classes.testdata";
import { getClass01, getClass02 } from '../../test_assets/classes/classes.testdata';
describe('ClassRepository', () => {
let teacherInvitationRepository: TeacherInvitationRepository;

2
backend/tests/data/questions/questions.test.ts
View file

@ -14,7 +14,7 @@ import { Language } from '@dwengo-1/common/util/language';
import { Question } from '../../../src/entities/questions/question.entity';
import { Class } from '../../../src/entities/classes/class.entity';
import { Assignment } from '../../../src/entities/assignments/assignment.entity';
import {getClass01} from "../../test_assets/classes/classes.testdata";
import { getClass01 } from '../../test_assets/classes/classes.testdata';
describe('QuestionRepository', () => {
let questionRepository: QuestionRepository;