Merge branch 'v5.0.1'

ExpressAPI/src/managers/ExerciseManager.ts

@@ -15,11 +15,10 @@ class ExerciseManager {
                                             }) as unknown as Exercise ?? undefined;
     }
 
-    getFromAssignment(assignmentName: string, include: Prisma.ExerciseInclude | undefined = undefined): Promise<Array<Exercise>> {
+    // deleteFilter is a boolean that is true to get only deleted exercises, false to get only non-deleted exercises, and undefined to get all exercises
+    getFromAssignment(assignmentName: string, deleteFilter: boolean | undefined = undefined, include: Prisma.ExerciseInclude | undefined = undefined): Promise<Array<Exercise>> {
         return db.exercise.findMany({
-                                        where  : {
-                                            assignmentName: assignmentName
-                                        },
+                                        where  : { assignmentName: assignmentName, ...(deleteFilter ? { deleted: deleteFilter } : {}) },
                                         include: include
                                     }) as Promise<Array<Exercise>>;
     }

ExpressAPI/src/routes/ExerciseRoutes.ts

@@ -133,7 +133,7 @@ class ExerciseRoutes implements RoutesManager {
 
 
     private async checkExerciseLimit(assignment: Assignment, members: Array<Gitlab.UserSchema>): Promise<Array<Gitlab.UserSchema>> {
-        const exercises: Array<Exercise> | undefined = await ExerciseManager.getFromAssignment(assignment.name, { members: true });
+        const exercises: Array<Exercise> | undefined = await ExerciseManager.getFromAssignment(assignment.name, false, { members: true });
         const reachedLimitUsers: Array<Gitlab.UserSchema> = [];
         if ( exercises.length > 0 ) {
             for ( const member of members ) {