feat: Ajout du logo de l'école

Back-End/Auth/views.py

@@ -223,14 +223,29 @@ def makeToken(user):
     """
     try:
         # Récupérer tous les rôles de l'utilisateur actifs
-        roles = ProfileRole.objects.filter(profile=user, is_active=True).values('role_type', 'establishment__id', 'establishment__name', 'establishment__evaluation_frequency', 'establishment__total_capacity', 'establishment__api_docuseal')
+        roles_qs = ProfileRole.objects.filter(profile=user, is_active=True).select_related('establishment')
+        roles = []
+        for role in roles_qs:
+            logo_url = ""
+            if role.establishment.logo:
+                # Construit l'URL complète pour le logo
+                logo_url = f"{role.establishment.logo.url}"
+            roles.append({
+                "role_type": role.role_type,
+                "establishment__id": role.establishment.id,
+                "establishment__name": role.establishment.name,
+                "establishment__evaluation_frequency": role.establishment.evaluation_frequency,
+                "establishment__total_capacity": role.establishment.total_capacity,
+                "establishment__api_docuseal": role.establishment.api_docuseal,
+                "establishment__logo": logo_url,
+            })
 
         # Générer le JWT avec la bonne syntaxe datetime
         access_payload = {
             'user_id': user.id,
             'email': user.email,
-            'roleIndexLoginDefault':user.roleIndexLoginDefault,
-            'roles': list(roles),
+            'roleIndexLoginDefault': user.roleIndexLoginDefault,
+            'roles': roles,
             'type': 'access',
             'exp': datetime.utcnow() + settings.SIMPLE_JWT['ACCESS_TOKEN_LIFETIME'],
             'iat': datetime.utcnow(),

Back-End/Establishment/models.py

@@ -2,6 +2,12 @@ from django.db import models
 from django.contrib.postgres.fields import ArrayField
 from django.utils.translation import gettext_lazy as _
 
+import os
+
+def registration_logo_upload_to(instance, filename):
+    ext = os.path.splitext(filename)[1]
+    return f"logos/school_{instance.pk}/logo{ext}"
+
 class StructureType(models.IntegerChoices):
     MATERNELLE = 1, _('Maternelle')
     PRIMAIRE = 2, _('Primaire')
@@ -22,6 +28,11 @@ class Establishment(models.Model):
     is_active = models.BooleanField(default=True)
     created_at = models.DateTimeField(auto_now_add=True)
     api_docuseal = models.CharField(max_length=255, blank=True, null=True)
+    logo = models.FileField(
+        upload_to=registration_logo_upload_to,
+        null=True,
+        blank=True
+    )
 
     def __str__(self):
         return self.name

Back-End/Establishment/views.py

@@ -1,7 +1,7 @@
 from django.http.response import JsonResponse
 from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect
 from django.utils.decorators import method_decorator
-from rest_framework.parsers import JSONParser
+from rest_framework.parsers import JSONParser, MultiPartParser, FormParser
 from rest_framework.views import APIView
 from rest_framework import status
 from .models import Establishment
@@ -12,6 +12,8 @@ from django.db.models import Q
 from Auth.models import Profile, ProfileRole, Directeur
 from Settings.models import SMTPSettings
 import N3wtSchool.mailManager as mailer
+import os
+from N3wtSchool import settings
 
 @method_decorator(csrf_protect, name='dispatch')
 @method_decorator(ensure_csrf_cookie, name='dispatch')
@@ -42,6 +44,8 @@ class EstablishmentListCreateView(APIView):
 @method_decorator(csrf_protect, name='dispatch')
 @method_decorator(ensure_csrf_cookie, name='dispatch')
 class EstablishmentDetailView(APIView):
+    parser_classes = [MultiPartParser, FormParser]
+
     def get(self, request, id=None):
         try:
             establishment = Establishment.objects.get(id=id)
@@ -51,15 +55,20 @@ class EstablishmentDetailView(APIView):
             return JsonResponse({'error': 'No object found'}, status=status.HTTP_404_NOT_FOUND)
 
     def put(self, request, id):
-        establishment_data = JSONParser().parse(request)
+        """
+        Met à jour un établissement existant.
+        Accepte les données en multipart/form-data pour permettre l'upload de fichiers (ex : logo).
+        """
         try:
             establishment = Establishment.objects.get(id=id)
         except Establishment.DoesNotExist:
             return JsonResponse({'error': 'No object found'}, status=status.HTTP_404_NOT_FOUND)
-        establishment_serializer = EstablishmentSerializer(establishment, data=establishment_data, partial=True)
+
+        # Utilise request.data pour supporter multipart/form-data (fichiers et champs classiques)
+        establishment_serializer = EstablishmentSerializer(establishment, data=request.data, partial=True)
         if establishment_serializer.is_valid():
             establishment_serializer.save()
-            return JsonResponse(establishment_serializer.data, safe=False)
+            return JsonResponse(establishment_serializer.data, safe=False, status=status.HTTP_200_OK)
         return JsonResponse(establishment_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, id):
@@ -67,6 +76,7 @@ class EstablishmentDetailView(APIView):
 
 def create_establishment_with_directeur(establishment_data):
     # Extraction des sous-objets
+    # school_name = establishment_data.get("name")
     directeur_data = establishment_data.pop("directeur", None)
     smtp_settings_data = establishment_data.pop("smtp_settings", {})
 
@@ -91,6 +101,8 @@ def create_establishment_with_directeur(establishment_data):
     # Création de l'établissement
     establishment_serializer = EstablishmentSerializer(data=establishment_data)
     establishment_serializer.is_valid(raise_exception=True)
+    # base_dir = os.path.join(settings.MEDIA_ROOT, f"logo/school_{school_name}")
+    # os.makedirs(base_dir, exist_ok=True)
     establishment = establishment_serializer.save()
 
     # Création ou récupération du ProfileRole ADMIN pour ce profil et cet établissement