refactor + test fix

Author: thomasdejaeghere

backend/src/config/services.ts

@@ -21,47 +21,47 @@ import * as UserServices from "../core/services/user";
 export const services = {
     assignment: {
         get: new AssignmentServices.GetAssignment(repos.assignment),
-        update: new AssignmentServices.UpdateAssignment(repos.assignment),
-        remove: new AssignmentServices.DeleteAssignment(repos.assignment),
-        create: new AssignmentServices.CreateAssignment(repos.assignment),
-        getUserAssignments: new AssignmentServices.GetUserAssignments(repos.assignment),
+        update: new AssignmentServices.UpdateAssignment(repos.assignment, repos.user),
+        remove: new AssignmentServices.DeleteAssignment(repos.assignment, repos.user),
+        create: new AssignmentServices.CreateAssignment(repos.assignment, repos.user),
+        getUserAssignments: new AssignmentServices.GetUserAssignments(repos.assignment, repos.user),
     },
     authentication: {
         register: new UserServices.CreateUser(repos.user),
     },
     class: {
-        get: new ClassServices.GetClass(repos.class),
-        update: new ClassServices.UpdateClass(repos.class),
-        remove: new ClassServices.DeleteClass(repos.class),
-        create: new ClassServices.CreateClass(repos.class),
-        getUserClasses: new ClassServices.GetUserClasses(repos.class),
+        get: new ClassServices.GetClass(repos.class, repos.user),
+        update: new ClassServices.UpdateClass(repos.class, repos.user),
+        remove: new ClassServices.DeleteClass(repos.class, repos.user),
+        create: new ClassServices.CreateClass(repos.class, repos.user),
+        getUserClasses: new ClassServices.GetUserClasses(repos.class, repos.user),
     },
     group: {
-        get: new GroupServices.GetGroup(repos.group),
-        update: new GroupServices.UpdateGroup(repos.group),
-        remove: new GroupServices.DeleteGroup(repos.group),
-        create: new GroupServices.CreateGroup(repos.group),
-        getUserGroups: new GroupServices.GetUserGroups(repos.group),
-        getAssignmentGroups: new GroupServices.GetAssignmentGroups(repos.group),
+        get: new GroupServices.GetGroup(repos.group, repos.user),
+        update: new GroupServices.UpdateGroup(repos.group, repos.user),
+        remove: new GroupServices.DeleteGroup(repos.group, repos.user),
+        create: new GroupServices.CreateGroup(repos.group, repos.user),
+        getUserGroups: new GroupServices.GetUserGroups(repos.group, repos.user),
+        getAssignmentGroups: new GroupServices.GetAssignmentGroups(repos.group, repos.user),
     },
     joinCode: {
-        get: new JoinCodeServices.GetJoinCode(repos.joinCode),
-        update: new JoinCodeServices.UpdateJoinCode(repos.joinCode),
-        remove: new JoinCodeServices.DeleteJoinCode(repos.joinCode),
-        create: new JoinCodeServices.CreateJoinCode(repos.joinCode),
-        getClassJoinCodes: new JoinCodeServices.GetClassJoinCodes(repos.joinCode),
+        get: new JoinCodeServices.GetJoinCode(repos.joinCode, repos.user),
+        update: new JoinCodeServices.UpdateJoinCode(repos.joinCode, repos.user),
+        remove: new JoinCodeServices.DeleteJoinCode(repos.joinCode, repos.user),
+        create: new JoinCodeServices.CreateJoinCode(repos.joinCode, repos.user),
+        getClassJoinCodes: new JoinCodeServices.GetClassJoinCodes(repos.joinCode, repos.user),
     },
     joinRequest: {
-        get: new JoinRequestServices.GetJoinRequest(repos.joinRequest),
-        update: new JoinRequestServices.AcceptJoinRequest(repos.joinRequest, repos.class),
-        remove: new JoinRequestServices.DeleteJoinRequest(repos.joinRequest),
-        create: new JoinRequestServices.CreateJoinRequest(repos.joinRequest, repos.class),
-        getUserJoinRequests: new JoinRequestServices.GetUserJoinRequests(repos.joinRequest),
-        getClassJoinRequests: new JoinRequestServices.GetClassJoinRequests(repos.joinRequest),
+        get: new JoinRequestServices.GetJoinRequest(repos.joinRequest, repos.user),
+        update: new JoinRequestServices.AcceptJoinRequest(repos.joinRequest, repos.user, repos.class),
+        remove: new JoinRequestServices.DeleteJoinRequest(repos.joinRequest, repos.user),
+        create: new JoinRequestServices.CreateJoinRequest(repos.joinRequest, repos.user, repos.class),
+        getUserJoinRequests: new JoinRequestServices.GetUserJoinRequests(repos.joinRequest, repos.user),
+        getClassJoinRequests: new JoinRequestServices.GetClassJoinRequests(repos.joinRequest, repos.user),
     },
     message: {
         get: new MessageServices.GetMessage(repos.message),
-        update: new MessageServices.UpdateMessage(repos.message),
+        update: new MessageServices.UpdateMessage(repos.message, repos.user),
         remove: new MessageServices.DeleteMessage(repos.message),
         create: new MessageServices.CreateMessage(repos.message),
         getThreadMessages: new MessageServices.GetThreadMessages(repos.questionThread),
@@ -75,18 +75,23 @@ export const services = {
     },
     submission: {
         get: new SubmissionServices.GetSubmission(repos.submission),
-        update: new SubmissionServices.UpdateSubmission(repos.submission),
+        update: new SubmissionServices.UpdateSubmission(repos.submission, repos.user),
         remove: new SubmissionServices.DeleteSubmission(repos.submission),
         create: new SubmissionServices.CreateSubmission(repos.submission),
         getUserSubmissions: new SubmissionServices.GetUserSubmissions(repos.submission),
     },
     progress: {
-        getUserProgress: new ProgressServices.GetUserProgress(repos.submission, repos.assignment, repos.learningPath),
-        getAssignmentProgress: new ProgressServices.GetAssignmentProgress(
+        getUserProgress: new ProgressServices.GetUserProgress(
+            repos.submission,
+            repos.assignment,
+            repos.learningPath,
             repos.user,
+        ),
+        getAssignmentProgress: new ProgressServices.GetAssignmentProgress(
             repos.submission,
             repos.assignment,
             repos.learningPath,
+            repos.user,
         ),
         getGroupProgress: new ProgressServices.GetGroupProgress(
             repos.group,
@@ -95,9 +100,14 @@ export const services = {
             repos.assignment,
             repos.learningPath,
         ),
-        get: new ProgressServices.GetUserAssignmentProgress(repos.submission, repos.assignment, repos.learningPath),
+        get: new ProgressServices.GetUserAssignmentProgress(
+            repos.submission,
+            repos.assignment,
+            repos.learningPath,
+            repos.user,
+        ),
         getClassCompletion: new GetClassCompletion(repos.submission, repos.user, repos.assignment, repos.learningPath),
-        getSubmissionActivity: new GetSubmissionActivity(repos.submission),
+        getSubmissionActivity: new GetSubmissionActivity(repos.submission, repos.user),
     },
     user: {
         get: new UserServices.GetUser(repos.user),
@@ -120,10 +130,10 @@ export const services = {
         getAll: new LearningPathServices.GetAllLearningPaths(repos.learningPath),
     },
     task: {
-        create: new TaskServices.CreateTask(repos.task),
-        get: new TaskServices.GetTask(repos.task),
-        getTasks: new TaskServices.GetTasks(repos.task),
-        remove: new TaskServices.DeleteTask(repos.task),
-        update: new TaskServices.UpdateTask(repos.task),
+        create: new TaskServices.CreateTask(repos.task, repos.user),
+        get: new TaskServices.GetTask(repos.task, repos.user),
+        getTasks: new TaskServices.GetTasks(repos.task, repos.user),
+        remove: new TaskServices.DeleteTask(repos.task, repos.user),
+        update: new TaskServices.UpdateTask(repos.task, repos.user),
     },
 };

backend/src/core/helpers.ts

@@ -1,7 +1,7 @@
 import { ApiError, ErrorCode } from "../application/types";
 import { EntityNotFoundError, ExpiredError } from "../config/error";
 import { UserType } from "./entities/user";
-import { UserRepositoryTypeORM } from "../infrastructure/repositories/userRepositoryTypeORM";
+import { IUserRepository } from "./repositories/userRepositoryInterface";
 
 /**
  * @description Tiny helper to wrap repo calls and handle errors.
@@ -39,6 +39,7 @@ export async function tryRepoEntityOperation<T>(
 
 export async function validateUserRights(
     userId: string,
+    userRepository: IUserRepository,
     supposedUserType?: UserType,
     supposedUserId?: string,
 ): Promise<void> {
@@ -48,8 +49,7 @@ export async function validateUserRights(
             message: `User with id ${userId} can not access this information`,
         };
     }
-    const userRes = new UserRepositoryTypeORM();
-    const user = await userRes.getById(userId);
+    const user = await userRepository.getById(userId);
     if (supposedUserType && user.userType !== supposedUserType) {
         throw {
             code: ErrorCode.FORBIDDEN,

backend/src/core/services/assignment/assignmentService.ts

@@ -1,10 +1,14 @@
 import { Service } from "../../../config/service";
 import { IAssignmentRepository } from "../../repositories/assignmentRepositoryInterface";
+import { IUserRepository } from "../../repositories/userRepositoryInterface";
 
 /**
  * Abstract class for Assignment Services
  */
 export abstract class AssignmentService<T> implements Service<T> {
-    constructor(protected assignmentRepository: IAssignmentRepository) {}
+    constructor(
+        protected assignmentRepository: IAssignmentRepository,
+        protected userRepository: IUserRepository,
+    ) {}
     abstract execute(userId: string, input: T): Promise<object>;
 }

backend/src/core/services/assignment/createAssignment.ts

@@ -18,7 +18,7 @@ export class CreateAssignment extends AssignmentService<CreateAssignmentInput> {
      * @throws {ApiError} If the class with the given classId is not found or if the creation fails.
      */
     async execute(userId: string, input: CreateAssignmentInput): Promise<object> {
-        await validateUserRights(userId, UserType.TEACHER);
+        await validateUserRights(userId, this.userRepository, UserType.TEACHER, undefined);
 
         const assignment: Assignment = new Assignment(
             input.classId,

backend/src/core/services/assignment/deleteAssignment.ts

@@ -17,7 +17,7 @@ export class DeleteAssignment extends AssignmentService<DeleteAssignmentInput> {
      * @throws {ApiError} If the assignment with the given id is not found.
      */
     async execute(userId: string, input: DeleteAssignmentInput): Promise<object> {
-        await validateUserRights(userId, UserType.TEACHER);
+        await validateUserRights(userId, this.userRepository, UserType.TEACHER, undefined);
 
         await tryRepoEntityOperation(this.assignmentRepository.delete(input.id), "Assignment", input.id, true);
         return {};

backend/src/core/services/assignment/getUserAssignments.ts

@@ -17,7 +17,7 @@ export class GetUserAssignments extends AssignmentService<GetUserAssignmentsInpu
      * @throws {ApiError} If the user with the given id is not found.
      */
     async execute(userId: string, input: GetUserAssignmentsInput): Promise<object> {
-        await validateUserRights(userId, undefined, input.idParent);
+        await validateUserRights(userId, this.userRepository, undefined, input.idParent);
 
         const assignments: Assignment[] = await tryRepoEntityOperation(
             this.assignmentRepository.getByUserId(input.idParent),

backend/src/core/services/assignment/updateAssignment.ts

@@ -17,7 +17,7 @@ export class UpdateAssignment extends AssignmentService<UpdateAssignmentInput> {
      * @throws {ApiError} If the assignment with the given id is not found.
      */
     async execute(userId: string, input: UpdateAssignmentInput): Promise<object> {
-        await validateUserRights(userId, UserType.TEACHER);
+        await validateUserRights(userId, this.userRepository, UserType.TEACHER, undefined);
 
         const assignment = await this.assignmentRepository.getById(input.id);
 

backend/src/core/services/class/baseClassService.ts

@@ -1,10 +1,14 @@
 import { Service } from "../../../config/service";
 import { IClassRepository } from "../../repositories/classRepositoryInterface";
+import { IUserRepository } from "../../repositories/userRepositoryInterface";
 
 /**
  * Class used for every service-implementation. They all need a class repository.
  */
 export abstract class ClassBaseService<T> implements Service<T> {
-    constructor(protected classRepository: IClassRepository) {}
+    constructor(
+        protected classRepository: IClassRepository,
+        protected userRepository: IUserRepository,
+    ) {}
     abstract execute(userId: string, input: T): Promise<object>;
 }

backend/src/core/services/class/createClass.ts

@@ -15,7 +15,7 @@ export class CreateClass extends ClassBaseService<CreateClassInput> {
      * @throws {ApiError} If the class with the given teacherId is not found or if the creation fails.
      */
     async execute(userId: string, input: CreateClassInput): Promise<object> {
-        await validateUserRights(userId, UserType.TEACHER);
+        await validateUserRights(userId, this.userRepository, UserType.TEACHER, undefined);
 
         const newClass = new Class(input.name, input.description, input.targetAudience, input.teacherId);
 

backend/src/core/services/class/deleteClass.ts

@@ -14,7 +14,7 @@ export class DeleteClass extends ClassBaseService<DeleteClassInput> {
      * @throws {ApiError} If the class with the given id is not found.
      */
     async execute(userId: string, input: DeleteClassInput): Promise<object> {
-        await validateUserRights(userId, UserType.TEACHER);
+        await validateUserRights(userId, this.userRepository, UserType.TEACHER, undefined);
         await tryRepoEntityOperation(this.classRepository.delete(input.id), "Class", input.id, true);
         return {};
     }