Merge branch 'feat/service-layer' into feat/service-layer-adriaan
# Conflicts: # backend/src/controllers/classes.ts # backend/src/controllers/students.ts # backend/src/data/users/teacher-repository.ts # backend/src/interfaces/assignment.ts # backend/src/interfaces/teacher.ts # backend/src/routes/classes.ts # backend/src/services/assignments.ts # backend/src/services/class.ts # backend/src/services/students.ts # backend/src/util/translation-helper.ts
This commit is contained in:
		
						commit
						6c4ea0eefb
					
				
					 33 changed files with 454 additions and 137 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
import { Request, Response } from 'express';
 | 
			
		||||
import { getAllClasses, getClass, getClassStudents, getClassTeacherInvitations } from '../services/class.js';
 | 
			
		||||
import { getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/class.js';
 | 
			
		||||
import { ClassDTO } from '../interfaces/classes.js';
 | 
			
		||||
 | 
			
		||||
export async function getAllClassesHandler(
 | 
			
		||||
    req: Request,
 | 
			
		||||
| 
						 | 
				
			
			@ -47,7 +48,9 @@ export async function getClassStudentsHandler(
 | 
			
		|||
    const classId = req.params.id;
 | 
			
		||||
    const full = req.query.full === "true";
 | 
			
		||||
 | 
			
		||||
    const students = await getClassStudents(classId, full);
 | 
			
		||||
    let students = full
 | 
			
		||||
        ? await getClassStudents(classId)
 | 
			
		||||
        : await getClassStudentsIds(classId);
 | 
			
		||||
 | 
			
		||||
    res.json({
 | 
			
		||||
        students: students,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue