From f6d9cc9b63ae37f9b79dbaf977822d8bb1bd545d Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Fri, 15 Mar 2024 13:45:02 +0100
Subject: [PATCH] chore: remove getCircleTitleById

---
 .../learningMentor/mentor/MentorOverviewPage.vue     |  4 ++--
 .../mentor/MentorPraxisAssignmentPage.vue            |  4 +---
 .../MentorSelfEvaluationFeedbackAssignmentPage.vue   |  4 +---
 client/src/services/learningMentees.ts               | 12 ++----------
 .../learning_mentor/content/praxis_assignment.py     |  8 ++++----
 .../content/self_evaluation_feedback.py              |  9 +++++----
 server/vbv_lernwelt/learning_mentor/entities.py      |  1 +
 server/vbv_lernwelt/learning_mentor/serializers.py   |  1 +
 .../learning_mentor/tests/test_assignments.py        |  1 +
 9 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/client/src/pages/learningMentor/mentor/MentorOverviewPage.vue b/client/src/pages/learningMentor/mentor/MentorOverviewPage.vue
index c6241587..88ce3616 100644
--- a/client/src/pages/learningMentor/mentor/MentorOverviewPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorOverviewPage.vue
@@ -76,7 +76,7 @@ const filteredAssignments: Ref<Assignment[]> = computed(() => {
         <template v-for="item in filteredAssignments" :key="item.id">
           <PraxisAssignmentItem
             v-if="item.type === 'praxis_assignment'"
-            :circle-title="learningMentees.getCircleTitleById(item.circle_id)"
+            :circle-title="item.circle_name"
             :pending-tasks="item.pending_evaluations"
             :task-link="{
               name: 'learningMentorPraxisAssignments',
@@ -86,7 +86,7 @@ const filteredAssignments: Ref<Assignment[]> = computed(() => {
           />
           <SelfAssignmentFeedbackAssignmentItem
             v-else-if="item.type === 'self_evaluation_feedback'"
-            :circle-title="learningMentees.getCircleTitleById(item.circle_id)"
+            :circle-title="item.circle_name"
             :pending-tasks="item.pending_evaluations"
             :task-link="{
               name: 'learningMentorSelfEvaluationFeedbackAssignments',
diff --git a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
index 76437a90..0bdafbe8 100644
--- a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
@@ -30,9 +30,7 @@ onMounted(() => {
   <div v-if="praxisAssignment">
     <div class="p-6">
       <h2 class="mb-2">{{ $t("a.Praxisauftrag") }}: {{ praxisAssignment.title }}</h2>
-      <span class="text-gray-800">
-        Circle «{{ learningMentees.getCircleTitleById(praxisAssignment.circle_id) }}»
-      </span>
+      <span class="text-gray-800">Circle «{{ praxisAssignment.circle_name }}»</span>
       <template v-if="praxisAssignment.pending_evaluations > 0">
         <div class="flex flex-row items-center space-x-2 pt-4">
           <div
diff --git a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
index e1b9af25..edc5a457 100644
--- a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
@@ -33,9 +33,7 @@ const getParticipantById = (id: string): Participant | null => {
         {{ $t("a.Selbsteinschätzung") }}: {{ selfEvaluationFeedback.title }}
       </h2>
       <span class="text-gray-800">
-        Circle «{{
-          learningMentees.getCircleTitleById(selfEvaluationFeedback.circle_id)
-        }}»
+        Circle «{{ selfEvaluationFeedback.circle_name }}»
       </span>
       <template v-if="selfEvaluationFeedback.pending_evaluations > 0">
         <div class="flex flex-row items-center space-x-2 pt-4">
diff --git a/client/src/services/learningMentees.ts b/client/src/services/learningMentees.ts
index 85285c8c..21fd5d8a 100644
--- a/client/src/services/learningMentees.ts
+++ b/client/src/services/learningMentees.ts
@@ -34,12 +34,13 @@ export interface Assignment {
   id: string;
   title: string;
   circle_id: string;
+  circle_name: string;
   pending_evaluations: number;
   completions: Completion[];
   type: string;
 }
 
-interface Summary {
+export interface Summary {
   participants: Participant[];
   circles: Circle[];
   assignments: Assignment[];
@@ -52,14 +53,6 @@ export const useLearningMentees = (
   const summary: Ref<Summary | null> = ref(null);
   const error = ref(null);
 
-  const getCircleTitleById = (id: string): string => {
-    if (summary.value?.circles) {
-      const circle = summary.value.circles.find((circle) => String(circle.id) === id);
-      return circle ? circle.title : "";
-    }
-    return "";
-  };
-
   const getAssignmentById = (id: string): Assignment | null => {
     if (summary.value?.assignments) {
       const found = summary.value.assignments.find(
@@ -92,7 +85,6 @@ export const useLearningMentees = (
     isLoading,
     summary,
     error,
-    getCircleTitleById,
     fetchData,
     getAssignmentById,
   };
diff --git a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
index 3505cec2..7eab32c7 100644
--- a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
+++ b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
@@ -110,19 +110,19 @@ def get_praxis_assignments(
             ]
         )
 
-        circle_id = learning_content.get_circle().id
+        circle = learning_content.get_circle()
+        circle_ids.add(circle.id)
 
         records.append(
             MentorAssignmentStatus(
                 id=course_session_assignment.id,
                 title=learning_content.content_assignment.title,
-                circle_id=circle_id,
+                circle_id=circle.id,
+                circle_name=circle.title,
                 pending_evaluations=submitted_count,
                 completions=completions,
                 type=MentorAssignmentStatusType.PRAXIS_ASSIGNMENT,
             )
         )
 
-        circle_ids.add(circle_id)
-
     return records, circle_ids
diff --git a/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py b/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py
index b57c9e59..959f6f41 100644
--- a/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py
+++ b/server/vbv_lernwelt/learning_mentor/content/self_evaluation_feedback.py
@@ -64,9 +64,6 @@ def get_self_feedback_evaluation(
             feedback_provider_user=evaluation_user,
         )
 
-        circle_id = learning_unit.get_circle().id
-        circle_ids.add(circle_id)
-
         pending_evaluations = len([f for f in feedbacks if not f.feedback_submitted])
 
         completions = [
@@ -90,11 +87,15 @@ def get_self_feedback_evaluation(
             participants=participants,
         )
 
+        circle = learning_unit.get_circle()
+        circle_ids.add(circle.id)
+
         records.append(
             MentorAssignmentStatus(
                 id=learning_unit.id,
                 title=learning_unit.title,
-                circle_id=circle_id,
+                circle_id=circle.id,
+                circle_name=circle.title,
                 pending_evaluations=pending_evaluations,
                 completions=completions,
                 type=MentorAssignmentStatusType.SELF_EVALUATION_FEEDBACK,
diff --git a/server/vbv_lernwelt/learning_mentor/entities.py b/server/vbv_lernwelt/learning_mentor/entities.py
index d0a93152..8c040824 100644
--- a/server/vbv_lernwelt/learning_mentor/entities.py
+++ b/server/vbv_lernwelt/learning_mentor/entities.py
@@ -27,6 +27,7 @@ class MentorAssignmentStatus:
     id: str
     title: str
     circle_id: str
+    circle_name: str
     pending_evaluations: int
     completions: List[MentorAssignmentCompletion]
     type: MentorAssignmentStatusType
diff --git a/server/vbv_lernwelt/learning_mentor/serializers.py b/server/vbv_lernwelt/learning_mentor/serializers.py
index 8c079cbe..a644d3cd 100644
--- a/server/vbv_lernwelt/learning_mentor/serializers.py
+++ b/server/vbv_lernwelt/learning_mentor/serializers.py
@@ -19,6 +19,7 @@ class MentorAssignmentStatusSerializer(serializers.Serializer):
     id = serializers.CharField()
     title = serializers.CharField()
     circle_id = serializers.CharField()
+    circle_name = serializers.CharField()
     pending_evaluations = serializers.IntegerField()
     completions = MentorAssignmentCompletionSerializer(many=True)
     type = serializers.ReadOnlyField()
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
index 9c765412..c8b9340e 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
@@ -108,5 +108,6 @@ class AttendanceServicesTestCase(TestCase):
         assignment = assignments[0]
         self.assertEqual(assignment.pending_evaluations, 1)
         self.assertEqual(assignment.title, "Dummy Assignment (PRAXIS_ASSIGNMENT)")
+        self.assertEqual(assignment.circle_name, "Circle")
         self.assertEqual(assignment.circle_id, self.circle.id)
         self.assertEqual(list(circle_ids)[0], self.circle.id)