more suitable solution & fixes to course withdrawal

vatger · Aug 16, 2023 · 29413f1 · 29413f1
1 parent 11ef549
commit 29413f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/controllers/course/CourseInformationController.ts b/src/controllers/course/CourseInformationController.ts
@@ -104,7 +104,7 @@ async function getCourseTrainingInformationByUUID(request: Request, response: Re
             {
                 association: User.associations.training_sessions,
                 through: {
-                    as: 'single_user_through',
+                    as: "training_session_belongs_to_users",
                     attributes: ["passed", "log_id"],
                     where: {
                         user_id: user.id,

diff --git a/src/controllers/training-request/TrainingRequestAdminController.ts b/src/controllers/training-request/TrainingRequestAdminController.ts
@@ -67,17 +67,17 @@ async function getPlanned(request: Request, response: Response) {
         where: {
             [Op.or]: {
                 mentor_id: user.id,
-                cpt_examiner_id: user.id
+                cpt_examiner_id: user.id,
             },
         },
         include: [
             TrainingSession.associations.course,
             TrainingSession.associations.training_type,
             {
                 association: TrainingSession.associations.training_session_belongs_to_users,
-                attributes: ['passed']
-            }
-        ]
+                attributes: ["passed"],
+            },
+        ],
     });
 
     /*
@@ -98,7 +98,7 @@ async function getPlanned(request: Request, response: Response) {
         }
 
         return hasOneNonPassed;
-    })
+    });
 
     response.send(trainingSession);
 }

diff --git a/src/controllers/training-session/TrainingSessionController.ts b/src/controllers/training-session/TrainingSessionController.ts
@@ -47,7 +47,17 @@ async function getByUUID(request: Request, response: Response) {
         return;
     }
 
-    response.send(session);
+    const requestingUserPassed = await TrainingSessionBelongsToUsers.findOne({
+        where: {
+            user_id: user.id,
+            training_session_id: session.id,
+        },
+    });
+
+    response.send({
+        ...session.toJSON(),
+        user_passed: requestingUserPassed == null ? null : requestingUserPassed.passed,
+    });
 }
 
 async function withdrawFromSessionByUUID(request: Request, response: Response) {