From 7ee71a80c7208c4bece92fbaf46f6e95bc51a774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikolas=20G=C3=B6rlitz?= <git@ngoerlitz.de>
Date: Tue, 21 May 2024 00:46:02 +0200
Subject: [PATCH] Fix user course progress log links

---
 .../UserCourseProgressAdministrationController.ts     |  4 ++--
 .../models/extensions/TrainingSessionExtensions.ts    | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/backend/src/controllers/user-course-progress/UserCourseProgressAdministrationController.ts b/backend/src/controllers/user-course-progress/UserCourseProgressAdministrationController.ts
index fda52a8..ceb73ea 100644
--- a/backend/src/controllers/user-course-progress/UserCourseProgressAdministrationController.ts
+++ b/backend/src/controllers/user-course-progress/UserCourseProgressAdministrationController.ts
@@ -79,7 +79,7 @@ async function getInformation(request: Request, response: Response, next: NextFu
                 },
                 {
                     association: User.associations.training_sessions,
-                    attributes: ["uuid", "completed", "date"],
+                    attributes: ["id", "uuid", "completed", "date"],
                     where: {
                         course_id: course_id,
                     },
@@ -101,7 +101,7 @@ async function getInformation(request: Request, response: Response, next: NextFu
                     association: User.associations.training_logs,
                     attributes: ["uuid"],
                     through: {
-                        attributes: ["id", "user_id", "passed"],
+                        attributes: ["id", "training_session_id", "user_id", "passed"],
                     },
                 },
             ],
diff --git a/backend/src/models/extensions/TrainingSessionExtensions.ts b/backend/src/models/extensions/TrainingSessionExtensions.ts
index 5d908fe..b24ce09 100644
--- a/backend/src/models/extensions/TrainingSessionExtensions.ts
+++ b/backend/src/models/extensions/TrainingSessionExtensions.ts
@@ -32,6 +32,8 @@ function userCanCreateLogs(this: TrainingSession, user: User): boolean {
  * (for passing the training on)
  */
 async function getAvailableMentorGroups(this: TrainingSession): Promise<MentorGroup[]> {
+    // TODO: Test if we can limit the attributes, without breaking the includes.
+
     const trainingSession = await TrainingSession.findOne({
         where: {
             uuid: this.uuid,
@@ -39,21 +41,12 @@ async function getAvailableMentorGroups(this: TrainingSession): Promise<MentorGr
         include: [
             {
                 association: TrainingSession.associations.course,
-                through: {
-                    attributes: [],
-                },
                 include: [
                     {
                         association: Course.associations.mentor_groups,
-                        through: {
-                            attributes: [],
-                        },
                         include: [
                             {
                                 association: MentorGroup.associations.users,
-                                through: {
-                                    attributes: [],
-                                },
                             },
                         ],
                     },