fix: issues #384(reuse sugggest schema)) and #386(align medical)

Author: SanyaLikeIT

adminpage/api_v2/crud/crud_groups.py

@@ -107,103 +107,6 @@ def get_free_places_for_sport(sport_id: int) -> int:
     return total_free
 
 
-def get_clubs_as_trainings(student: Optional[Student] = None):
-    """
-    Retrieve all upcoming club trainings in the same format as weekly schedule
-    @param student - if student passed, filter applicable trainings
-    @return list of training objects with participants info
-    """
-    from sport.models import TrainingCheckIn
-    from django.db.models import Prefetch
-    
-    # Get current time to filter out past trainings
-    current_time = timezone.now()
-    
-    # Get groups for current semester that are clubs
-    groups_query = Group.objects.filter(
-        semester__pk=get_current_semester_crud().pk,
-        is_club=True  # Only clubs
-    )
-    
-    if student:
-        groups_query = groups_query.filter(
-            Q(allowed_medical_groups=student.medical_group)
-            | Q(allowed_students=student.pk)
-        ).exclude(banned_students=student.pk)
-    
-    # Get upcoming trainings for these club groups
-    group_prefetch = Prefetch("group", queryset=Group.objects.select_related("sport").prefetch_related(
-        "allowed_medical_groups"))
-    
-    trainings = Training.objects.filter(
-        group__in=groups_query,
-        start__gt=current_time,  # Only future trainings
-        group__sport__isnull=False  # Exclude special groups
-    ).select_related(
-        'group', 'group__sport', 'training_class'
-    ).prefetch_related(
-        group_prefetch, "checkins"
-    ).order_by('start')
-    
-    # Get student check-ins if student provided
-    student_checkins_map = {}
-    if student:
-        student_checkins = TrainingCheckIn.objects.filter(
-            student=student, 
-            training__in=trainings
-        ).select_related("training")
-        student_checkins_map = {checkin.training_id: checkin for checkin in student_checkins}
-    
-    trainings_data = []
-    
-    for training in trainings:
-        # Calculate can_check_in
-        can_check_in_result = False
-        checked_in = False
-        
-        if student:
-            can_check_in_result = can_check_in(student, training)
-            checked_in = training.id in student_checkins_map
-        
-        # Calculate participants info (similar to weekly schedule)
-        from api_v2.crud.crud_training import get_students_grades
-        participants = get_students_grades(training.id)
-        
-        participants_info = {
-            'total_checked_in': len([p for p in participants if p.get('hours', 0) >= 0]),
-            'students': [
-                {
-                    'id': p['student_id'],
-                    'name': p['full_name'],
-                    'email': p['email'],
-                    'medical_group': p['med_group'],
-                    'hours': p.get('hours', 0),
-                    'attended': p.get('hours', 0) > 0
-                }
-                for p in participants
-            ]
-        }
-        
-        training_dict = {
-            "id": training.id,
-            "start": training.start,
-            "end": training.end,
-            "group_id": training.group.id,
-            "group_name": training.group.to_frontend_name(),
-            "training_class": training.training_class.name if training.training_class else None,
-            "group_accredited": training.group.accredited,
-            "can_grade": False,  # Students can't grade
-            "can_check_in": can_check_in_result,
-            "checked_in": checked_in,
-            "capacity": training.group.capacity,
-            "available_spots": training.group.capacity - participants_info['total_checked_in'],
-            "participants": participants_info
-        }
-        trainings_data.append(training_dict)
-    
-    return trainings_data
-
-
 def get_sports_with_groups(student: Optional[Student] = None):
     """
     Retrieves all sports with their groups and detailed information

adminpage/api_v2/crud/crud_training.py

@@ -262,37 +262,43 @@ def get_students_grades(training_id: int):
     @return list of student grades
     """
     with connection.cursor() as cursor:
