Merge branch 'main' into fix-split-add-user

Author: Agneskoinange

core/migrations/0012_merge_20251024_0243.py

@@ -0,0 +1,14 @@
+# Generated by Django 4.2.7 on 2025-10-24 02:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0011_alter_class_options_alter_class_description_and_more'),
+        ('core', '0011_alter_user_role'),
+    ]
+
+    operations = [
+    ]

core/urls.py

@@ -76,11 +76,6 @@
     path('projects/<uuid:pk>/join/', views.ProjectViewSet.as_view({'post': 'join'}), name='project-join'),
     path('projects/<uuid:pk>/impacts/', views.ProjectViewSet.as_view({'get': 'impacts'}), name='project-impacts'),
     path('projects/<uuid:project_id>/add-class/<uuid:class_id>/', views.add_class_to_project, name='add-class-to-project'),
-
-    # =================================================================
-    # CUSTOM CLASS ENDPOINTS
-    # =================================================================
-    path('classes/class-choices/', views.get_class_choices, name='class-choices'),
 
     # =================================================================
     # CUSTOM SCHOOL ENDPOINTS

core/views.py

@@ -3,6 +3,7 @@
 Handles all REST API endpoints for the application
 """
 
+import logging
 from django.shortcuts import get_object_or_404
 from django.contrib.auth import authenticate
 from django.db.models import Count, Sum, Q
@@ -50,11 +51,10 @@
     CanManageProjectParticipants, CanUploadProjectProgress
 )
 from .filters import ProjectFilter, SchoolFilter, EnvironmentalImpactFilter
-from rest_framework.permissions import AllowAny
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
 
-logger = logging.getLogger("__name__")
+logger = logging.getLogger(__name__)
 
 
 # =============================================================================
@@ -400,6 +400,15 @@ class ClassViewSet(viewsets.ModelViewSet):
     filterset_fields = ['school']
     search_fields = ['name']
 
+    @action(detail=False, methods=['get'], url_path='class-choices')
+    def class_choices(self, request):
+        """Return available class name choices"""
+        choices = [
+            {"value": choice[0], "label": choice[1]}
+            for choice in Class.ClassName.choices
+        ]
+        return Response(choices)
+
 
 # =============================================================================
 # PROFILE VIEWSETS
@@ -1046,7 +1055,7 @@ def add_user_to_school(request, school_id):
 
         user_email = request.data.get('user_email')
         user_role = request.data.get('user_role', 'student')
-        class_id = request.data.get('class_id')  # For students
+        class_name = request.data.get('class_name')  # For students
 
         if not user_email:
             return Response({'error': 'user_email is required'}, 
@@ -1084,20 +1093,22 @@ def add_user_to_school(request, school_id):
                 school=school,
                 defaults={'teacher_role': 'subject_teacher', 'status': 'active'}
             )
-        elif user_role == 'student' and class_id:
-            try:
-                student_class = Class.objects.get(id=class_id, school=school)
-                StudentProfile.objects.get_or_create(
-                    user=user,
-                    school=school,
-                    defaults={
-                        'student_id': f"{school.name[:3].upper()}{user.id}",
-                        'current_class': student_class
-                    }
-                )
-            except Class.DoesNotExist:
-                return Response({'error': 'Class not found in this school'}, 
-                               status=status.HTTP_400_BAD_REQUEST)
+        elif user_role == 'student' and class_name:
+            student_class, _ = Class.objects.get_or_create(
+                name=class_name,
+                school=school,
+                defaults={
+                    'description': f'{class_name} class auto-created for {school.name}'
+                }
+            )
+            StudentProfile.objects.get_or_create(
+                user=user,
+                school=school,
+                defaults={
+                    'student_id': f"{school.name[:3].upper()}{user.id}",
+                    'current_class': student_class
+                }
+            )
 
         return Response({
             'message': f'Successfully added {user.get_full_name()} as {user_role} to {school.name}',
@@ -1414,15 +1425,4 @@ def check_school_exists(request):
     })
 
 
-@api_view(['GET'])
-@permission_classes([permissions.AllowAny])
-def get_class_choices(request):
-    """Return available class name choices"""
-    choices = [
-        {"value": choice[0], "label": choice[1]}
-        for choice in Class.ClassName.choices
-    ]
-    return Response(choices)
-
-
 from .additional_views import *