From ce0fabc0e2ec49e24c1c7c107d5ae79ff36e013d Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sat, 22 Mar 2025 11:57:25 +0100 Subject: [PATCH] fix: meervoud en ongebruikte file gefixt #130 --- backend/src/controllers/classes.ts | 2 +- backend/src/services/{class.ts => classes.ts} | 0 backend/src/services/teachers.ts | 3 +- backend/src/services/users.ts | 41 ------------------- 4 files changed, 2 insertions(+), 44 deletions(-) rename backend/src/services/{class.ts => classes.ts} (100%) delete mode 100644 backend/src/services/users.ts diff --git a/backend/src/controllers/classes.ts b/backend/src/controllers/classes.ts index a571176b..d7d1e4cc 100644 --- a/backend/src/controllers/classes.ts +++ b/backend/src/controllers/classes.ts @@ -1,5 +1,5 @@ import { Request, Response } from 'express'; -import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/class.js'; +import { createClass, getAllClasses, getClass, getClassStudents, getClassStudentsIds, getClassTeacherInvitations } from '../services/classes.js'; import { ClassDTO } from '../interfaces/class.js'; export async function getAllClassesHandler(req: Request, res: Response): Promise { diff --git a/backend/src/services/class.ts b/backend/src/services/classes.ts similarity index 100% rename from backend/src/services/class.ts rename to backend/src/services/classes.ts diff --git a/backend/src/services/teachers.ts b/backend/src/services/teachers.ts index fd80b692..f86bc3d7 100644 --- a/backend/src/services/teachers.ts +++ b/backend/src/services/teachers.ts @@ -7,10 +7,9 @@ import { } from '../data/repositories.js'; import { Teacher } from '../entities/users/teacher.entity.js'; import { ClassDTO, mapToClassDTO } from '../interfaces/class.js'; -import { getClassStudents } from './class.js'; +import { getClassStudents } from './classes.js'; import { StudentDTO } from '../interfaces/student.js'; import { mapToQuestionDTO, mapToQuestionId, QuestionDTO, QuestionId } from '../interfaces/question.js'; -import { UserService } from './users.js'; import { mapToUser } from '../interfaces/user.js'; import { mapToTeacher, mapToTeacherDTO, TeacherDTO } from '../interfaces/teacher.js'; diff --git a/backend/src/services/users.ts b/backend/src/services/users.ts deleted file mode 100644 index 65ed5d4c..00000000 --- a/backend/src/services/users.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { UserRepository } from '../data/users/user-repository.js'; -import { UserDTO, mapToUser, mapToUserDTO } from '../interfaces/user.js'; -import { User } from '../entities/users/user.entity.js'; - -export class UserService { - protected repository: UserRepository; - - constructor(repository: UserRepository) { - this.repository = repository; - } - - async getAllUsers(): Promise { - const users = await this.repository.findAll(); - return users.map(mapToUserDTO); - } - - async getAllUserIds(): Promise { - const users = await this.getAllUsers(); - return users.map((user) => user.username); - } - - async getUserByUsername(username: string): Promise { - const user = await this.repository.findByUsername(username); - return user ? mapToUserDTO(user) : null; - } - - async createUser(userData: UserDTO, UserClass: new () => T): Promise { - const newUser = mapToUser(userData, new UserClass()); - await this.repository.save(newUser); - return newUser; - } - - async deleteUser(username: string): Promise { - const user = await this.getUserByUsername(username); - if (!user) { - return null; - } - await this.repository.deleteByUsername(username); - return mapToUserDTO(user); - } -}