From 7d7d2862896a1cf3465293c4ae78ab081de5c17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gardien?= <gardien.remi@gmail.com>
Date: Fri, 31 Jan 2025 15:34:48 +0100
Subject: [PATCH] General convention (#11412)

* General convention

* Fix adherent cascade

* Add endpoints + fix review
---
 config/packages/security.yaml                 |   2 +
 config/services/admin.xml                     |   8 +
 features/api/general_conventions.feature      | 121 +++++++++
 migrations/2025/Version20250131111843.php     |  94 +++++++
 src/Admin/GeneralConventionAdmin.php          | 249 ++++++++++++++++++
 src/DataFixtures/ORM/LoadAdminData.php        |   1 +
 .../ORM/LoadAdministratorRoleData.php         |   5 +
 .../ORM/LoadGeneralConventionData.php         | 166 ++++++++++++
 src/Entity/EntityIdentityTrait.php            |   2 +
 .../GeneralConvention/GeneralConvention.php   | 156 +++++++++++
 src/Entity/Geo/GeoTrait.php                   |   4 +-
 src/Entity/Geo/Zone.php                       |   4 +-
 src/GeneralConvention/MeetingTypeEnum.php     |   9 +
 src/GeneralConvention/OrganizerEnum.php       |  10 +
 src/GeneralConvention/ParticipantQuality.php  |  10 +
 .../list_district_or_committee.html.twig      |   9 +
 .../list_organizer.html.twig                  |   5 +
 translations/messages+intl-icu.fr.yml         |  14 +
 18 files changed, 865 insertions(+), 4 deletions(-)
 create mode 100644 features/api/general_conventions.feature
 create mode 100644 migrations/2025/Version20250131111843.php
 create mode 100644 src/Admin/GeneralConventionAdmin.php
 create mode 100644 src/DataFixtures/ORM/LoadGeneralConventionData.php
 create mode 100644 src/Entity/GeneralConvention/GeneralConvention.php
 create mode 100644 src/GeneralConvention/MeetingTypeEnum.php
 create mode 100644 src/GeneralConvention/OrganizerEnum.php
 create mode 100644 src/GeneralConvention/ParticipantQuality.php
 create mode 100644 templates/admin/general_convention/list_district_or_committee.html.twig
 create mode 100644 templates/admin/general_convention/list_organizer.html.twig

diff --git a/config/packages/security.yaml b/config/packages/security.yaml
index 2ed6821b93..244755e3a3 100644
--- a/config/packages/security.yaml
+++ b/config/packages/security.yaml
@@ -175,6 +175,8 @@ security:
             - ROLE_APP_ADMIN_PROCURATION_V2_REQUEST_ALL
             - ROLE_APP_ADMIN_PROCURATION_V2_PROXY_ALL
             - ROLE_APP_ADMIN_PROCURATION_V2_PROCURATION_REQUEST_ALL
+        ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS:
+            - ROLE_APP_ADMIN_GENERAL_CONVENTION_ALL
 
         ## Application Mobile
         ROLE_ADMIN_APPLICATION_MOBILE_NOTIFICATIONS:
diff --git a/config/services/admin.xml b/config/services/admin.xml
index 48d6ae3661..1755140893 100644
--- a/config/services/admin.xml
+++ b/config/services/admin.xml
@@ -310,6 +310,14 @@
         </service>
         <service id="App\Admin\ReportAdmin" alias="app.admin.report" />
 
+        <service id="app.admin.general_convention" class="App\Admin\GeneralConventionAdmin">
+            <tag name="sonata.admin" manager-type="orm" label="États généraux" group="Territoires" />
+
+            <argument />
+            <argument>App\Entity\GeneralConvention\GeneralConvention</argument>
+            <argument />
+        </service>
+
         <!--
         ######################################################
         # Mobilisation
diff --git a/features/api/general_conventions.feature b/features/api/general_conventions.feature
new file mode 100644
index 0000000000..f1018e2167
--- /dev/null
+++ b/features/api/general_conventions.feature
@@ -0,0 +1,121 @@
+@api
+Feature:
+    In order to display general conventions informations
+    As an anonymous user
+    I should be able to list and read general conventions
+
+    Scenario: As an anonymous user, I can list general conventions
+        And I send a "GET" request to "/api/general_conventions?page_size=10"
+        Then the response status code should be 200
+        And the response should be in JSON
+        And the JSON should be equal to:
+            """
+            {
+                "metadata": {
+                    "total_items": 3,
+                    "items_per_page": 10,
+                    "count": 3,
+                    "current_page": 1,
+                    "last_page": 1
+                },
+                "items": [
+                    {
+                        "department_zone": {
+                            "uuid": "@uuid@",
+                            "type": "department",
+                            "code": "92",
+                            "name": "Hauts-de-Seine"
+                        },
+                        "committee_zone": null,
+                        "district_zone": null,
+                        "organizer": "assembly",
+                        "reported_at": "@string@.isDateTime()",
+                        "meeting_type": "on_site",
+                        "members_count": 0,
+                        "participant_quality": "adherent",
+                        "uuid": "c5317499-7130-4255-a7f8-418e72f5dfa5"
+                    },
+                    {
+                        "department_zone": {
+                            "uuid": "@uuid@",
+                            "type": "department",
+                            "code": "92",
+                            "name": "Hauts-de-Seine"
+                        },
+                        "committee_zone": {
+                            "uuid": "@uuid@",
+                            "type": "city",
+                            "code": "92024",
+                            "name": "Clichy"
+                        },
+                        "district_zone": null,
+                        "organizer": "committee",
+                        "reported_at": "@string@.isDateTime()",
+                        "meeting_type": "remote",
+                        "members_count": 20,
+                        "participant_quality": "sympathizer",
+                        "uuid": "b3a2b082-01fc-4306-9fdb-6559ebe765b1"
+                    },
+                    {
+                        "department_zone": {
+                            "uuid": "@uuid@",
+                            "type": "department",
+                            "code": "92",
+                            "name": "Hauts-de-Seine"
+                        },
+                        "committee_zone": null,
+                        "district_zone": {
+                            "uuid": "@uuid@",
+                            "type": "district",
+                            "code": "92-4",
+                            "name": "Hauts-de-Seine (4)"
+                        },
+                        "organizer": "district",
+                        "reported_at": "@string@.isDateTime()",
+                        "meeting_type": "remote",
+                        "members_count": 10,
+                        "participant_quality": "adherent_before",
+                        "uuid": "54c9ae4c-3e2d-475d-8993-54639ec58ea1"
+                    }
+                ]
+            }
+            """
+
+    Scenario: As an anonymous user, I can get informations of a general convention
+        And I send a "GET" request to "/api/general_conventions/c5317499-7130-4255-a7f8-418e72f5dfa5"
+        Then the response status code should be 200
+        And the response should be in JSON
+        And the JSON should be equal to:
+            """
+            {
+                "department_zone": {
+                    "uuid": "@uuid@",
+                    "type": "department",
+                    "code": "92",
+                    "name": "Hauts-de-Seine"
+                },
+                "committee_zone": null,
+                "district_zone": null,
+                "organizer": "assembly",
+                "reported_at": "@string@.isDateTime()",
+                "meeting_type": "on_site",
+                "members_count": 0,
+                "participant_quality": "adherent",
+                "general_summary": null,
+                "party_definition_summary": null,
+                "unique_party_summary": null,
+                "progress_since2016": null,
+                "party_objectives": null,
+                "governance": null,
+                "communication": null,
+                "militant_training": null,
+                "member_journey": null,
+                "mobilization": null,
+                "talent_detection": null,
+                "election_preparation": null,
+                "relationship_with_supporters": null,
+                "work_with_partners": null,
+                "additional_comments": null,
+                "uuid": "c5317499-7130-4255-a7f8-418e72f5dfa5"
+            }
+            """
diff --git a/migrations/2025/Version20250131111843.php b/migrations/2025/Version20250131111843.php
new file mode 100644
index 0000000000..983590cfcf
--- /dev/null
+++ b/migrations/2025/Version20250131111843.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250131111843 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE general_convention (
+          id INT UNSIGNED AUTO_INCREMENT NOT NULL,
+          department_zone_id INT UNSIGNED NOT NULL,
+          committee_zone_id INT UNSIGNED DEFAULT NULL,
+          district_zone_id INT UNSIGNED DEFAULT NULL,
+          reporter_id INT UNSIGNED DEFAULT NULL,
+          created_by_administrator_id INT DEFAULT NULL,
+          updated_by_administrator_id INT DEFAULT NULL,
+          organizer VARCHAR(255) NOT NULL,
+          reported_at DATETIME NOT NULL,
+          meeting_type VARCHAR(255) NOT NULL,
+          members_count SMALLINT UNSIGNED DEFAULT 0 NOT NULL,
+          participant_quality VARCHAR(255) NOT NULL,
+          general_summary LONGTEXT DEFAULT NULL,
+          party_definition_summary LONGTEXT DEFAULT NULL,
+          unique_party_summary LONGTEXT DEFAULT NULL,
+          progress_since2016 LONGTEXT DEFAULT NULL,
+          party_objectives LONGTEXT DEFAULT NULL,
+          governance LONGTEXT DEFAULT NULL,
+          communication LONGTEXT DEFAULT NULL,
+          militant_training LONGTEXT DEFAULT NULL,
+          member_journey LONGTEXT DEFAULT NULL,
+          mobilization LONGTEXT DEFAULT NULL,
+          talent_detection LONGTEXT DEFAULT NULL,
+          election_preparation LONGTEXT DEFAULT NULL,
+          relationship_with_supporters LONGTEXT DEFAULT NULL,
+          work_with_partners LONGTEXT DEFAULT NULL,
+          additional_comments LONGTEXT DEFAULT NULL,
+          uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\',
+          created_at DATETIME NOT NULL,
+          updated_at DATETIME NOT NULL,
+          UNIQUE INDEX UNIQ_F66947EFD17F50A6 (uuid),
+          INDEX IDX_F66947EF2285D748 (department_zone_id),
+          INDEX IDX_F66947EF94819E3B (committee_zone_id),
+          INDEX IDX_F66947EF23F5C396 (district_zone_id),
+          INDEX IDX_F66947EFE1CFE6F5 (reporter_id),
+          INDEX IDX_F66947EF9DF5350C (created_by_administrator_id),
+          INDEX IDX_F66947EFCF1918FF (updated_by_administrator_id),
+          PRIMARY KEY(id)
+        ) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EF2285D748 FOREIGN KEY (department_zone_id) REFERENCES geo_zone (id)');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EF94819E3B FOREIGN KEY (committee_zone_id) REFERENCES geo_zone (id)');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EF23F5C396 FOREIGN KEY (district_zone_id) REFERENCES geo_zone (id)');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EFE1CFE6F5 FOREIGN KEY (reporter_id) REFERENCES adherents (id) ON DELETE
+        SET
+          NULL');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EF9DF5350C FOREIGN KEY (created_by_administrator_id) REFERENCES administrators (id) ON DELETE
+        SET
+          NULL');
+        $this->addSql('ALTER TABLE
+          general_convention
+        ADD
+          CONSTRAINT FK_F66947EFCF1918FF FOREIGN KEY (updated_by_administrator_id) REFERENCES administrators (id) ON DELETE
+        SET
+          NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EF2285D748');
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EF94819E3B');
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EF23F5C396');
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EFE1CFE6F5');
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EF9DF5350C');
+        $this->addSql('ALTER TABLE general_convention DROP FOREIGN KEY FK_F66947EFCF1918FF');
+        $this->addSql('DROP TABLE general_convention');
+    }
+}
diff --git a/src/Admin/GeneralConventionAdmin.php b/src/Admin/GeneralConventionAdmin.php
new file mode 100644
index 0000000000..3c476bf115
--- /dev/null
+++ b/src/Admin/GeneralConventionAdmin.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace App\Admin;
+
+use App\Entity\Adherent;
+use App\Entity\Geo\Zone;
+use App\Form\Admin\SimpleMDEContent;
+use App\GeneralConvention\MeetingTypeEnum;
+use App\GeneralConvention\OrganizerEnum;
+use App\GeneralConvention\ParticipantQuality;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
+use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
+use Symfony\Component\Form\Extension\Core\Type\EnumType;
+
+class GeneralConventionAdmin extends AbstractAdmin
+{
+    protected function configureFormFields(FormMapper $form): void
+    {
+        $form
+            ->add('departmentZone', ModelAutocompleteType::class, [
+                'multiple' => false,
+                'label' => 'Département',
+                'required' => true,
+                'property' => ['name', 'code'],
+                'callback' => function (AdminInterface $admin, array $property, $value): void {
+                    $datagrid = $admin->getDatagrid();
+                    $query = $datagrid->getQuery();
+                    $rootAlias = $query->getRootAlias();
+                    $query
+                        ->andWhere($rootAlias.'.type = :type_department')
+                        ->setParameter('type_department', Zone::DEPARTMENT)
+                    ;
+
+                    $datagrid->setValue($property[0], null, $value);
+                },
+                'btn_add' => false,
+            ])
+            ->add('committeeZone', ModelAutocompleteType::class, [
+                'multiple' => false,
+                'label' => 'Comité (zone)',
+                'required' => false,
+                'property' => ['name', 'code'],
+                'callback' => function (AdminInterface $admin, array $property, $value): void {
+                    $datagrid = $admin->getDatagrid();
+                    $query = $datagrid->getQuery();
+                    $rootAlias = $query->getRootAlias();
+                    $query
+                        ->andWhere($rootAlias.'.type = :type_city')
+                        ->setParameter('type_city', Zone::CITY)
+                    ;
+
+                    $datagrid->setValue($property[0], null, $value);
+                },
+                'btn_add' => false,
+            ])
+            ->add('districtZone', ModelAutocompleteType::class, [
+                'multiple' => false,
+                'label' => 'Circonscription',
+                'required' => false,
+                'property' => ['name', 'code'],
+                'callback' => function (AdminInterface $admin, array $property, $value): void {
+                    $datagrid = $admin->getDatagrid();
+                    $query = $datagrid->getQuery();
+                    $rootAlias = $query->getRootAlias();
+                    $query
+                        ->andWhere($rootAlias.'.type = :type_district')
+                        ->setParameter('type_district', Zone::DISTRICT)
+                    ;
+
+                    $datagrid->setValue($property[0], null, $value);
+                },
+                'btn_add' => false,
+            ])
+            ->add('organizer', EnumType::class, [
+                'label' => 'Instance organisatrice',
+                'class' => OrganizerEnum::class,
+                'choice_label' => function (OrganizerEnum $organizer) {
+                    return 'general_convention.organizer.'.$organizer->value;
+                },
+            ])
+            ->add('reporter', ModelAutocompleteType::class, [
+                'label' => 'Auteur de la remontée',
+                'required' => true,
+                'minimum_input_length' => 1,
+                'items_per_page' => 20,
+                'property' => [
+                    'search',
+                ],
+                'to_string_callback' => static function (Adherent $adherent): string {
+                    return \sprintf(
+                        '%s (%s) [%s]',
+                        $adherent->getFullName(),
+                        $adherent->getEmailAddress(),
+                        $adherent->getId()
+                    );
+                },
+                'btn_add' => false,
+            ])
+            ->add('reportedAt', null, [
+                'label' => 'Date de la remontée',
+                'widget' => 'single_text',
+            ])
+            ->add('meetingType', EnumType::class, [
+                'label' => 'Type de réunion',
+                'class' => MeetingTypeEnum::class,
+                'choice_label' => function (MeetingTypeEnum $meetingType) {
+                    return 'general_convention.meeting_type.'.$meetingType->value;
+                },
+            ])
+            ->add('membersCount', null, [
+                'label' => 'Nombre de participants',
+            ])
+            ->add('participantQuality', EnumType::class, [
+                'label' => 'Qualité des participants',
+                'class' => ParticipantQuality::class,
+                'choice_label' => function (ParticipantQuality $participantQuality) {
+                    return 'general_convention.participant_quality.'.$participantQuality->value;
+                },
+            ])
+            ->add('generalSummary', SimpleMDEContent::class, [
+                'label' => 'Synthèse générale',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('partyDefinitionSummary', SimpleMDEContent::class, [
+                'label' => 'Synthèse des réponses concernant l\'échange sur ce qu\'est un parti politique pour les participants',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('uniquePartySummary', SimpleMDEContent::class, [
+                'label' => 'Synthèse des échanges sur "Renaissance, un parti pas comme les autres"',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('progressSince2016', SimpleMDEContent::class, [
+                'label' => 'Synthèse des échanges sur le chemin parcouru depuis 2016',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('partyObjectives', SimpleMDEContent::class, [
+                'label' => 'Synthèse des échanges sur les objectifs de Renaissance',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('governance', SimpleMDEContent::class, [
+                'label' => 'Notre gouvernance',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('communication', SimpleMDEContent::class, [
+                'label' => 'Notre communication',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('militantTraining', SimpleMDEContent::class, [
+                'label' => 'La formation militante',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('memberJourney', SimpleMDEContent::class, [
+                'label' => 'Le parcours adhérent',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('mobilization', SimpleMDEContent::class, [
+                'label' => 'La mobilisation',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('talentDetection', SimpleMDEContent::class, [
+                'label' => 'Détecter les talents',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('electionPreparation', SimpleMDEContent::class, [
+                'label' => 'Préparer les élections',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('relationshipWithSupporters', SimpleMDEContent::class, [
+                'label' => 'Notre relation aux sympathisants, aux corps intermédiaires, à la société civile',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('workWithPartners', SimpleMDEContent::class, [
+                'label' => 'Notre travail avec les partenaires',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help_html' => true,
+            ])
+            ->add('additionalComments', SimpleMDEContent::class, [
+                'label' => 'Souhaitez-vous ajouter quelque chose ?',
+                'required' => false,
+                'attr' => ['rows' => 10],
+                'help' => 'help.markdown',
+                'help_html' => true,
+            ])
+        ;
+    }
+
+    protected function configureListFields(ListMapper $list): void
+    {
+        $list
+            ->add('departmentZone', null, [
+                'label' => 'Département',
+            ])
+            ->add('organizer', null, [
+                'label' => 'Instance organisatrice',
+                'template' => 'admin/general_convention/list_organizer.html.twig',
+            ])
+            ->add('district_or_committee', null, [
+                'label' => 'Circonscription ou Comité organisateur',
+                'virtual_field' => true,
+                'template' => 'admin/general_convention/list_district_or_committee.html.twig',
+            ])
+            ->add('reportedAt', null, [
+                'label' => 'Date',
+            ])
+            ->add('membersCount', null, [
+                'label' => 'Participants',
+            ])
+            ->add('reporter', null, [
+                'label' => 'Auteur',
+            ])
+            ->add(ListMapper::NAME_ACTIONS, null, [
+                'virtual_field' => true,
+                'actions' => [
+                    'edit' => [],
+                ],
+            ])
+        ;
+    }
+}
diff --git a/src/DataFixtures/ORM/LoadAdminData.php b/src/DataFixtures/ORM/LoadAdminData.php
index add697e84f..17fc086ac4 100644
--- a/src/DataFixtures/ORM/LoadAdminData.php
+++ b/src/DataFixtures/ORM/LoadAdminData.php
@@ -79,6 +79,7 @@ public function load(ObjectManager $manager): void
             'ROLE_ADMIN_TERRITOIRES_JME_GENERAL_MEETING_REPORTS',
             'ROLE_ADMIN_TERRITOIRES_JME_EMAIL_TEMPLATES',
             'ROLE_ADMIN_TERRITOIRES_ELUS_NOTIFICATION',
+            'ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS',
             'ROLE_ADMIN_PETITION',
         ]);
 
diff --git a/src/DataFixtures/ORM/LoadAdministratorRoleData.php b/src/DataFixtures/ORM/LoadAdministratorRoleData.php
index fd3821f853..346017e91f 100644
--- a/src/DataFixtures/ORM/LoadAdministratorRoleData.php
+++ b/src/DataFixtures/ORM/LoadAdministratorRoleData.php
@@ -325,6 +325,11 @@ private function getRoles(): \Generator
             'Administrateur des mandants & mandataires',
             AdministratorRoleGroupEnum::ELECTIONS
         );
+        yield $this->createRole(
+            'ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS',
+            'Administrateur des états généraux',
+            AdministratorRoleGroupEnum::TERRITOIRES
+        );
         // Application Mobile
         yield $this->createRole(
             'ROLE_ADMIN_APPLICATION_MOBILE_NOTIFICATIONS',
diff --git a/src/DataFixtures/ORM/LoadGeneralConventionData.php b/src/DataFixtures/ORM/LoadGeneralConventionData.php
new file mode 100644
index 0000000000..8da5b6b32f
--- /dev/null
+++ b/src/DataFixtures/ORM/LoadGeneralConventionData.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace App\DataFixtures\ORM;
+
+use App\Entity\Adherent;
+use App\Entity\GeneralConvention\GeneralConvention;
+use App\Entity\Geo\Zone;
+use App\GeneralConvention\MeetingTypeEnum;
+use App\GeneralConvention\OrganizerEnum;
+use App\GeneralConvention\ParticipantQuality;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Faker\Factory;
+use Faker\Generator;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
+
+class LoadGeneralConventionData extends Fixture implements DependentFixtureInterface
+{
+    private const UUID_1 = 'c5317499-7130-4255-a7f8-418e72f5dfa5';
+    private const UUID_2 = 'b3a2b082-01fc-4306-9fdb-6559ebe765b1';
+    private const UUID_3 = '54c9ae4c-3e2d-475d-8993-54639ec58ea1';
+
+    private Generator $faker;
+
+    public function __construct()
+    {
+        $this->faker = Factory::create('fr_FR');
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $manager->persist($this->createGeneralConvention(
+            Uuid::fromString(self::UUID_1),
+            LoadGeoZoneData::getZoneReference($manager, 'zone_department_92'),
+            OrganizerEnum::ASSEMBLY,
+            MeetingTypeEnum::ON_SITE,
+            ParticipantQuality::ADHERENT,
+            $this->getReference('adherent-3', Adherent::class),
+            new \DateTime('now'),
+        ));
+
+        $manager->persist($this->createGeneralConvention(
+            Uuid::fromString(self::UUID_2),
+            LoadGeoZoneData::getZoneReference($manager, 'zone_department_92'),
+            OrganizerEnum::COMMITTEE,
+            MeetingTypeEnum::REMOTE,
+            ParticipantQuality::SYMPATHIZER,
+            $this->getReference('adherent-3', Adherent::class),
+            new \DateTime('now'),
+            LoadGeoZoneData::getZoneReference($manager, 'zone_city_92024'),
+            null,
+            20,
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+        ));
+
+        $manager->persist($this->createGeneralConvention(
+            Uuid::fromString(self::UUID_3),
+            LoadGeoZoneData::getZoneReference($manager, 'zone_department_92'),
+            OrganizerEnum::DISTRICT,
+            MeetingTypeEnum::REMOTE,
+            ParticipantQuality::ADHERENT_BEFORE,
+            $this->getReference('adherent-3', Adherent::class),
+            new \DateTime('now'),
+            null,
+            LoadGeoZoneData::getZoneReference($manager, 'zone_district_92-4'),
+            10,
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+            $this->faker->text(),
+        ));
+
+        $manager->flush();
+    }
+
+    private function createGeneralConvention(
+        UuidInterface $uuid,
+        Zone $departmentZone,
+        OrganizerEnum $organizer,
+        MeetingTypeEnum $meetingType,
+        ParticipantQuality $participantQuality,
+        Adherent $reporter,
+        \DateTimeInterface $reportedAt,
+        ?Zone $committeeZone = null,
+        ?Zone $districtZone = null,
+        int $membersCount = 0,
+        ?string $generalSummary = null,
+        ?string $partyDefinitionSummary = null,
+        ?string $uniquePartySummary = null,
+        ?string $progressSince2016 = null,
+        ?string $partyObjectives = null,
+        ?string $governance = null,
+        ?string $communication = null,
+        ?string $militantTraining = null,
+        ?string $memberJourney = null,
+        ?string $mobilization = null,
+        ?string $talentDetection = null,
+        ?string $electionPreparation = null,
+        ?string $relationshipWithSupporters = null,
+        ?string $workWithPartners = null,
+        ?string $additionalComments = null,
+    ): GeneralConvention {
+        $generalConvention = new GeneralConvention($uuid);
+
+        $generalConvention->departmentZone = $departmentZone;
+        $generalConvention->organizer = $organizer;
+        $generalConvention->meetingType = $meetingType;
+        $generalConvention->participantQuality = $participantQuality;
+        $generalConvention->committeeZone = $committeeZone;
+        $generalConvention->districtZone = $districtZone;
+        $generalConvention->reporter = $reporter;
+        $generalConvention->reportedAt = $reportedAt;
+        $generalConvention->membersCount = $membersCount;
+        $generalConvention->generalSummary = $generalSummary;
+        $generalConvention->partyDefinitionSummary = $partyDefinitionSummary;
+        $generalConvention->uniquePartySummary = $uniquePartySummary;
+        $generalConvention->progressSince2016 = $progressSince2016;
+        $generalConvention->partyObjectives = $partyObjectives;
+        $generalConvention->governance = $governance;
+        $generalConvention->communication = $communication;
+        $generalConvention->militantTraining = $militantTraining;
+        $generalConvention->memberJourney = $memberJourney;
+        $generalConvention->mobilization = $mobilization;
+        $generalConvention->talentDetection = $talentDetection;
+        $generalConvention->electionPreparation = $electionPreparation;
+        $generalConvention->relationshipWithSupporters = $relationshipWithSupporters;
+        $generalConvention->workWithPartners = $workWithPartners;
+        $generalConvention->additionalComments = $additionalComments;
+
+        return $generalConvention;
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+            LoadAdherentData::class,
+        ];
+    }
+}
diff --git a/src/Entity/EntityIdentityTrait.php b/src/Entity/EntityIdentityTrait.php
index e21f8ce62f..7adad45a2d 100644
--- a/src/Entity/EntityIdentityTrait.php
+++ b/src/Entity/EntityIdentityTrait.php
@@ -130,6 +130,8 @@ trait EntityIdentityTrait
         'event_registration_list',
         'zone_based_role_read',
         'zone_based_role_write',
+        'general_convention_list',
+        'general_convention_read',
     ])]
     #[ORM\Column(type: 'uuid', unique: true)]
     protected $uuid;
diff --git a/src/Entity/GeneralConvention/GeneralConvention.php b/src/Entity/GeneralConvention/GeneralConvention.php
new file mode 100644
index 0000000000..a7864c25f1
--- /dev/null
+++ b/src/Entity/GeneralConvention/GeneralConvention.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Entity\GeneralConvention;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use App\Entity\Adherent;
+use App\Entity\EntityAdministratorBlameableTrait;
+use App\Entity\EntityIdentityTrait;
+use App\Entity\EntityTimestampableTrait;
+use App\Entity\Geo\Zone;
+use App\GeneralConvention\MeetingTypeEnum;
+use App\GeneralConvention\OrganizerEnum;
+use App\GeneralConvention\ParticipantQuality;
+use Doctrine\ORM\Mapping as ORM;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
+
+#[ApiResource(
+    operations: [
+        new GetCollection(
+            uriTemplate: '/general_conventions',
+            normalizationContext: ['groups' => ['general_convention_list']],
+        ),
+        new Get(
+            uriTemplate: '/general_conventions/{uuid}',
+            normalizationContext: ['groups' => ['general_convention_read']],
+        ),
+    ],
+)]
+#[ORM\Entity]
+class GeneralConvention
+{
+    use EntityIdentityTrait;
+    use EntityTimestampableTrait;
+    use EntityAdministratorBlameableTrait;
+
+    #[Assert\NotBlank]
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(targetEntity: Zone::class)]
+    public ?Zone $departmentZone = null;
+
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\ManyToOne(targetEntity: Zone::class)]
+    public ?Zone $committeeZone = null;
+
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\ManyToOne(targetEntity: Zone::class)]
+    public ?Zone $districtZone = null;
+
+    #[Assert\NotBlank]
+    #[Assert\Type(type: OrganizerEnum::class)]
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\Column(enumType: OrganizerEnum::class)]
+    public ?OrganizerEnum $organizer = null;
+
+    #[Assert\NotBlank]
+    #[ORM\JoinColumn(onDelete: 'SET NULL')]
+    #[ORM\ManyToOne(targetEntity: Adherent::class)]
+    public ?Adherent $reporter = null;
+
+    #[Assert\NotBlank]
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\Column(type: 'datetime')]
+    public ?\DateTimeInterface $reportedAt = null;
+
+    #[Assert\NotBlank]
+    #[Assert\Type(type: MeetingTypeEnum::class)]
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\Column(enumType: MeetingTypeEnum::class)]
+    public ?MeetingTypeEnum $meetingType = null;
+
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\Column(type: 'smallint', options: ['unsigned' => true, 'default' => 0])]
+    public int $membersCount = 0;
+
+    #[Assert\NotBlank]
+    #[Assert\Type(type: ParticipantQuality::class)]
+    #[Groups(['general_convention_list', 'general_convention_read'])]
+    #[ORM\Column(enumType: ParticipantQuality::class)]
+    public ?ParticipantQuality $participantQuality = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $generalSummary = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $partyDefinitionSummary = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $uniquePartySummary = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $progressSince2016 = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $partyObjectives = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $governance = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $communication = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $militantTraining = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $memberJourney = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $mobilization = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $talentDetection = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $electionPreparation = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $relationshipWithSupporters = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $workWithPartners = null;
+
+    #[Groups(['general_convention_read'])]
+    #[ORM\Column(type: 'text', nullable: true)]
+    public ?string $additionalComments = null;
+
+    public function __construct(?UuidInterface $uuid = null)
+    {
+        $this->uuid = $uuid ?? Uuid::uuid4();
+    }
+
+    public function __toString(): string
+    {
+        return $this->departmentZone;
+    }
+}
diff --git a/src/Entity/Geo/GeoTrait.php b/src/Entity/Geo/GeoTrait.php
index 0b45de7e97..b4e061084e 100644
--- a/src/Entity/Geo/GeoTrait.php
+++ b/src/Entity/Geo/GeoTrait.php
@@ -25,14 +25,14 @@ trait GeoTrait
     /**
      * @var string
      */
-    #[Groups(['zone_read', 'department_read', 'region_read', 'survey_list', 'survey_list_dc', 'survey_read_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'phoning_campaign_read', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'read_api', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'zone:code,type', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read'])]
+    #[Groups(['zone_read', 'department_read', 'region_read', 'survey_list', 'survey_list_dc', 'survey_read_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'phoning_campaign_read', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'read_api', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'zone:code,type', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read', 'general_convention_list', 'general_convention_read'])]
     #[ORM\Column(unique: true)]
     private $code;
 
     /**
      * @var string
      */
-    #[Groups(['zone_read', 'department_read', 'region_read', 'survey_list', 'survey_list_dc', 'survey_read_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'phoning_campaign_read', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read'])]
+    #[Groups(['zone_read', 'department_read', 'region_read', 'survey_list', 'survey_list_dc', 'survey_read_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'phoning_campaign_read', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read', 'general_convention_list', 'general_convention_read'])]
     #[ORM\Column]
     private $name;
 
diff --git a/src/Entity/Geo/Zone.php b/src/Entity/Geo/Zone.php
index 20292b71c4..c022f471f1 100644
--- a/src/Entity/Geo/Zone.php
+++ b/src/Entity/Geo/Zone.php
@@ -95,14 +95,14 @@ class Zone implements GeoInterface, UuidEntityInterface
      * @var UuidInterface
      */
     #[ApiProperty(identifier: true, openapiContext: ['type' => 'string', 'format' => 'uuid', 'example' => 'b4219d47-3138-5efd-9762-2ef9f9495084'])]
-    #[Groups(['zone_read', 'survey_write_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'survey_list_dc', 'survey_read_dc', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'formation_write', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'general_meeting_report_write', 'elected_mandate_write', 'action_read', 'department_site_write', 'committee:write', 'audience_write', 'profile_read', 'zone_based_role_write', 'zone_based_role_read'])]
+    #[Groups(['zone_read', 'survey_write_dc', 'scopes', 'scope', 'jecoute_news_read_dc', 'audience_read', 'audience_segment_read', 'survey_list_dc', 'survey_read_dc', 'team_read', 'team_list_read', 'pap_campaign_read', 'pap_campaign_read_after_write', 'phoning_campaign_read', 'phoning_campaign_list', 'department_site_read', 'department_site_read_list', 'elected_representative_read', 'elected_representative_list', 'formation_list_read', 'formation_read', 'formation_write', 'elected_mandate_read', 'adherent_elect_read', 'general_meeting_report_list_read', 'general_meeting_report_read', 'committee:read', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'general_meeting_report_write', 'elected_mandate_write', 'action_read', 'department_site_write', 'committee:write', 'audience_write', 'profile_read', 'zone_based_role_write', 'zone_based_role_read', 'general_convention_list', 'general_convention_read'])]
     #[ORM\Column(type: 'uuid', unique: true)]
     protected $uuid;
 
     /**
      * @var string
      */
-    #[Groups(['zone_read', 'scope', 'read_api', 'committee:read', 'zone:code,type', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read'])]
+    #[Groups(['zone_read', 'scope', 'read_api', 'committee:read', 'zone:code,type', 'managed_users_list', 'managed_user_read', 'procuration_request_read', 'procuration_request_list', 'procuration_proxy_list', 'procuration_matched_proxy', 'action_read', 'profile_read', 'zone_based_role_read', 'general_convention_list', 'general_convention_read'])]
     #[ORM\Column]
     private $type;
 
diff --git a/src/GeneralConvention/MeetingTypeEnum.php b/src/GeneralConvention/MeetingTypeEnum.php
new file mode 100644
index 0000000000..2c3b5eb1a3
--- /dev/null
+++ b/src/GeneralConvention/MeetingTypeEnum.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\GeneralConvention;
+
+enum MeetingTypeEnum: string
+{
+    case ON_SITE = 'on_site';
+    case REMOTE = 'remote';
+}
diff --git a/src/GeneralConvention/OrganizerEnum.php b/src/GeneralConvention/OrganizerEnum.php
new file mode 100644
index 0000000000..3f12936f3b
--- /dev/null
+++ b/src/GeneralConvention/OrganizerEnum.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GeneralConvention;
+
+enum OrganizerEnum: string
+{
+    case ASSEMBLY = 'assembly';
+    case DISTRICT = 'district';
+    case COMMITTEE = 'committee';
+}
diff --git a/src/GeneralConvention/ParticipantQuality.php b/src/GeneralConvention/ParticipantQuality.php
new file mode 100644
index 0000000000..bf39e1328f
--- /dev/null
+++ b/src/GeneralConvention/ParticipantQuality.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GeneralConvention;
+
+enum ParticipantQuality: string
+{
+    case ADHERENT = 'adherent';
+    case SYMPATHIZER = 'sympathizer';
+    case ADHERENT_BEFORE = 'adherent_before';
+}
diff --git a/templates/admin/general_convention/list_district_or_committee.html.twig b/templates/admin/general_convention/list_district_or_committee.html.twig
new file mode 100644
index 0000000000..6bceb0e024
--- /dev/null
+++ b/templates/admin/general_convention/list_district_or_committee.html.twig
@@ -0,0 +1,9 @@
+{% extends '@SonataAdmin/CRUD/base_list_field.html.twig' %}
+
+{% block field %}
+    {% if object.committeeZone %}
+        Comité: {{ object.committeeZone }}
+    {% elseif object.districtZone %}
+        Circonscription: {{ object.districtZone }}
+    {% endif %}
+{% endblock %}
diff --git a/templates/admin/general_convention/list_organizer.html.twig b/templates/admin/general_convention/list_organizer.html.twig
new file mode 100644
index 0000000000..cc11f2c5f0
--- /dev/null
+++ b/templates/admin/general_convention/list_organizer.html.twig
@@ -0,0 +1,5 @@
+{% extends '@SonataAdmin/CRUD/base_list_field.html.twig' %}
+
+{% block field %}
+    {{ ('general_convention.organizer.' ~ object.organizer.value)|trans }}
+{% endblock %}
diff --git a/translations/messages+intl-icu.fr.yml b/translations/messages+intl-icu.fr.yml
index 3856b8e7fc..a2dada8a0e 100644
--- a/translations/messages+intl-icu.fr.yml
+++ b/translations/messages+intl-icu.fr.yml
@@ -1308,3 +1308,17 @@ administrator_action_history.type.export: Export
 administrator_action_history.type.adherent_profile_update: Mise à jour du profil adhérent
 administrator_action_history.type.adherent_role_add: Ajout de rôle adhérent
 administrator_action_history.type.adherent_role_remove: Suppression de rôle adhérent
+
+#
+# GeneralConvention
+#
+general_convention.organizer.assembly: Assemblée
+general_convention.organizer.district: Circonscription
+general_convention.organizer.committee: Comité
+
+general_convention.meeting_type.on_site: Présentiel
+general_convention.meeting_type.remote: Visio
+
+general_convention.participant_quality.adherent: Adhérents
+general_convention.participant_quality.sympathizer: Sympathisants
+general_convention.participant_quality.adherent_before: Anciens adhérents