diff --git a/backend/src/controllers/assignments.ts b/backend/src/controllers/assignments.ts index 928d4cce..2ca6d2fc 100644 --- a/backend/src/controllers/assignments.ts +++ b/backend/src/controllers/assignments.ts @@ -4,6 +4,7 @@ import { deleteAssignment, getAllAssignments, getAssignment, + getAssignmentsQuestions, getAssignmentsSubmissions, putAssignment, } from '../services/assignments.js'; @@ -13,6 +14,19 @@ import { BadRequestException } from '../exceptions/bad-request-exception.js'; import { Assignment } from '../entities/assignments/assignment.entity.js'; import { EntityDTO } from '@mikro-orm/core'; +function getAssignmentParams(req: Request): { classid: string; assignmentNumber: number; full: boolean } { + const classid = req.params.classid; + const assignmentNumber = Number(req.params.id); + const full = req.query.full === 'true'; + requireFields({ assignmentNumber, classid }); + + if (isNaN(assignmentNumber)) { + throw new BadRequestException('Assignment id should be a number'); + } + + return { classid, assignmentNumber, full }; +} + export async function getAllAssignmentsHandler(req: Request, res: Response): Promise { const classId = req.params.classid; const full = req.query.full === 'true'; @@ -38,58 +52,42 @@ export async function createAssignmentHandler(req: Request, res: Response): Prom } export async function getAssignmentHandler(req: Request, res: Response): Promise { - const id = Number(req.params.id); - const classid = req.params.classid; - requireFields({ id, classid }); + const { classid, assignmentNumber } = getAssignmentParams(req); - if (isNaN(id)) { - throw new BadRequestException('Assignment id should be a number'); - } - - const assignment = await getAssignment(classid, id); + const assignment = await getAssignment(classid, assignmentNumber); res.json({ assignment }); } export async function putAssignmentHandler(req: Request, res: Response): Promise { - const id = Number(req.params.id); - const classid = req.params.classid; - requireFields({ id, classid }); - - if (isNaN(id)) { - throw new BadRequestException('Assignment id should be a number'); - } + const { classid, assignmentNumber } = getAssignmentParams(req); const assignmentData = req.body as Partial>; - const assignment = await putAssignment(classid, id, assignmentData); + const assignment = await putAssignment(classid, assignmentNumber, assignmentData); res.json({ assignment }); } export async function deleteAssignmentHandler(req: Request, res: Response): Promise { - const id = Number(req.params.id); - const classid = req.params.classid; - requireFields({ id, classid }); + const { classid, assignmentNumber } = getAssignmentParams(req); - if (isNaN(id)) { - throw new BadRequestException('Assignment id should be a number'); - } + const assignment = await deleteAssignment(classid, assignmentNumber); - const assignment = await deleteAssignment(classid, id); res.json({ assignment }); } export async function getAssignmentsSubmissionsHandler(req: Request, res: Response): Promise { - const classid = req.params.classid; - const assignmentNumber = Number(req.params.id); - const full = req.query.full === 'true'; - requireFields({ assignmentNumber, classid }); - - if (isNaN(assignmentNumber)) { - throw new BadRequestException('Assignment id should be a number'); - } + const { classid, assignmentNumber, full } = getAssignmentParams(req); const submissions = await getAssignmentsSubmissions(classid, assignmentNumber, full); res.json({ submissions }); } + +export async function getAssignmentQuestionsHandler(req: Request, res: Response): Promise { + const { classid, assignmentNumber, full } = getAssignmentParams(req); + + const questions = await getAssignmentsQuestions(classid, assignmentNumber, full); + + res.json({ questions }); +} diff --git a/backend/src/controllers/groups.ts b/backend/src/controllers/groups.ts index 217510f6..f17aada5 100644 --- a/backend/src/controllers/groups.ts +++ b/backend/src/controllers/groups.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupSubmissions, putGroup } from '../services/groups.js'; +import { createGroup, deleteGroup, getAllGroups, getGroup, getGroupQuestions, getGroupSubmissions, putGroup } from '../services/groups.js'; import { GroupDTO } from '@dwengo-1/common/interfaces/group'; import { requireFields } from './error-helper.js'; import { BadRequestException } from '../exceptions/bad-request-exception.js'; @@ -84,7 +84,7 @@ export async function createGroupHandler(req: Request, res: Response): Promise { +function getGroupParams(req: Request): { classId: string; assignmentId: number; groupId: number; full: boolean } { const classId = req.params.classid; const assignmentId = Number(req.params.assignmentid); const groupId = Number(req.params.groupid); @@ -100,7 +100,21 @@ export async function getGroupSubmissionsHandler(req: Request, res: Response): P throw new BadRequestException('Group id must be a number'); } + return { classId, assignmentId, groupId, full }; +} + +export async function getGroupSubmissionsHandler(req: Request, res: Response): Promise { + const { classId, assignmentId, groupId, full } = getGroupParams(req); + const submissions = await getGroupSubmissions(classId, assignmentId, groupId, full); res.json({ submissions }); } + +export async function getGroupQuestionsHandler(req: Request, res: Response): Promise { + const { classId, assignmentId, groupId, full } = getGroupParams(req); + + const questions = await getGroupQuestions(classId, assignmentId, groupId, full); + + res.json({ questions }); +} diff --git a/backend/src/data/questions/question-repository.ts b/backend/src/data/questions/question-repository.ts index 362ec4c9..598cfb35 100644 --- a/backend/src/data/questions/question-repository.ts +++ b/backend/src/data/questions/question-repository.ts @@ -62,9 +62,7 @@ export class QuestionRepository extends DwengoEntityRepository { public async findAllByAssignment(assignment: Assignment): Promise { return this.find({ - inGroup: { - $contained: assignment.groups, - }, + inGroup: assignment.groups.getItems(), learningObjectHruid: assignment.learningPathHruid, learningObjectLanguage: assignment.learningPathLanguage, }); @@ -77,6 +75,13 @@ export class QuestionRepository extends DwengoEntityRepository { }); } + public async findAllByGroup(inGroup: Group): Promise { + return this.findAll({ + where: { inGroup }, + orderBy: { timestamp: 'DESC' }, + }); + } + /** * Looks up all questions for the given learning object which were asked as part of the given assignment. * When forStudentUsername is set, only the questions within the given user's group are shown. diff --git a/backend/src/routes/assignments.ts b/backend/src/routes/assignments.ts index 083ee586..4503414d 100644 --- a/backend/src/routes/assignments.ts +++ b/backend/src/routes/assignments.ts @@ -4,6 +4,7 @@ import { deleteAssignmentHandler, getAllAssignmentsHandler, getAssignmentHandler, + getAssignmentQuestionsHandler, getAssignmentsSubmissionsHandler, putAssignmentHandler, } from '../controllers/assignments.js'; @@ -23,11 +24,7 @@ router.delete('/:id', deleteAssignmentHandler); router.get('/:id/submissions', getAssignmentsSubmissionsHandler); -router.get('/:id/questions', (_req, res) => { - res.json({ - questions: ['0'], - }); -}); +router.get('/:id/questions', getAssignmentQuestionsHandler); router.use('/:assignmentid/groups', groupRouter); diff --git a/backend/src/routes/groups.ts b/backend/src/routes/groups.ts index 7f973972..3043c23b 100644 --- a/backend/src/routes/groups.ts +++ b/backend/src/routes/groups.ts @@ -4,6 +4,7 @@ import { deleteGroupHandler, getAllGroupsHandler, getGroupHandler, + getGroupQuestionsHandler, getGroupSubmissionsHandler, putGroupHandler, } from '../controllers/groups.js'; @@ -23,4 +24,6 @@ router.delete('/:groupid', deleteGroupHandler); router.get('/:groupid/submissions', getGroupSubmissionsHandler); +router.get('/:groupid/questions', getGroupQuestionsHandler); + export default router; diff --git a/backend/src/services/groups.ts b/backend/src/services/groups.ts index 382780d8..b75fe82f 100644 --- a/backend/src/services/groups.ts +++ b/backend/src/services/groups.ts @@ -1,5 +1,5 @@ import { EntityDTO } from '@mikro-orm/core'; -import { getGroupRepository, getSubmissionRepository } from '../data/repositories.js'; +import { getGroupRepository, getQuestionRepository, getSubmissionRepository } from '../data/repositories.js'; import { Group } from '../entities/assignments/group.entity.js'; import { mapToGroupDTO, mapToGroupDTOId } from '../interfaces/group.js'; import { mapToSubmissionDTO, mapToSubmissionDTOId } from '../interfaces/submission.js'; @@ -12,6 +12,8 @@ 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'; +import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question'; +import { mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js'; async function assertMembersInClass(members: Student[], cls: Class): Promise { if (!members.every((student) => cls.students.contains(student))) { @@ -121,3 +123,21 @@ export async function getGroupSubmissions( return submissions.map(mapToSubmissionDTOId); } + +export async function getGroupQuestions( + classId: string, + assignmentNumber: number, + groupNumber: number, + full: boolean +): Promise { + const group = await fetchGroup(classId, assignmentNumber, groupNumber); + + const questionRepository = getQuestionRepository(); + const questions = await questionRepository.findAllByGroup(group); + + if (full) { + return questions.map(mapToQuestionDTO); + } + + return questions.map(mapToQuestionDTOId); +}