-        cursor.execute('SELECT '
-                       'd.id AS student_id, '
-                       'd.first_name AS first_name, '
-                       'd.last_name AS last_name, '
-                       'd.email AS email, '
-                       'a.hours AS hours, '
-                       'm.name AS med_group, '
-                       'concat(d.first_name, \' \', d.last_name) as full_name '
-                       'FROM training t, attendance a, auth_user d, student s '
-                       'LEFT JOIN medical_group m ON m.id = s.medical_group_id '
-                       'WHERE s.user_id = a.student_id '
-                       'AND d.id = a.student_id '
-                       'AND a.training_id = %(training_id)s '
-                       'AND t.id = %(training_id)s '
-                       'UNION DISTINCT '
-                       'SELECT '
-                       'd.id AS student_id, '
-                       'd.first_name AS first_name, '
-                       'd.last_name AS last_name, '
-                       'd.email AS email, '
-                       'COALESCE(a.hours, 0) AS hours, '
-                       'm.name AS med_group, '
-                       'concat(d.first_name, \' \', d.last_name) as full_name '
-                       'FROM training t, sport_trainingcheckin e, auth_user d, student s '
-                       'LEFT JOIN attendance a ON a.student_id = s.user_id AND a.training_id = %(training_id)s '
-                       'LEFT JOIN medical_group m ON m.id = s.medical_group_id '
-                       'WHERE s.user_id = e.student_id '
-                       'AND d.id = e.student_id '
-                       'AND t.id = %(training_id)s '
-                       'AND t.id = e.training_id ', {"training_id": training_id})
-        return dictfetchall(cursor)
+        cursor.execute("""
+            SELECT 
+                u.id AS student_id,
+                u.first_name,
+                u.last_name,
+                u.email,
+                COALESCE(a.hours, 0) AS hours,
+                m.id AS med_group_id,
+                m.name AS med_group_name,
+                m.description AS med_group_description
+            FROM auth_user u
+            JOIN student s ON s.user_id = u.id
+            LEFT JOIN medical_group m ON m.id = s.medical_group_id
+            LEFT JOIN attendance a 
+                ON a.student_id = u.id AND a.training_id = %(training_id)s
+            WHERE u.id IN (
+                SELECT student_id FROM attendance WHERE training_id = %(training_id)s
+                UNION
+                SELECT student_id FROM sport_trainingcheckin WHERE training_id = %(training_id)s
+            )
+        """, {"training_id": training_id})
+
+        rows = dictfetchall(cursor)
+
+        for row in rows:
+            row["id"] = row.pop("student_id")
+            if row.get("med_group_id") is not None:
+                row["medical_group"] = {
+                    "id": row.pop("med_group_id"),
+                    "name": row.pop("med_group_name"),
+                    "description": row.pop("med_group_description"),
+                }
+            else:
+                row["medical_group"] = None
+
+        return rows
+
 
 
 def get_student_last_attended_dates(group_id: int):

adminpage/api_v2/serializers/reference.py

@@ -14,13 +14,13 @@ class Meta:
         fields = ['image', 'start', 'end', 'student_comment']
 
 
-class ReferenceUploadResponseSerializer(serializers.Serializer):
-    message = serializers.CharField()
-    reference_id = serializers.IntegerField()
-    hours = serializers.FloatField()
-    start = serializers.DateField()
-    end = serializers.DateField()
-    uploaded = serializers.DateTimeField()
+class ReferenceUploadResponseSerializer(serializers.ModelSerializer[Reference]):
+    message = serializers.CharField(default="Medical certificate uploaded successfully")
+
+    class Meta:
+        model = Reference
+        fields = ("id", "student_id", "semester", "hours", "start", "end", "uploaded", "message")
+
 
 
 class MedicalGroupReferenceUploadSerializer(serializers.Serializer):
@@ -41,7 +41,9 @@ class MedicalGroupReferenceUploadSerializer(serializers.Serializer):
         max_length=1000,
     )
 
-class MedicalGroupReferenceUploadResponseSerializer(serializers.ModelSerializer[MedicalGroupReference]):
+class MedicalGroupReferenceUploadResponseSerializer(serializers.ModelSerializer):
     class Meta:
         model = MedicalGroupReference
-        fields = ('id', 'student', 'uploaded', 'semester')
+        fields = ('id', 'student_id', 'semester', 'uploaded')
+
+

