fix: unify semester-related schemas across hours-summary and semester-history endpoints

Author: SanyaLikeIT

adminpage/api_v2/crud/crud_attendance.py

@@ -75,7 +75,7 @@ def get_detailed_hours_and_self(student, semester: Semester):
     Retrieves statistics of hours in one semester
     """
     att = (Attendance.objects
-           .filter(training__group__semester=semester, student=student.student)
+           .filter(training__group__semester=semester, student=student)
            .annotate(
                group=F("training__group__name"),
                group_id=F("training__group_id"),
@@ -90,7 +90,7 @@ def get_detailed_hours_and_self(student, semester: Semester):
 
 
     self = (SelfSportReport.objects
-            .filter(semester=semester, student=student.student, attendance=None)
+            .filter(semester=semester, student=student, attendance=None)
             .annotate(
                 group=Value('Self training', output_field=CharField()),
                 group_id=Value(-1, output_field=IntegerField()),
@@ -102,7 +102,7 @@ def get_detailed_hours_and_self(student, semester: Semester):
             .values('group_id', 'group', 'custom_name', 'timestamp', 'hours', 'approved'))
 
     ref = (Reference.objects
-           .filter(semester=semester, student=student.student, attendance=None)
+           .filter(semester=semester, student=student, attendance=None)
            .annotate(
                group=Value('Medical leave', output_field=CharField()),
                group_id=Value(-1, output_field=IntegerField()),

adminpage/api_v2/serializers/attendance.py

@@ -112,18 +112,13 @@ class SemesterHoursSummarySerializer(serializers.Serializer):
 
 
 class StudentHoursSummarySerializer(serializers.Serializer):
-    # Fields for current semester only (when current_semester_only=true)
     debt = serializers.FloatField(help_text="Current student debt in hours", required=False)
     self_sport_hours = serializers.FloatField(help_text="Number of self sport hours", required=False)
     hours_from_groups = serializers.FloatField(help_text="Number of hours from sport groups", required=False)
     required_hours = serializers.FloatField(help_text="Number of hours required to achieve", required=False)
 
-    # Fields for all semesters (when current_semester_only=false)
     semesters = SemesterHoursSummarySerializer(many=True, help_text="List of semesters with hours info", required=False)
 
-    # Common field
-    current_semester_only = serializers.BooleanField(help_text="Current semester only or all semesters")
-
 
 class GradesCsvRowSerializer(serializers.Serializer):
     student_id = serializers.IntegerField()

adminpage/api_v2/views/attendance.py

@@ -299,8 +299,8 @@ def get_student_hours_summary(request, student_id, **kwargs):
         from api_v2.crud.crud_attendance import get_student_hours_summary
 
         summary = get_student_hours_summary(student_id)
-        #summary.update({"better_than": get_better_than_info(student_id)})
-        return Response(summary)
+        serializer = StudentHoursSummarySerializer(instance=summary)
+        return Response(serializer.data)
     except Student.DoesNotExist:
         return Response(
             {"detail": "Student not found"}, status=status.HTTP_404_NOT_FOUND

adminpage/api_v2/views/profile.py

@@ -60,47 +60,57 @@ def get_user_info(request, **kwargs):
     methods=["GET"],
     tags=["For student"],
     summary="Get student training history",
-    description="Retrieve student's training history for a specific semester, including regular trainings, self-sport activities, results of fitness test, and medical references.",
+    description="Retrieve student's training history for a specific semester, including trainings, self-sport activities, results of fitness tests, and medical references.",
     responses={
-        status.HTTP_200_OK: StudentSpecificSemesterHistorySerializer,
+        status.HTTP_200_OK: SemesterHistoryWithFitnessSerializer,
         status.HTTP_404_NOT_FOUND: training_history404,
     },
 )
 @api_view(["GET"])
 @permission_classes([IsStudent])
 def get_student_specific_semester_history(request, semester_id: int, **kwargs):
     """
-    Get student's trainings per_semester + fitness tests
+    Get student's training history for a specific semester using unified logic.
     """
-    semester = get_object_or_404(Semester, pk=semester_id)
     student: Student = request.user.student
+    semester = get_object_or_404(Semester, pk=semester_id)
 
+    trainings_queryset = get_detailed_hours_and_self(student, semester)
     trainings = []
-    for g in get_detailed_hours_and_self(student, semester):
-        trainings.append(
-            {
-                **g,
-                "group": g["group"]
-                if g.get("group_id", -1) < 0
-                else Group.objects.get(pk=g["group_id"]).to_frontend_name(),
-                "timestamp": timezone.localtime(g["timestamp"]),
-            }
-        )
+    for t in get_detailed_hours_and_self(student, semester):
+        trainings.append({
+            "training_id": t.get("id", -1),
+            "date": t["timestamp"].strftime("%Y-%m-%d"),
+            "time": t["timestamp"].strftime("%H:%M"),
+            "hours": t.get("hours", 0),
+            "group_name": t["group"] if t.get("group_id", -1) < 0 else Group.objects.get(pk=t["group_id"]).to_frontend_name(),
+            "sport_name": t.get("sport_name", "Unknown"),
+            "training_class": t.get("training_class", ""),
+            "custom_name": t.get("custom_name", ""),
+        })
+
 
     fitness_tests = get_student_fitness_results_for_semester_crud(
         student=student,
         semester=semester,
         latest_only=False,
     )
 
-    payload = {
+    semester_payload = {
         "semester_id": semester.id,
         "semester_name": str(semester),
+        "semester_start": semester.start,
+        "semester_end": semester.end,
+        "required_hours": semester.hours,
+        "total_hours": sum(t["hours"] for t in trainings),
         "trainings": trainings,
         "fitness_tests": fitness_tests,
     }
 
-    return Response(StudentSpecificSemesterHistorySerializer(payload).data)
+    serializer = SemesterHistoryWithFitnessSerializer(semester_payload)
+    return Response(serializer.data)
+
+
 
 
 @extend_schema(