[AdherentTags] keep last 6months event tags (#11462)

parti-renaissance · Feb 12, 2025 · 38e9e81 · 38e9e81
1 parent 09b72db
commit 38e9e81
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 61 deletions.
diff --git a/features/api/adherent_messages.feature b/features/api/adherent_messages.feature
@@ -423,9 +423,7 @@ Feature:
                                 "favorite": true,
                                 "choices": {
                                     "national_event:event-national-1": "Event National 1",
-                                    "national_event:event-national-2": "Event National 2",
-                                    "procuration:mandant": "Mandant",
-                                    "procuration:mandataire": "Mandataire"
+                                    "national_event:event-national-2": "Event National 2"
                                 }
                             },
                             "type": "select"

diff --git a/features/api/adherents.feature b/features/api/adherents.feature
@@ -868,9 +868,7 @@ Feature:
                                 "favorite": true,
                                 "choices": {
                                     "national_event:event-national-1": "Event National 1",
-                                    "national_event:event-national-2": "Event National 2",
-                                    "procuration:mandant": "Mandant",
-                                    "procuration:mandataire": "Mandataire"
+                                    "national_event:event-national-2": "Event National 2"
                                 }
                             },
                             "type": "select"

diff --git a/features/api/elected_representatives.feature b/features/api/elected_representatives.feature
@@ -410,9 +410,7 @@ Feature:
                                 "favorite": true,
                                 "choices": {
                                     "national_event:event-national-1": "Event National 1",
-                                    "national_event:event-national-2": "Event National 2",
-                                    "procuration:mandant": "Mandant",
-                                    "procuration:mandataire": "Mandataire"
+                                    "national_event:event-national-2": "Event National 2"
                                 }
                             },
                             "type": "select"

diff --git a/src/Adherent/Tag/StaticTag/TagBuilder.php b/src/Adherent/Tag/StaticTag/TagBuilder.php
@@ -20,7 +20,7 @@ public function __construct(
     public function buildAll(): array
     {
         return array_merge(
-            array_map([$this, 'buildForEvent'], $this->nationalEventRepository->findAll()),
+            array_map([$this, 'buildForEvent'], $this->nationalEventRepository->findAllSince(new \DateTime('-6 months'))),
             array_map(fn (AdherentStaticLabel $label) => $label->getIdentifier(), $this->staticLabelRepository->findAllLikeAdherentTags()),
         );
     }

diff --git a/src/Adherent/Tag/TagEnum.php b/src/Adherent/Tag/TagEnum.php
@@ -38,10 +38,6 @@ class TagEnum extends Enum
     public const NATIONAL_EVENT = 'national_event';
     public const NATIONAL_EVENT_PATTERN = self::NATIONAL_EVENT.':%s';
 
-    public const PROCURATION = 'procuration';
-    public const PROCURATION_PROXY = self::PROCURATION.':mandataire';
-    public const PROCURATION_REQUEST = self::PROCURATION.':mandant';
-
     public static function getAdherentTags(bool $adherentOnly = false): array
     {
         $currentYear = date('Y');
@@ -86,14 +82,6 @@ public static function getElectTags(): array
         ];
     }
 
-    public static function getStaticTags(): array
-    {
-        return [
-            self::PROCURATION_REQUEST,
-            self::PROCURATION_PROXY,
-        ];
-    }
-
     public static function getAdherentYearTag(?int $year = null, ?string $tag = null): string
     {
         $currentYear = date('Y');

diff --git a/src/Adherent/Tag/TagGenerator/ProcurationTagGenerator.php b/src/Adherent/Tag/TagGenerator/ProcurationTagGenerator.php
diff --git a/src/Admin/Filter/StaticAdherentTagFilter.php b/src/Admin/Filter/StaticAdherentTagFilter.php
@@ -3,7 +3,6 @@
 namespace App\Admin\Filter;
 
 use App\Adherent\Tag\StaticTag\TagBuilder;
-use App\Adherent\Tag\TagEnum;
 use Symfony\Contracts\Service\Attribute\Required;
 
 class StaticAdherentTagFilter extends AdherentTagFilter
@@ -18,6 +17,6 @@ public function setTagBuilder(TagBuilder $eventTagBuilder): void
 
     protected function getTags(): array
     {
-        return array_merge($this->tagBuilder->buildAll(), TagEnum::getStaticTags());
+        return $this->tagBuilder->buildAll();
     }
 }
