Merge pull request #990 from yverdon/feature/yc-1193

YC-1193

geocity/apps/accounts/admin.py

@@ -781,6 +781,7 @@ class AdministrativeEntityAdmin(IntegratorFilterMixin, admin.ModelAdmin):
             {
                 "fields": (
                     "name",
+                    "agenda_domain",
                     "agenda_name",
                     "tags",
                     "ofs_id",

geocity/apps/accounts/migrations/0019_administrativeentity_agenda_domain.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-05-03 13:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0018_administrativeentity_agenda_name_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="administrativeentity",
+            name="agenda_domain",
+            field=models.CharField(
+                blank=True,
+                help_text="Utilisé afin de sélectionner les agendas visible dans agenda-embed",
+                max_length=128,
+                verbose_name="Domaine de l'agenda",
+            ),
+        ),
+    ]

geocity/apps/accounts/models.py

@@ -257,6 +257,14 @@ def associated_to_user(self, user):
 
 class AdministrativeEntity(models.Model):
     name = models.CharField(_("name"), max_length=128)
+    agenda_domain = models.CharField(
+        _("Domaine de l'agenda"),
+        help_text=_(
+            "Utilisé afin de sélectionner les agendas visible dans agenda-embed"
+        ),
+        max_length=128,
+        blank=True,
+    )
     agenda_name = models.CharField(
         _("Nom dans l'api agenda"),
         help_text=_("Nom visible dans le filtre de l'agenda"),
@@ -442,6 +450,18 @@ def clean(self):
                 }
             )
 
+        # Unique constraint for agenda_domain
+        # Cannot be used on model, because None is also subject to the constraint (blank=True)
+        if self.agenda_domain:
+            if (
+                AdministrativeEntity.objects.exclude(pk=self.pk)
+                .filter(agenda_domain=self.agenda_domain)
+                .exists()
+            ):
+                raise ValidationError(
+                    {"agenda_domain": _("Le domaine de l'agenda doit être unique.")}
+                )
+
         if (
             not self.is_single_form_submissions
             and Form.objects.filter(

geocity/apps/api/serializers.py

@@ -964,7 +964,7 @@ def get_available_filters_for_agenda_as_qs(domains):
 
     entity = (
         AdministrativeEntity.objects.filter(
-            tags__name=domain,
+            agenda_domain=domain,
             forms__agenda_visible=True,
         )
         .distinct()

geocity/apps/api/views.py

@@ -629,11 +629,10 @@ def get_queryset(self):
             domain_filter = query_params.getlist("domain_filter")
             entities = AdministrativeEntity.objects.filter(id__in=domain_filter)
             submissions = get_agenda_submissions(entities, submissions)
-
         elif "domain" in query_params:
             domains = query_params["domain"]
             domains = domains.split(",") if domains else None
-            entities = AdministrativeEntity.objects.filter(tags__name__in=domains)
+            entities = AdministrativeEntity.objects.filter(agenda_domain__in=domains)
             submissions = get_agenda_submissions(entities, submissions)
 
         if "starts_at" in query_params:

geocity/tests/api/test_agenda_api.py

@@ -51,7 +51,7 @@ def setUp(self):
         self.sit_integrator_group = factories.IntegratorGroupFactory(department=None)
         self.sit_pilot_group = factories.SecretariatGroupFactory(department=None)
         self.sit_administrative_entity = factories.AdministrativeEntityFactory(
-            tags=["sit"], integrator=self.sit_integrator_group
+            agenda_domain="sit", integrator=self.sit_integrator_group
         )
 
         factories.IntegratorPermitDepartmentFactory(
@@ -435,7 +435,7 @@ def setUp(self):
         self.fin_integrator_group = factories.IntegratorGroupFactory(department=None)
         self.fin_group = factories.SecretariatGroupFactory(department=None)
         self.fin_administrative_entity = factories.AdministrativeEntityFactory(
-            tags=["fin"], integrator=self.fin_integrator_group
+            agenda_domain="fin", integrator=self.fin_integrator_group
         )
 
         factories.IntegratorPermitDepartmentFactory(