feat: Gestion multi-profil multi-école

Back-End/Subscriptions/models.py

@@ -4,6 +4,8 @@ from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
 from School.models import SchoolClass, Fee, Discount
+from Auth.models import ProfileRole
+from Establishment.models import Establishment
 
 from datetime import datetime
 
@@ -25,10 +27,9 @@ class Guardian(models.Model):
     first_name = models.CharField(max_length=200, default="")
     birth_date = models.CharField(max_length=200, default="", blank=True)
     address = models.CharField(max_length=200, default="", blank=True)
-    email = models.CharField(max_length=200, default="", blank=True)
     phone = models.CharField(max_length=200, default="", blank=True)
     profession = models.CharField(max_length=200, default="", blank=True)
-    associated_profile = models.ForeignKey('Auth.Profile', on_delete=models.CASCADE)
+    profile_role = models.OneToOneField(ProfileRole, on_delete=models.CASCADE, related_name='guardian_profile', null=True, blank=True)
 
     def __str__(self):
         return self.last_name + "_" + self.first_name
@@ -163,6 +164,7 @@ class Student(models.Model):
 class RegistrationFileGroup(models.Model):
     name = models.CharField(max_length=255, default="")
     description = models.TextField(blank=True, null=True)
+    establishment = models.ForeignKey(Establishment, on_delete=models.CASCADE, related_name='file_group', null=True, blank=True)
 
     def __str__(self):
         return self.name
@@ -214,7 +216,7 @@ class RegistrationForm(models.Model):
                                  null=True,
                                  blank=True)
 
-    establishment = models.ForeignKey('School.Establishment', on_delete=models.CASCADE, related_name='register_forms')
+    establishment = models.ForeignKey(Establishment, on_delete=models.CASCADE, related_name='register_forms')
 
     def __str__(self):
         return "RF_" + self.student.last_name + "_" + self.student.first_name

Back-End/Subscriptions/serializers.py

@@ -2,7 +2,7 @@ from rest_framework import serializers
 from .models import RegistrationFileGroup, RegistrationForm, Student, Guardian, Sibling, Language, RegistrationTemplateMaster, RegistrationTemplate
 from School.models import SchoolClass, Fee, Discount, FeeType
 from School.serializers import FeeSerializer, DiscountSerializer
-from Auth.models import Profile
+from Auth.models import ProfileRole
 from Auth.serializers import ProfileSerializer
 from GestionMessagerie.models import Messagerie
 from GestionNotification.models import Notification
@@ -68,7 +68,7 @@ class SiblingSerializer(serializers.ModelSerializer):
 
 class GuardianSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
-    associated_profile = serializers.PrimaryKeyRelatedField(queryset=Profile.objects.all(), required=True)
+    profile_role = serializers.PrimaryKeyRelatedField(queryset=ProfileRole.objects.all(), required=True)
     associated_profile_email = serializers.SerializerMethodField()
 
     class Meta:
@@ -76,7 +76,7 @@ class GuardianSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def get_associated_profile_email(self, obj):
-        return obj.associated_profile.email
+        return obj.profile_role.profile.email
 
 
 class StudentSerializer(serializers.ModelSerializer):
@@ -248,7 +248,7 @@ class GuardianByDICreationSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Guardian
-        fields = ['id', 'last_name', 'first_name', 'email', 'associated_profile']
+        fields = ['id', 'last_name', 'first_name', 'email', 'profile']
 
 class StudentByRFCreationSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)

Back-End/Subscriptions/views/student_views.py

@@ -90,6 +90,12 @@ class ChildrenListView(APIView):
     # Récupération des élèves d'un parent
     # idProfile : identifiant du profil connecté rattaché aux fiches d'élèves
     def get(self, request, id):
-        students = bdd.getObjects(_objectName=RegistrationForm, _columnName='student__guardians__associated_profile__id', _value=id)
+        establishment_id = request.GET.get('establishment_id', None)
+        if establishment_id is None:
+            return JsonResponse({'error': 'establishment_id est requis'}, safe=False, status=status.HTTP_400_BAD_REQUEST)
+        
+        students = bdd.getObjects(_objectName=RegistrationForm, _columnName='student__guardians__profile_role__profile__id', _value=id)
+        if students:
+            students = students.filter(establishment=establishment_id).distinct()
         students_serializer = RegistrationFormByParentSerializer(students, many=True)
         return JsonResponse(students_serializer.data, safe=False)