diff --git a/src/JMEFilter/FilterBuilder/StaticTagsFilterBuilder.php b/src/JMEFilter/FilterBuilder/StaticTagsFilterBuilder.php
@@ -3,7 +3,6 @@
 namespace App\JMEFilter\FilterBuilder;
 
 use App\Adherent\Tag\StaticTag\TagBuilder;
-use App\Adherent\Tag\TagEnum;
 use App\Adherent\Tag\TagTranslator;
 use App\JMEFilter\FilterGroup\MilitantFilterGroup;
 
@@ -16,7 +15,7 @@ public function __construct(TagTranslator $translator, private readonly TagBuild
 
     protected function init(): void
     {
-        $this->tags = array_merge($this->eventTagBuilder->buildAll(), TagEnum::getStaticTags());
+        $this->tags = $this->eventTagBuilder->buildAll();
 
         $this->fieldName = 'static_tags';
         $this->fieldLabel = 'Labels divers';

diff --git a/src/Repository/NationalEvent/EventInscriptionRepository.php b/src/Repository/NationalEvent/EventInscriptionRepository.php
@@ -30,7 +30,9 @@ public function findAllByAdherent(Adherent $adherent): array
             ->addSelect('e')
             ->innerJoin('ei.event', 'e')
             ->where('ei.adherent = :adherent')
+            ->andWhere('e.startDate >= :start_date')
             ->setParameter('adherent', $adherent)
+            ->setParameter('start_date', new \DateTime('-6 months'))
             ->getQuery()
             ->getResult()
         ;

diff --git a/src/Repository/NationalEvent/NationalEventRepository.php b/src/Repository/NationalEvent/NationalEventRepository.php
@@ -27,4 +27,14 @@ public function findOneBySlug(string $part): ?NationalEvent
     {
         return $this->findOneBy(['slug' => $part]);
     }
+
+    public function findAllSince(\DateTime $since): array
+    {
+        return $this->createQueryBuilder('event')
+            ->where('event.startDate >= :start_date')
+            ->setParameter('start_date', $since)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
 }
diff --git a/translations/messages+intl-icu.fr.yml b/translations/messages+intl-icu.fr.yml
@@ -1236,9 +1236,6 @@ adherent.tag.exempte: Exempté de cotisation
 adherent.tag.cotisation_nok: Non à jour de cotisation
 adherent.tag.exempte_et_adherent_cotisation_nok: Exempté mais pas à jour de cotisation adhérent
 adherent.tag.national_event: Événement national
-adherent.tag.procuration: Procuration
-adherent.tag.mandant: Mandant
-adherent.tag.mandataire: Mandataire
 
 adhesion.physical_person.label: Je certifie sur l’honneur être une personne physique d’au moins 16 ans et que le règlement de ma cotisation ne provient pas du compte d’une personne morale (entreprise, association, collectivité...) mais bien de mon compte bancaire personnel.<br/><br/>Je certifie être de nationalité française ou résident fiscal Français.<br/><br/>J’adhère aux <a href="https://app.parti-renaissance.fr/assets/static/Statuts-Renaissance.pdf" class="text-ui_blue-50">Statuts</a> et au <a href="https://app.parti-renaissance.fr/assets/corpus-des-valeurs-parti-renaissance.pdf" class="text-ui_blue-50">Corpus des valeurs</a> de Renaissance.<br/><br/>J’accepte les <a href="https://parti-renaissance.fr/cgu" class="text-ui_blue-50">CGU du site</a> Renaissance et déclare avoir lu la <a href="https://parti-renaissance.fr/politique-de-protection-des-donnees" class="text-ui_blue-50">Politique de protection des données personnelles</a> et les mentions d’information relatives au traitement de mes données ci-dessous.