Task 266725

- ApiController: eventService injected - Refactoring changed event to event_participation in Participant, EventParticipation & Dependencies - changed Maria DB version
AOEpeople · Jan 14, 2025 · fbc99de · fbc99de
1 parent c09c68f
commit fbc99de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
@@ -11,7 +11,7 @@ additional_fqdns:
     - meals.test
 database:
     type: mariadb
-    version: "10.2"
+    version: "10.11"
 performance_mode: none
 hooks:
     post-start:

diff --git a/src/Mealz/MealBundle/Entity/EventParticipation.php b/src/Mealz/MealBundle/Entity/EventParticipation.php
@@ -29,7 +29,7 @@ class EventParticipation
     #[ORM\JoinColumn(name: 'event', referencedColumnName: 'id')]
     public Event $event;
 
-    #[ORM\OneToMany(mappedBy: 'event', targetEntity: Participant::class, cascade: ['persist', 'remove'])]
+    #[ORM\OneToMany(mappedBy: 'event_participation', targetEntity: Participant::class, cascade: ['persist', 'remove'])]
     public ?Collection $participants = null;
 
     public function __construct(Day $day, Event $event, ?Collection $participants = null)

diff --git a/src/Mealz/MealBundle/Entity/Participant.php b/src/Mealz/MealBundle/Entity/Participant.php
@@ -101,14 +101,14 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function getEvent(): ?EventParticipation
+    public function getEventParticipation(): ?EventParticipation
     {
         return $this->event_participation;
     }
 
-    public function setEvent(EventParticipation $event): void
+    public function setEventParticipation(EventParticipation $event_participation): void
     {
-        $this->event_participation = $event;
+        $this->event_participation = $event_participation;
     }
 
     public function setMeal(Meal $meal): void

diff --git a/src/Mealz/MealBundle/EventListener/ParticipantPersistenceListener.php b/src/Mealz/MealBundle/EventListener/ParticipantPersistenceListener.php
@@ -48,7 +48,7 @@ private function participantExists(Participant $participant, EntityManager $enti
 
         if (null !== $participant->getMeal()) {
             $query = $this->buildQueryMealParticipantExists($participant, $queryBuilder);
-        } elseif (null !== $participant->getEvent()) {
+        } elseif (null !== $participant->getEventParticipation()) {
             $query = $this->buildQueryEventParticipantExists($participant, $queryBuilder);
         } else {
             return false;
@@ -84,17 +84,17 @@ private function buildQueryEventParticipantExists(Participant $participant, Quer
         $queryBuilder
             ->select('COUNT(p.id)')
             ->from(Participant::class, 'p')
-            ->join('p.event', 'e')
+            ->join('p.event_participation', 'e')
             ->join('p.profile', 'u')
-            ->where('e = :event AND u = :profile')
+            ->where('e = :event_participation AND u = :profile')
         ;
         if ($participant->getId()) {
             $queryBuilder->andWhere('p.id != :id');
             $queryBuilder->setParameter('id', $participant->getId());
         }
 
         $query = $queryBuilder->getQuery();
-        $query->setParameter('event', $participant->getEvent()->getId());
+        $query->setParameter('event_participation', $participant->getEventParticipation()->getId());
         $query->setParameter('profile', $participant->getProfile()->getUsername());
         $query->disableResultCache();