From a3e16dc107b2a6979e9ae240913ce89dae921937 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 10 Oct 2023 15:36:56 +0200
Subject: [PATCH] Fix problems

---
 .../components/header/MainNavigationBar.vue   |  7 ++-
 client/src/components/header/MobileMenu.vue   |  3 +-
 client/src/pages/DashboardPage.vue            |  4 +-
 .../EvaluationContainer.vue                   |  4 +-
 .../assignmentsPage/AssignmentDetails.vue     |  4 +-
 .../assignmentsPage/AssignmentsPage.vue       |  2 +-
 .../AttendanceCheckPage.vue                   |  8 +--
 .../cockpitPage/SubmissionsOverview.vue       |  2 +-
 .../blocks/AttendanceCourseBlock.vue          |  2 +-
 .../blocks/EdoniqTestBlock.vue                |  2 +-
 client/src/stores/competence.ts               |  4 +-
 client/src/stores/courseSessions.ts           |  4 +-
 client/src/utils/utils.ts                     |  6 ++-
 cypress/e2e/navigation.cy.js                  | 51 +++++++++++++------
 cypress/e2e/preview.cy.js                     | 11 ++--
 server/vbv_lernwelt/assignment/views.py       |  8 ++-
 server/vbv_lernwelt/core/serializers.py       |  2 +-
 server/vbv_lernwelt/course/models.py          | 15 ------
 .../course/tests/test_completion_api.py       |  6 +--
 .../course/tests/test_course_session_api.py   |  4 +-
 server/vbv_lernwelt/course/views.py           | 16 ------
 21 files changed, 84 insertions(+), 81 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 375ca904..836f8f40 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -16,6 +16,7 @@ import { computed, onMounted, reactive } from "vue";
 import { useTranslation } from "i18next-vue";
 import CoursePreviewBar from "@/components/header/CoursePreviewBar.vue";
 import {
+  getCockpitUrl,
   getCompetenceNaviUrl,
   getLearningPathUrl,
   getMediaCenterUrl,
@@ -135,7 +136,11 @@ onMounted(() => {
                   <template v-if="courseSessionsStore.currentCourseSessionHasCockpit">
                     <router-link
                       data-cy="navigation-cockpit-link"
-                      :to="`${courseSessionsStore.currentCourseSession.course.slug}/cockpit`"
+                      :to="
+                        getCockpitUrl(
+                          courseSessionsStore.currentCourseSession.course.slug
+                        )
+                      "
                       class="nav-item"
                       :class="{ 'nav-item--active': inCockpit() }"
                     >
diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index c14d4735..c2424be2 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -5,6 +5,7 @@ import type { UserState } from "@/stores/user";
 import type { CourseSession } from "@/types";
 import { useRouter } from "vue-router";
 import {
+  getCockpitUrl,
   getCompetenceNaviUrl,
   getLearningPathUrl,
   getMediaCenterUrl,
@@ -64,7 +65,7 @@ const courseSessionsStore = useCourseSessionsStore();
                 <li class="mb-6">
                   <button
                     data-cy="navigation-mobile-cockpit-link"
-                    @click="clickLink(`${courseSession.course.slug}/cockpit`)"
+                    @click="clickLink(getCockpitUrl(courseSession.course.slug))"
                   >
                     {{ $t("cockpit.title") }}
                   </button>
diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue
index 9098f5e7..535246bc 100644
--- a/client/src/pages/DashboardPage.vue
+++ b/client/src/pages/DashboardPage.vue
@@ -6,7 +6,7 @@ import { useUserStore } from "@/stores/user";
 import type { CourseSession } from "@/types";
 import log from "loglevel";
 import { computed, onMounted } from "vue";
-import { getLearningPathUrl } from "@/utils/utils";
+import { getCockpitUrl, getLearningPathUrl } from "@/utils/utils";
 
 log.debug("DashboardPage created");
 
@@ -21,7 +21,7 @@ const allDueDates = courseSessionsStore.allDueDates();
 const getNextStepLink = (courseSession: CourseSession) => {
   return computed(() => {
     if (courseSessionsStore.hasCockpit(courseSession)) {
-      return `${courseSession.course.slug}/cockpit`;
+      return getCockpitUrl(courseSession.course.slug);
     }
     return getLearningPathUrl(courseSession.course.slug);
   });
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 80ccdc3d..ed2b47a8 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -61,9 +61,7 @@ function editTask(task: AssignmentEvaluationTask) {
 const courseSessionDetailResult = useCourseSessionDetailQuery();
 
 const assignmentDetail = computed(() => {
-  return courseSessionDetailResult.findAssignmentByAssignmentId(
-    props.assignment.id.toString()
-  );
+  return courseSessionDetailResult.findAssignmentByAssignmentId(props.assignment.id);
 });
 
 const dueDate = computed(() =>
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index d4ec65c2..c929761c 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -33,9 +33,7 @@ const state = reactive({
 });
 
 const assignmentDetail = computed(() => {
-  return courseSessionDetailResult.findAssignment(
-    props.learningContentAssignment.id.toString()
-  );
+  return courseSessionDetailResult.findAssignment(props.learningContentAssignment.id);
 });
 
 onMounted(async () => {
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
index e94a17d5..6dd4cb1e 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
@@ -25,7 +25,7 @@ onMounted(async () => {
 const learningContentAssignment = computed(() => {
   return calcLearningContentAssignments(
     learningPathStore.learningPathForUser(courseSession.value.course.slug, userStore.id)
-  ).filter((lc) => lc.id.toString() === props.assignmentId)[0];
+  ).filter((lc) => lc.id === props.assignmentId)[0];
 });
 </script>
 
diff --git a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
index 38d7eca2..d6ad6461 100644
--- a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
+++ b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
@@ -101,7 +101,7 @@ const loadAttendanceData = async () => {
     res.data?.course_session_attendance_course?.attendance_user_list ?? [];
   for (const user of attendanceUserList) {
     if (!user) continue;
-    state.userPresence.set(user.user_id.toString(), user.status === "PRESENT");
+    state.userPresence.set(user.user_id, user.status === "PRESENT");
   }
   if (attendanceUserList.length !== 0) {
     state.attendanceSaved = true;
@@ -194,12 +194,12 @@ watch(
                   :disabled="state.attendanceSaved"
                   :checkbox-item="{
                   value: true,
-                  checked: state.userPresence.get(csu.user_id.toString()) as boolean,
+                  checked: state.userPresence.get(csu.user_id) as boolean,
                 }"
                   @toggle="
                     state.userPresence.set(
-                      csu.user_id.toString(),
-                      !state.userPresence.get(csu.user_id.toString())
+                      csu.user_id,
+                      !state.userPresence.get(csu.user_id)
                     )
                   "
                 ></ItCheckbox>
diff --git a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
index d9965814..4dcd86fe 100644
--- a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
+++ b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
@@ -47,7 +47,7 @@ const submittables = computed(() => {
     return [];
   }
   return learningPath.circles
-    .filter((circle) => props.selectedCircle.toString() == circle.id.toString())
+    .filter((circle) => props.selectedCircle == circle.id)
     .flatMap((circle) => {
       const learningContents = circle.flatLearningContents.filter(
         (lc) =>
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/AttendanceCourseBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/AttendanceCourseBlock.vue
index 6b1ad5da..1b960955 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/AttendanceCourseBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/AttendanceCourseBlock.vue
@@ -12,7 +12,7 @@ const props = defineProps<{
 const courseSessionDetailResult = useCourseSessionDetailQuery();
 
 const courseSessionAttendanceCourse = computed(() => {
-  return courseSessionDetailResult.findAttendanceCourse(props.content.id.toString());
+  return courseSessionDetailResult.findAttendanceCourse(props.content.id);
 });
 </script>
 
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index a7b428e4..bebace92 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -26,7 +26,7 @@ const courseSession = useCurrentCourseSession();
 const courseSessionDetailResult = useCourseSessionDetailQuery();
 
 const courseSessionEdoniqTest = computed(() => {
-  return courseSessionDetailResult.findEdoniqTest(props.content.id.toString());
+  return courseSessionDetailResult.findEdoniqTest(props.content.id);
 });
 
 const queryResult = useQuery({
diff --git a/client/src/stores/competence.ts b/client/src/stores/competence.ts
index f4d229f4..7a99414c 100644
--- a/client/src/stores/competence.ts
+++ b/client/src/stores/competence.ts
@@ -77,9 +77,7 @@ export const useCompetenceStore = defineStore({
           );
 
           if (circleId) {
-            criteria = criteria.filter(
-              (c) => circleId.toString() === c.circle.id.toString()
-            );
+            criteria = criteria.filter((c) => circleId === c.circle.id);
           }
 
           return criteria;
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index 78f127e9..5fb60b13 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -86,13 +86,13 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
 
   function getCourseSessionById(courseSessionId: string) {
     return allCourseSessions.value.find((cs) => {
-      return courseSessionId.toString() === cs.id.toString();
+      return courseSessionId === cs.id;
     });
   }
 
   function switchCourseSessionById(courseSessionId: string) {
     const courseSession = allCourseSessions.value.find((cs) => {
-      return courseSessionId.toString() === cs.id.toString();
+      return courseSessionId === cs.id;
     });
     if (courseSession) {
       _switchCourseSession(courseSession);
diff --git a/client/src/utils/utils.ts b/client/src/utils/utils.ts
index 700bfe05..eb6fa891 100644
--- a/client/src/utils/utils.ts
+++ b/client/src/utils/utils.ts
@@ -10,7 +10,7 @@ function createCourseUrl(courseSlug: string | undefined, specificSub: string): s
     return "/";
   }
 
-  if (["learn", "media", "competence"].includes(specificSub)) {
+  if (["learn", "media", "competence", "cockpit"].includes(specificSub)) {
     return `/course/${courseSlug}/${specificSub}`;
   }
   return `/course/${courseSlug}`;
@@ -28,6 +28,10 @@ export function getLearningPathUrl(courseSlug: string | undefined): string {
   return createCourseUrl(courseSlug, "learn");
 }
 
+export function getCockpitUrl(courseSlug: string | undefined): string {
+  return createCourseUrl(courseSlug, "cockpit");
+}
+
 export function getAssignmentTypeTitle(assignmentType: AssignmentType): string {
   const { t } = useTranslation();
 
diff --git a/cypress/e2e/navigation.cy.js b/cypress/e2e/navigation.cy.js
index 67ae3eb6..bf8d2600 100644
--- a/cypress/e2e/navigation.cy.js
+++ b/cypress/e2e/navigation.cy.js
@@ -1,10 +1,16 @@
-import {checkNavigationLink, EXPERT_LOGIN, login, PARTICIPANT_LOGIN, visitCoursePage} from "./helpers";
-
-const openMobileNavigation = () => {
-  cy.get('[data-cy="navigation-mobile-menu-button"]').click();
-}
+import {
+  checkNavigationLink,
+  EXPERT_LOGIN,
+  login,
+  PARTICIPANT_LOGIN,
+  visitCoursePage,
+} from "./helpers";
 
 describe("navigation.cy.js", () => {
+  const openMobileNavigation = () => {
+    cy.get('[data-cy="navigation-mobile-menu-button"]').click();
+  };
+
   beforeEach(() => {
     cy.manageCommand("cypress_reset");
   });
@@ -24,7 +30,9 @@ describe("navigation.cy.js", () => {
         checkNavigationLink("navigation-cockpit-link", "cockpit");
         checkNavigationLink("navigation-preview-link", "learn");
 
-        cy.get('[data-cy="navigation-competence-profile-link"]').should("not.exist");
+        cy.get('[data-cy="navigation-competence-profile-link"]').should(
+          "not.exist"
+        );
         cy.get('[data-cy="navigation-learning-path-link"]').should("not.exist");
       });
     });
@@ -60,10 +68,14 @@ describe("navigation.cy.js", () => {
       it("should have correct expert navigation", () => {
         cy.get('[data-cy="navigation-mobile-cockpit-link"]').should("exist");
         cy.get('[data-cy="navigation-mobile-preview-link"]').should("exist");
-        cy.get('[data-cy="navigation-mobile-competence-profile-link"]').should("not.exist");
-        cy.get('[data-cy="navigation-mobile-learning-path-link"]').should("not.exist");
-      })
-    })
+        cy.get('[data-cy="navigation-mobile-competence-profile-link"]').should(
+          "not.exist"
+        );
+        cy.get('[data-cy="navigation-mobile-learning-path-link"]').should(
+          "not.exist"
+        );
+      });
+    });
 
     describe("Participant", () => {
       beforeEach(() => {
@@ -73,12 +85,19 @@ describe("navigation.cy.js", () => {
       });
 
       it("should have correct navigation", () => {
-        cy.get('[data-cy="navigation-mobile-cockpit-link"]').should("not.exist");
-        cy.get('[data-cy="navigation-mobile-preview-link"]').should("not.exist");
-        cy.get('[data-cy="navigation-mobile-competence-profile-link"]').should("exist");
-        cy.get('[data-cy="navigation-mobile-learning-path-link"]').should("exist");
+        cy.get('[data-cy="navigation-mobile-cockpit-link"]').should(
+          "not.exist"
+        );
+        cy.get('[data-cy="navigation-mobile-preview-link"]').should(
+          "not.exist"
+        );
+        cy.get('[data-cy="navigation-mobile-competence-profile-link"]').should(
+          "exist"
+        );
+        cy.get('[data-cy="navigation-mobile-learning-path-link"]').should(
+          "exist"
+        );
       });
     });
-  })
+  });
 });
-
diff --git a/cypress/e2e/preview.cy.js b/cypress/e2e/preview.cy.js
index e1628f3f..e485eef5 100644
--- a/cypress/e2e/preview.cy.js
+++ b/cypress/e2e/preview.cy.js
@@ -1,9 +1,14 @@
-import {checkNavigationLink, login, PARTICIPANT_LOGIN, visitCoursePage} from "./helpers";
+import {
+  checkNavigationLink,
+  login,
+  PARTICIPANT_LOGIN,
+  visitCoursePage,
+} from "./helpers";
 
 describe("preview.cy.js", () => {
   beforeEach(() => {
     cy.manageCommand("cypress_reset");
-  })
+  });
 
   describe("Expert / Trainer", () => {
     beforeEach(() => {
@@ -41,5 +46,5 @@ describe("preview.cy.js", () => {
       visitCoursePage("competence");
       cy.get('[data-cy="course-preview-bar"]').should("not.exist");
     });
-  })
+  });
 });
diff --git a/server/vbv_lernwelt/assignment/views.py b/server/vbv_lernwelt/assignment/views.py
index 974af663..205c1321 100644
--- a/server/vbv_lernwelt/assignment/views.py
+++ b/server/vbv_lernwelt/assignment/views.py
@@ -24,6 +24,12 @@ def request_assignment_completion_status(request, assignment_id, course_session_
             "evaluation_passed",
             "learning_content_page_id",
         )
-        return Response(status=200, data=qs)
+
+        # Convert the learning_content_page_id to a string
+        data = list(qs)  # Evaluate the queryset
+        for item in data:
+            item["learning_content_page_id"] = str(item["learning_content_page_id"])
+
+        return Response(status=200, data=data)
 
     raise PermissionDenied()
diff --git a/server/vbv_lernwelt/core/serializers.py b/server/vbv_lernwelt/core/serializers.py
index f801321c..76363c88 100644
--- a/server/vbv_lernwelt/core/serializers.py
+++ b/server/vbv_lernwelt/core/serializers.py
@@ -40,4 +40,4 @@ class UserSerializer(serializers.ModelSerializer):
             role=CourseSessionUser.Role.EXPERT, user=obj
         )
 
-        return [csu.course_session.id for csu in qs]
+        return [str(csu.course_session.id) for csu in qs]
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index 1e5cf9f8..a09b5884 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -294,21 +294,6 @@ class CourseSessionUser(models.Model):
         ]
         ordering = ["user__last_name", "user__first_name", "user__email"]
 
-    def to_dict(self):
-        return {
-            "session_id": self.course_session.id,
-            "session_title": self.course_session.title,
-            "user_id": self.user.id,
-            "first_name": self.user.first_name,
-            "last_name": self.user.last_name,
-            "email": self.user.email,
-            "avatar_url": self.user.avatar_url,
-            "role": self.role,
-            "circles": self.expert.all().values(
-                "id", "title", "slug", "translation_key"
-            ),
-        }
-
 
 class CircleDocument(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
diff --git a/server/vbv_lernwelt/course/tests/test_completion_api.py b/server/vbv_lernwelt/course/tests/test_completion_api.py
index 8a81334f..a1a40512 100644
--- a/server/vbv_lernwelt/course/tests/test_completion_api.py
+++ b/server/vbv_lernwelt/course/tests/test_completion_api.py
@@ -48,7 +48,7 @@ class CourseCompletionApiTestCase(APITestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response_json), 1)
-        self.assertEqual(response_json[0]["page_id"], learning_content.id)
+        self.assertEqual(response_json[0]["page_id"], str(learning_content.id))
         self.assertEqual(
             response_json[0]["page_type"], "learnpath.LearningContentPlaceholder"
         )
@@ -67,7 +67,7 @@ class CourseCompletionApiTestCase(APITestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response_json), 1)
-        self.assertEqual(response_json[0]["page_id"], learning_content.id)
+        self.assertEqual(response_json[0]["page_id"], str(learning_content.id))
         self.assertEqual(
             response_json[0]["page_type"], "learnpath.LearningContentPlaceholder"
         )
@@ -86,7 +86,7 @@ class CourseCompletionApiTestCase(APITestCase):
         response_json = response.json()
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response_json), 1)
-        self.assertEqual(response_json[0]["page_id"], learning_content.id)
+        self.assertEqual(response_json[0]["page_id"], str(learning_content.id))
         self.assertEqual(
             response_json[0]["page_type"], "learnpath.LearningContentPlaceholder"
         )
diff --git a/server/vbv_lernwelt/course/tests/test_course_session_api.py b/server/vbv_lernwelt/course/tests/test_course_session_api.py
index 17d3616c..9eaad7dd 100644
--- a/server/vbv_lernwelt/course/tests/test_course_session_api.py
+++ b/server/vbv_lernwelt/course/tests/test_course_session_api.py
@@ -40,7 +40,7 @@ class CourseCompletionApiTestCase(APITestCase):
         self.assertEqual(len(response.json()), 1)
 
         print(json.dumps(response.json(), indent=4))
-        self.assertEqual(response.json()[0]["id"], self.course_session.id)
+        self.assertEqual(response.json()[0]["id"], str(self.course_session.id))
 
     def test_api_superUser_canAccessEveryCourseSession(self):
         self.client.login(username="admin", password="test")
@@ -50,4 +50,4 @@ class CourseCompletionApiTestCase(APITestCase):
         self.assertEqual(len(response.json()), 1)
 
         print(json.dumps(response.json(), indent=4))
-        self.assertEqual(response.json()[0]["id"], self.course_session.id)
+        self.assertEqual(response.json()[0]["id"], str(self.course_session.id))
diff --git a/server/vbv_lernwelt/course/views.py b/server/vbv_lernwelt/course/views.py
index 7101a72a..3fce8b6b 100644
--- a/server/vbv_lernwelt/course/views.py
+++ b/server/vbv_lernwelt/course/views.py
@@ -147,22 +147,6 @@ def get_course_sessions(request):
         return Response({"error": str(e)}, status=404)
 
 
-@api_view(["GET"])
-def get_course_session_users(request, course_session_id):
-    try:
-        qs = CourseSessionUser.objects.filter(
-            course_session_id=course_session_id
-        ).distinct()
-
-        user_data = [csu.to_dict() for csu in qs]
-        return Response(status=200, data=user_data)
-    except PermissionDenied as e:
-        raise e
-    except Exception as e:
-        logger.error(e)
-        return Response({"error": str(e)}, status=404)
-
-
 @api_view(["POST"])
 def document_upload_start(request):
     serializer = DocumentUploadStartInputSerializer(data=request.data)