Merge branch 'v2.0.0' into main

ExpressAPI/src/types/DatabaseTypes.ts

@@ -3,25 +3,25 @@ import LazyVal    from '../shared/helpers/LazyVal';
 import GitlabUser from '../shared/types/Gitlab/GitlabUser';
 
 
-const userBase = Prisma.validator<Prisma.UserArgs>()({
-                                                         include: { exercices: true }
+const userBase = Prisma.validator<Prisma.UserDefaultArgs>()({
+                                                                include: { exercises: true }
                                                             });
-const enonceBase = Prisma.validator<Prisma.EnonceArgs>()({
+const assignmentBase = Prisma.validator<Prisma.AssignmentDefaultArgs>()({
                                                                             include: {
-                                                                 exercices: true,
+                                                                                exercises: true,
                                                                                 staff    : true
                                                                             }
                                                                         });
-const exerciceBase = Prisma.validator<Prisma.ExerciceArgs>()({
+const exerciseBase = Prisma.validator<Prisma.ExerciseDefaultArgs>()({
                                                                         include: {
-                                                                     enonce : true,
+                                                                            assignment: true,
                                                                             members   : true,
                                                                             results   : true
                                                                         }
                                                                     });
-const resultBase = Prisma.validator<Prisma.ResultArgs>()({
+const resultBase = Prisma.validator<Prisma.ResultDefaultArgs>()({
                                                                     include: {
-                                                                 exercice: true
+                                                                        exercise: true
                                                                     }
                                                                 });
 
@@ -31,6 +31,6 @@ export type User = Omit<Prisma.UserGetPayload<typeof userBase>, 'password'> & {
     isTeachingStaff: boolean
     gitlabProfile: LazyVal<GitlabUser>
 }
-export type Enonce = Prisma.EnonceGetPayload<typeof enonceBase>
-export type Exercice = Prisma.ExerciceGetPayload<typeof exerciceBase>
+export type Assignment = Prisma.AssignmentGetPayload<typeof assignmentBase>
+export type Exercise = Prisma.ExerciseGetPayload<typeof exerciseBase>
 export type Result = Prisma.ResultGetPayload<typeof resultBase>
\ No newline at end of file

ExpressAPI/src/types/SecurityCheckType.ts

 enum SecurityCheckType {
     TEACHING_STAFF          = 'teachingStaff',
-    ENONCE_STAFF        = 'enonceStaff',
-    ENONCE_IS_PUBLISHED = 'enonceIsPublished',
-    EXERCICE_SECRET     = 'exerciceSecret',
+    ASSIGNMENT_STAFF        = 'assignmentStaff',
+    ASSIGNMENT_IS_PUBLISHED = 'assignmentIsPublished',
+    EXERCISE_SECRET         = 'exerciseSecret',
 }
 
 

ExpressAPI/src/types/express/index.d.ts

 import Session                  from '../../controllers/Session';
-import { Enonce, Exercice } from '../DatabaseTypes';
+import { Assignment, Exercise } from '../DatabaseTypes';
 
 // to make the file a module and avoid the TypeScript error
 export {};
@@ -9,7 +9,7 @@ declare global {
         export interface Request {
             session: Session,
             boundParams: {
-                enonce: Enonce | undefined, exercice: Exercice | undefined
+                assignment: Assignment | undefined, exercise: Exercise | undefined
             }
         }
     }