diff --git a/backend/.env.test b/backend/.env.test index 535628cd..4444ec29 100644 --- a/backend/.env.test +++ b/backend/.env.test @@ -11,3 +11,10 @@ DWENGO_PORT=3000 DWENGO_DB_NAME=":memory:" DWENGO_DB_UPDATE=true + +DWENGO_AUTH_STUDENT_URL=http://localhost:7080/realms/student +DWENGO_AUTH_STUDENT_JWKS_ENDPOINT=http://localhost:7080/realms/student/protocol/openid-connect/certs +DWENGO_AUTH_TEACHER_URL=http://localhost:7080/realms/teacher +DWENGO_AUTH_TEACHER_JWKS_ENDPOINT=http://localhost:7080/realms/teacher/protocol/openid-connect/certs + +DWENGO_CORS_ALLOWED_ORIGINS=http://localhost:5173,http://localhost:3000 diff --git a/backend/package.json b/backend/package.json index c4371d78..7e4b4eae 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,7 +7,8 @@ "main": "dist/app.js", "scripts": { "build": "cross-env NODE_ENV=production tsc --build", - "dev": "cross-env NODE_ENV=development tsx tool/seed.ts; tsx watch --env-file=.env.development.local src/app.ts", + "predev": "tsc --build ../common/tsconfig.json", + "dev": "cross-env NODE_ENV=development tsx tool/seed.ts && tsx watch --env-file=.env.development.local src/app.ts", "start": "cross-env NODE_ENV=production node --env-file=.env dist/app.js", "format": "prettier --write src/", "format-check": "prettier --check src/", diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 53bc96ec..217510f6 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -3,8 +3,6 @@ import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions, import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; -import { EntityDTO } from '@mikro-orm/core'; -import { Group } from '../entities/assignments/group.entity.js'; function checkGroupFields(classId: string, assignmentId: number, groupId: number): void { requireFields({ classId, assignmentId, groupId }); @@ -35,7 +33,11 @@ export async function putGroupHandler(req: Request, res: Response): Promise>); + // Only members field can be changed + const members = req.body.members; + requireFields({ members }); + + const group = await putGroup(classId, assignmentId, groupId, { members } as Partial); res.json({ group }); } diff --git a/backend/src/logging/initalize.ts b/backend/src/logging/initalize.ts index 5c94a25f..f89518c4 100644 --- a/backend/src/logging/initalize.ts +++ b/backend/src/logging/initalize.ts @@ -26,13 +26,15 @@ function initializeLogger(): Logger { const consoleTransport = new transports.Console({ level: getEnvVar(envVars.LogLevel), - format: format.combine(format.cli(), format.colorize()), + format: format.combine(format.cli(), format.simple()), }); if (getEnvVar(envVars.RunMode) === 'dev') { - return createLogger({ + logger = createLogger({ transports: [consoleTransport], }); + logger.debug(`Logger initialized with level ${logLevel} to console`); + return logger; } const lokiHost = getEnvVar(envVars.LokiHost); diff --git a/backend/src/logging/mikroOrmLogger.ts b/backend/src/logging/mikroOrmLogger.ts index 9cb797a8..0fc18b87 100644 --- a/backend/src/logging/mikroOrmLogger.ts +++ b/backend/src/logging/mikroOrmLogger.ts @@ -11,7 +11,7 @@ export class MikroOrmLogger extends DefaultLogger { }; let message: string; - if (context?.label) { + if (context !== undefined && context.labels !== undefined) { message = `[${namespace}] (${context.label}) ${messageArg}`; } else { message = `[${namespace}] ${messageArg}`; diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 0c73c8c5..382780d8 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -7,8 +7,17 @@ import { GroupDTO, GroupDTOId } from '@dwengo-1/common/interfaces/group'; import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission'; import { fetchAssignment } from './assignments.js'; import { NotFoundException } from '../exceptions/not-found-exception.js'; -import { putObject } from './service-helper.js'; import { fetchStudents } from './students.js'; +import { fetchClass } from './classes.js'; +import { BadRequestException } from '../exceptions/bad-request-exception.js'; +import { Student } from '../entities/users/student.entity.js'; +import { Class } from '../entities/classes/class.entity.js'; + +async function assertMembersInClass(members: Student[], cls: Class): Promise { + if (!members.every((student) => cls.students.contains(student))) { + throw new BadRequestException('Student does not belong to class'); + } +} export async function fetchGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise { const assignment = await fetchAssignment(classId, assignmentNumber); @@ -28,15 +37,18 @@ export async function getGroup(classId: string, assignmentNumber: number, groupN return mapToGroupDTO(group, group.assignment.within); } -export async function putGroup( - classId: string, - assignmentNumber: number, - groupNumber: number, - groupData: Partial> -): Promise { +export async function putGroup(classId: string, assignmentNumber: number, groupNumber: number, groupData: Partial): Promise { const group = await fetchGroup(classId, assignmentNumber, groupNumber); - await putObject(group, groupData, getGroupRepository()); + const memberUsernames = groupData.members as string[]; + const members = await fetchStudents(memberUsernames); + + const cls = await fetchClass(classId); + await assertMembersInClass(members, cls); + + const groupRepository = getGroupRepository(); + groupRepository.assign(group, { members } as Partial>); + await groupRepository.getEntityManager().persistAndFlush(group); return mapToGroupDTO(group, group.assignment.within); } @@ -63,6 +75,9 @@ export async function createGroup(groupData: GroupDTO, classid: string, assignme const memberUsernames = (groupData.members as string[]) || []; const members = await fetchStudents(memberUsernames); + const cls = await fetchClass(classid); + await assertMembersInClass(members, cls); + const assignment = await fetchAssignment(classid, assignmentNumber); const groupRepository = getGroupRepository(); diff --git a/backend/tests/test_assets/assignments/groups.testdata.ts b/backend/tests/test_assets/assignments/groups.testdata.ts index 16674843..4361383b 100644 --- a/backend/tests/test_assets/assignments/groups.testdata.ts +++ b/backend/tests/test_assets/assignments/groups.testdata.ts @@ -61,7 +61,7 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen */ group1ConditionalLearningPath = em.create(Group, { assignment: getConditionalPathAssignment(), - groupNumber: 1, + groupNumber: 21005, members: [getTestleerling1()], }); diff --git a/backend/tool/seed.ts b/backend/tool/seed.ts index 3cb4543c..00e3c0bf 100644 --- a/backend/tool/seed.ts +++ b/backend/tool/seed.ts @@ -14,14 +14,12 @@ import { makeTestQuestions } from '../tests/test_assets/questions/questions.test import { makeTestStudents } from '../tests/test_assets/users/students.testdata.js'; import { makeTestTeachers } from '../tests/test_assets/users/teachers.testdata.js'; import { getLogger, Logger } from '../src/logging/initalize.js'; -import { Collection } from '@mikro-orm/core'; +import { Collection, MikroORM } from '@mikro-orm/core'; import { Group } from '../src/entities/assignments/group.entity'; const logger: Logger = getLogger(); -export async function seedDatabase(): Promise { - dotenv.config({ path: '.env.development.local' }); - const orm = await initORM(); +export async function seedORM(orm: MikroORM): Promise { await orm.schema.clearDatabase(); const em = forkEntityManager(); @@ -68,8 +66,17 @@ export async function seedDatabase(): Promise { ]); logger.info('Development database seeded successfully!'); +} + +export async function seedDatabase(envFile = '.env.development.local', testMode = false): Promise { + dotenv.config({ path: envFile }); + const orm = await initORM(testMode); + + await seedORM(orm); await orm.close(); } -seedDatabase().catch(logger.error); +seedDatabase().catch((err) => { + logger.error(err); +}); diff --git a/backend/tool/startTestApp.ts b/backend/tool/startTestApp.ts new file mode 100644 index 00000000..a5d0f852 --- /dev/null +++ b/backend/tool/startTestApp.ts @@ -0,0 +1,29 @@ +import express, { Express } from 'express'; +import { initORM } from '../src/orm.js'; +import apiRouter from '../src/routes/router.js'; +import { errorHandler } from '../src/middleware/error-handling/error-handler.js'; +import dotenv from 'dotenv'; +import cors from '../src/middleware/cors'; +import { authenticateUser } from '../src/middleware/auth/auth'; +import { seedORM } from './seed'; + +const envFile = '../.env.test'; + +dotenv.config({ path: envFile }); + +const app: Express = express(); + +app.use(express.json()); +app.use(cors); +app.use(authenticateUser); + +app.use('/api', apiRouter); +app.use(errorHandler); + +async function startServer(): Promise { + await seedORM(await initORM(true)); + + app.listen(9876); +} + +await startServer(); diff --git a/frontend/package.json b/frontend/package.json index 1d3560bc..4be35d40 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,11 +10,10 @@ "preview": "vite preview", "type-check": "vue-tsc --build", "format": "prettier --write src/", - "test:e2e": "playwright test", "format-check": "prettier --check src/", "lint": "eslint . --fix", - "pretest:unit": "tsx ../docs/api/generate.ts && npm run build", - "test:unit": "vitest --run" + "test:unit": "vitest --run", + "test:e2e": "playwright test" }, "dependencies": { "@tanstack/react-query": "^5.69.0", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index b1207448..dbb62e79 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -3,6 +3,9 @@ import MenuBar from "@/components/MenuBar.vue"; import { useRoute } from "vue-router"; import { computed } from "vue"; + import authService from "@/services/auth/auth-service.ts"; + + void authService.loadUser(); const route = useRoute(); interface RouteMeta { diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue index 28c8afcb..e3734976 100644 --- a/frontend/src/components/MenuBar.vue +++ b/frontend/src/components/MenuBar.vue @@ -1,6 +1,7 @@