[VoteAg] allow to create Vote election (#10893)

parti-renaissance · Oct 21, 2024 · 15ed82f · 15ed82f
1 parent 344c968
commit 15ed82f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/Entity/VotingPlatform/Designation/Designation.php b/src/Entity/VotingPlatform/Designation/Designation.php
@@ -123,7 +123,7 @@ class Designation implements EntityAdministratorBlameableInterface, EntityAdhere
     #[ORM\Column]
     private $type;
 
-    #[Assert\Expression('!this.isConsultationType() or value', groups: ['api_designation_write', 'api_designation_write_limited'])]
+    #[Assert\Expression('!(this.isConsultationType() or this.isVoteType()) or value', groups: ['api_designation_write', 'api_designation_write_limited'])]
     #[Groups(['designation_read', 'designation_write'])]
     #[ORM\Column(type: 'smallint', nullable: true)]
     public ?int $targetYear = null;
@@ -236,7 +236,7 @@ class Designation implements EntityAdministratorBlameableInterface, EntityAdhere
     #[ORM\Column(type: 'boolean')]
     private bool $isBlankVoteEnabled = true;
 
-    #[Assert\Expression('!(this.isLocalPollType() || this.isConsultationType()) or value', message: 'Vous devez préciser le questionnaire qui sera utilisé pour cette élection.', groups: ['Admin_creation', 'api_designation_write'])]
+    #[Assert\Expression('!(this.isLocalPollType() or this.isConsultationType() or this.isVoteType()) or value', message: 'Vous devez préciser le questionnaire qui sera utilisé pour cette élection.', groups: ['Admin_creation', 'api_designation_write'])]
     #[Assert\Valid(groups: ['api_designation_write'])]
     #[ORM\ManyToOne(targetEntity: Poll::class, cascade: ['persist'])]
     public ?Poll $poll = null;
@@ -668,6 +668,7 @@ public function isDenominationEditable(): bool
             !$this->isLocalElectionTypes()
             && !$this->isCommitteeSupervisorType()
             && !$this->isConsultationType()
+            && !$this->isVoteType()
             && !$this->isTerritorialAssemblyType();
     }
 

diff --git a/src/Normalizer/DesignationDenormalizer.php b/src/Normalizer/DesignationDenormalizer.php
@@ -38,7 +38,7 @@ public function denormalize($data, string $class, ?string $format = null, array
                 if ($designation->getCandidacyEndDate() !== $voteDate = $designation->getVoteStartDate()) {
                     $designation->setCandidacyEndDate($voteDate);
                 }
-            } elseif ($designation->isConsultationType()) {
+            } elseif ($designation->isConsultationType() || $designation->isVoteType()) {
                 $designation->alertTitle = $designation->alertTitle ?: $designation->getTitle();
                 $designation->alertCtaLabel = $designation->alertCtaLabel ?: 'Voir';
                 $designation->alertDescription = $designation->alertDescription ?: (new UnicodeString($designation->getDescription() ?? ''))->truncate(200, '…', false);

diff --git a/src/Repository/AdherentRepository.php b/src/Repository/AdherentRepository.php
@@ -1322,13 +1322,15 @@ public function findAllForConsultation(int $minYear, array $zones): array
             ->setParameter('status', Adherent::ENABLED)
         ;
 
+        $condition = new Orx();
+
         foreach (range($minYear, date('Y')) as $key => $year) {
-            $qb
-                ->orWhere('a.tags LIKE :tag'.$key)
-                ->setParameter('tag'.$key, '%'.TagEnum::getAdherentYearTag($year).'%')
-            ;
+            $condition->add('a.tags LIKE :tag'.$key);
+            $qb->setParameter('tag'.$key, '%'.TagEnum::getAdherentYearTag($year).'%');
         }
 
+        $qb->andWhere($condition);
+
         $this->withGeoZones(
             $zones,
             $qb,

diff --git a/src/Repository/VotingPlatform/DesignationRepository.php b/src/Repository/VotingPlatform/DesignationRepository.php
@@ -174,10 +174,7 @@ public function findAllActiveForAdherent(Adherent $adherent, array $types = [],
                 false
             );
 
-            $conditions->add(
-                \sprintf('(designation.electionCreationDate IS NULL OR designation.electionCreationDate > :adhesion_date) AND designation.id IN (%s)', $zoneQueryBuilder->getDQL())
-            );
-            $queryBuilder->setParameter('adhesion_date', $adherent->getRegisteredAt());
+            $conditions->add(\sprintf('designation.id IN (%s)', $zoneQueryBuilder->getDQL()));
         }
 
         $votingPlatformElectionQueryBuilder = $this->getEntityManager()->createQueryBuilder()

diff --git a/src/Security/Voter/VotingPlatformAbleToVoteVoter.php b/src/Security/Voter/VotingPlatformAbleToVoteVoter.php
@@ -39,7 +39,7 @@ protected function doVoteOnAttribute(string $attribute, Adherent $adherent, $sub
             return false;
         }
 
-        if ($designation->isConsultationType()) {
+        if ($designation->isConsultationType() || $designation->isVoteType()) {
             if ($designation->targetYear) {
                 $foundTargetTag = false;
                 foreach (range($designation->targetYear, date('Y')) as $year) {
@@ -76,7 +76,7 @@ protected function doVoteOnAttribute(string $attribute, Adherent $adherent, $sub
 
         if (!$adherentIsInVotersList) {
             // Allow to vote adherent who are not on the list for CONSULTATION election
-            if ($designation->isConsultationType()) {
+            if ($designation->isConsultationType() || $designation->isVoteType()) {
                 return true;
             }
 

diff --git a/src/VotingPlatform/Notifier/ElectionNotifier.php b/src/VotingPlatform/Notifier/ElectionNotifier.php
@@ -192,7 +192,7 @@ private function sendNotification(int $notification, Election $election, callabl
 
         $this->batchSendEmail($getRecipientsCallback, $createMessageCallback);
 
-        $election->markSentNotification(Designation::NOTIFICATION_VOTE_OPENED);
+        $election->markSentNotification($notification);
         $this->entityManager->flush();
     }