CHANGELOG.md

@@ -17,7 +17,16 @@
 - No modifications / Keep major and minors versions in sync with all parts of the project
 -->
 
-## 5.0.0 (Upcoming)
+## 5.0.1 (2025-02-25)
+
+### 🐛 Bugfix
+- Fix some bugs related to assignments / exercises deletion
+
+### 🔨 Internal / Developers
+- Adminer: Style migration to dracula theme
+
+
+## 5.0.0 (2024-10-21)
 
 ### ✨ Feature
 - Add possibility of self-host the solution

ExpressAPI/assets/OpenAPI/OpenAPI.yaml

 openapi: 3.1.0
 info:
     title: Dojo API
-    version: 5.0.0
+    version: 5.0.1
     description: |
         **Backend API of the Dojo project.**
         

ExpressAPI/package.json

 {
     "name"           : "dojo_backend_api",
     "description"    : "Backend API of the Dojo project",
-    "version"        : "5.0.0",
+    "version"        : "5.0.1",
     "license"        : "AGPLv3",
     "author"         : "Michaël Minelli <dojo@minelli.me>",
     "main"           : "dist/src/app.js",

ExpressAPI/prisma/migrations/20250225160246_exercises_and_assignments_add_creation_date/migration.sql

+/*
+  Warnings:
+
+  - Added the required column `gitlabCreationDate` to the `Assignment` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `gitlabCreationDate` to the `Exercise` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `Assignment` ADD COLUMN `gitlabCreationDate` DATETIME(3) NULL AFTER `gitlabCreationInfo`;
+UPDATE `Assignment` SET `gitlabCreationDate` = `gitlabLastInfoDate`;
+ALTER TABLE `Assignment` MODIFY COLUMN `gitlabCreationDate` DATETIME(3) NOT NULL AFTER `gitlabCreationInfo`;
+
+-- AlterTable
+ALTER TABLE `Exercise` ADD COLUMN `gitlabCreationDate` DATETIME(3) NULL DEFAULT NULL AFTER `gitlabCreationInfo`;
+UPDATE `Exercise` SET `gitlabCreationDate` = `gitlabLastInfoDate`;
+ALTER TABLE `Exercise` MODIFY COLUMN `gitlabCreationDate` DATETIME(3) NOT NULL AFTER `gitlabCreationInfo`;

ExpressAPI/prisma/schema.prisma

@@ -38,6 +38,7 @@ model Assignment {
     gitlabId           Int
     gitlabLink         String
     gitlabCreationInfo Json     @db.Json
+    gitlabCreationDate DateTime
     gitlabLastInfo     Json     @db.Json
     gitlabLastInfoDate DateTime
     published          Boolean  @default(false)
@@ -55,6 +56,7 @@ model Exercise {
     gitlabId           Int
     gitlabLink         String
     gitlabCreationInfo Json     @db.Json
+    gitlabCreationDate DateTime
     gitlabLastInfo     Json     @db.Json
     gitlabLastInfoDate DateTime
     deleted            Boolean  @default(false)

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 !== undefined ? { deleted: deleteFilter } : {}) },
                                         include: include
                                     }) as Promise<Array<Exercise>>;
     }

ExpressAPI/src/managers/GitlabManager.ts

@@ -133,6 +133,17 @@ class GitlabManager extends SharedGitlabManager {
         }
     }
 
+    async renameRepository(repoId: number, newName: string): Promise<ProjectSchema> {
+        try {
+            return await this.api.Projects.edit(repoId, {
+                name: newName
+            });
+        } catch ( e ) {
+            logger.error(JSON.stringify(e));
+            return Promise.reject(e);
+        }
+    }
+
     async moveRepository(repoId: number, newRepoId: number): Promise<ProjectSchema> {
         try {
             return await this.api.Projects.transfer(repoId, newRepoId);

ExpressAPI/src/routes/AssignmentRoutes.ts

@@ -107,7 +107,8 @@ class AssignmentRoutes implements RoutesManager {
                                                                    some: {
                                                                        id: req.session.profile.id
                                                                    }
-                                                               }
+                                                               },
+                                                               deleted       : false
                                                            },
                                                            include: {
                                                                assignment: false,
@@ -174,6 +175,7 @@ class AssignmentRoutes implements RoutesManager {
                                                                                                        gitlabId          : repository.id,
                                                                                                        gitlabLink        : repository.web_url,
                                                                                                        gitlabCreationInfo: repository as unknown as Prisma.JsonObject,
+                                                                                                       gitlabCreationDate: new Date(),
                                                                                                        gitlabLastInfo    : repository as unknown as Prisma.JsonObject,
                                                                                                        gitlabLastInfoDate: new Date(),
                                                                                                        staff             : {

ExpressAPI/src/routes/ExerciseRoutes.ts

@@ -24,6 +24,7 @@ import GlobalHelper                from '../helpers/GlobalHelper.js';
 import { IFileDirStat }            from '../shared/helpers/recursiveFilesStats/RecursiveFilesStats.js';
 import ExerciseManager             from '../managers/ExerciseManager.js';
 import * as Gitlab                 from '@gitbeaker/rest';
+import { ProjectSchema }           from '@gitbeaker/rest';
 import GitlabTreeFileType          from '../shared/types/Gitlab/GitlabTreeFileType.js';
 import { GitbeakerRequestError }   from '@gitbeaker/requester-utils';
 
@@ -110,11 +111,19 @@ class ExerciseRoutes implements RoutesManager {
             }
         }
 
-        await GitlabManager.moveRepository(repoId, Config.gitlab.group.deletedExercises);
+        // We rename (with unique str added) the repository before moving it because of potential name conflicts
+        const newName: string = `${ req.boundParams.exercise!.name }_${ uuidv4() }`;
+        await GitlabManager.renameRepository(repoId, newName);
+        const repository: ProjectSchema = await GitlabManager.moveRepository(repoId, Config.gitlab.group.deletedExercises);
 
         await db.exercise.update({
                                      where: { id: req.boundParams.exercise!.id },
-                                     data : { deleted: true }
+                                     data : {
+                                         name              : newName,
+                                         gitlabLastInfo    : repository as unknown as Prisma.JsonObject,
+                                         gitlabLastInfoDate: new Date(),
+                                         deleted           : true
+                                     }
                                  });
 
         return req.session.sendResponse(res, StatusCodes.OK);
@@ -133,7 +142,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 ) {
@@ -225,6 +234,7 @@ class ExerciseRoutes implements RoutesManager {
                                                                                                  gitlabId          : repository.id,
                                                                                                  gitlabLink        : repository.web_url,
                                                                                                  gitlabCreationInfo: repository as unknown as Prisma.JsonObject,
+                                                                                                 gitlabCreationDate: new Date(),
                                                                                                  gitlabLastInfo    : repository as unknown as Prisma.JsonObject,
                                                                                                  gitlabLastInfoDate: new Date(),
                                                                                                  members           : {

shared @ 3605016c

-Subproject commit de8af98ab1085f83a5756e797812b400298689dd
+Subproject commit 3605016ce0adf45698057bbe0a12bb658fe6bda0

Resources/DevInfra/docker-compose.yml

@@ -22,6 +22,7 @@ services:
             - ADMINER_DEFAULT_SERVER=dojo-database
             - TZ=Europe/Zurich
             - ADMINER_PLUGINS=dump-alter dump-bz2 dump-date dump-json dump-xml dump-zip edit-foreign edit-textarea foreign-system json-column sql-log struct-comments tables-filter
+            - ADMINER_DESIGN=dracula
         networks:
             dojo-network:
                 aliases: