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

Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes

Browse source 
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/services/students.ts
This commit is contained in:
Gabriellvl 2025-03-24 15:27:16 +01:00
commit d2cf5b95a9
11 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/src/controllers/students.ts
View file

@ -6,10 +6,11 @@ import {
getStudent,
getStudentAssignments,
getStudentClasses,
getStudentGroups, getStudentQuestions,
getStudentGroups,
getStudentQuestions,
getStudentSubmissions,
} from '../services/students.js';
import {MISSING_FIELDS_ERROR, MISSING_USERNAME_ERROR, NAME_NOT_FOUND_ERROR} from './users.js';
import { MISSING_FIELDS_ERROR, MISSING_USERNAME_ERROR, NAME_NOT_FOUND_ERROR } from './users.js';
import { StudentDTO } from '../interfaces/student.js';
@ -23,7 +24,7 @@ export async function getAllStudentsHandler(req: Request, res: Response): Promis
return;
}
res.json({students});
res.json({ students });
}
export async function getStudentHandler(req: Request, res: Response): Promise<void> {
@ -153,5 +154,5 @@ export async function getStudentQuestionsHandler(req: Request, res: Response): P
res.json({
questions,
})
});
}

17
backend/src/controllers/teachers.ts
View file

@ -1,17 +1,10 @@
import { Request, Response } from 'express';
import {
createTeacher,
deleteTeacher,
getAllTeachers,
getClassesByTeacher,
getStudentsByTeacher,
getTeacher,
} from '../services/teachers.js';
import { createTeacher, deleteTeacher, getAllTeachers, getClassesByTeacher, getStudentsByTeacher, getTeacher } from '../services/teachers.js';
import { ClassDTO } from '../interfaces/class.js';
import { StudentDTO } from '../interfaces/student.js';
import { QuestionDTO, QuestionId } from '../interfaces/question.js';
import { TeacherDTO } from '../interfaces/teacher.js';
import {MISSING_FIELDS_ERROR, MISSING_USERNAME_ERROR, NAME_NOT_FOUND_ERROR} from "./users";
import { MISSING_FIELDS_ERROR, MISSING_USERNAME_ERROR, NAME_NOT_FOUND_ERROR } from './users';
export async function getAllTeachersHandler(req: Request, res: Response): Promise<void> {
const full = req.query.full === 'true';
@ -23,7 +16,7 @@ export async function getAllTeachersHandler(req: Request, res: Response): Promis
return;
}
res.json({teachers});
res.json({ teachers });
}
export async function getTeacherHandler(req: Request, res: Response): Promise<void> {
@ -98,7 +91,7 @@ export async function getTeacherStudentHandler(req: Request, res: Response): Pro
const students: StudentDTO[] | string[] = await getStudentsByTeacher(username, full);
res.json({students});
res.json({ students });
}
export async function getTeacherQuestionHandler(req: Request, res: Response): Promise<void> {
@ -112,5 +105,5 @@ export async function getTeacherQuestionHandler(req: Request, res: Response): Pr
const questions: QuestionDTO[] | QuestionId[] = await getQuestionsByTeacher(username, full);
res.json({questions});
res.json({ questions });
}

6
backend/src/controllers/users.ts
View file

@ -1,7 +1,7 @@
export const MISSING_USERNAME_ERROR = { error: 'Missing required field: username' };
export function NAME_NOT_FOUND_ERROR(username: string){
return {error: `User with username '${username}' not found.`};
export function NAME_NOT_FOUND_ERROR(username: string) {
return { error: `User with username '${username}' not found.` };
}
export const MISSING_FIELDS_ERROR = { error: 'Missing required fields: username, firstName, lastName'}
export const MISSING_FIELDS_ERROR = { error: 'Missing required fields: username, firstName, lastName' };