adminpage/api_v2/views/reference.py

@@ -31,7 +31,7 @@ class ReferenceErrors:
     methods=["POST"],
     tags=["For student"],
     summary="Upload medical certificate",
-    description="Upload a medical certificate for sick leave. The system automatically calculates hours based on the duration of illness. Only one upload per day is allowed.",
+    description="Upload a medical certificate for sick leave. Only one upload per day is allowed. Hours are calculated automatically.",
     request=ReferenceUploadSerializer,
     responses={
         status.HTTP_200_OK: ReferenceUploadResponseSerializer,
@@ -45,17 +45,19 @@ def reference_upload(request, **kwargs):
     serializer = ReferenceUploadSerializer(data=request.data)
     serializer.is_valid(raise_exception=True)
 
-    image = serializer.validated_data['image']
-
     student = request.user  # user.pk == user.student.pk
 
     try:
         with transaction.atomic():
             ref = serializer.save(
                 semester=get_current_semester_crud(),
                 student_id=student.pk,
-                hours=(serializer.validated_data['end'] - serializer.validated_data['start']).days // 7 * get_current_semester_crud().number_hours_one_week_ill
+                hours=(
+                    (serializer.validated_data['end'] - serializer.validated_data['start']).days // 7
+                    * get_current_semester_crud().number_hours_one_week_ill
+                )
             )
+
             count = Reference.objects.filter(
                 student_id=student.pk,
                 uploaded__date=make_naive(ref.uploaded).date()
@@ -66,22 +68,16 @@ def reference_upload(request, **kwargs):
             status=status.HTTP_400_BAD_REQUEST,
             data=error_detail(*ReferenceErrors.TOO_MUCH_UPLOADS_PER_DAY)
         )
-    
-    # Return informative response
-    return Response({
-        "message": "Medical certificate uploaded successfully",
-        "reference_id": ref.id,
-        "hours": ref.hours,
-        "start": ref.start,
-        "end": ref.end,
-        "uploaded": ref.uploaded
-    })
+
+    response_serializer = ReferenceUploadResponseSerializer(ref)
+    return Response(response_serializer.data, status=status.HTTP_200_OK)
+
 
 @extend_schema(
     methods=["POST"],
     tags=["For student"],
     summary="Upload medical certificate",
-    description="Upload a medical certificate for sick leave. The system automatically calculates hours based on the duration of illness. Only one upload per day is allowed.",
+    description="Upload a medical certificate for sick leave. Only one upload per day is allowed.",
     request=MedicalGroupReferenceUploadSerializer,
     responses={
         status.HTTP_200_OK: MedicalGroupReferenceUploadResponseSerializer,
@@ -101,19 +97,18 @@ def medical_group_upload(request, **kwargs):
 
     try:
         with transaction.atomic():
-            
             reference = MedicalGroupReference.objects.create(
                 student_id=student.pk,
                 semester=get_current_semester_crud(),
                 student_comment=student_comment,
             )
-            
+
             reference_images = [
                 MedicalGroupReferenceImage(reference=reference, image=image)
                 for image in images
             ]
             MedicalGroupReferenceImage.objects.bulk_create(reference_images)
-    
+
     except Exception as e:
         return Response(
             {
@@ -122,4 +117,5 @@ def medical_group_upload(request, **kwargs):
             status=status.HTTP_400_BAD_REQUEST
         )
 
-    return Response(MedicalGroupReferenceUploadResponseSerializer(reference).data)
+    response_serializer = MedicalGroupReferenceUploadResponseSerializer(reference)
+    return Response(response_serializer.data, status=status.HTTP_200_OK)

adminpage/api_v2/views/self_sport_report.py

@@ -302,7 +302,7 @@ def get_selfsport_reports_for_student(request, student_id: int, **kwargs):
     ),
     post=extend_schema(
         operation_id="v2_selfsport_reports_create",
-        tags=["Self Sport"],
+        tags=["For student"],
         summary="Upload self sport report",
         description="""
 Creates a new self-sport report.