From bd074ebade229eaf747dd9be8f914e0f09f883a9 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 May 2023 17:50:32 +0200
Subject: [PATCH] FEATURE [genericDoc][calendar] use metadatas

---
 ...anyingPeriodCalendarGenericDocProvider.php | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
index ff2cdbcf5..e653cfc25 100644
--- a/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
+++ b/src/Bundle/ChillCalendarBundle/Service/GenericDoc/Providers/AccompanyingPeriodCalendarGenericDocProvider.php
@@ -21,6 +21,7 @@ use Chill\DocStoreBundle\GenericDoc\GenericDocForAccompanyingPeriodProviderInter
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\MappingException;
 use Symfony\Component\Security\Core\Security;
 
 final class AccompanyingPeriodCalendarGenericDocProvider implements GenericDocForAccompanyingPeriodProviderInterface
@@ -39,6 +40,9 @@ final class AccompanyingPeriodCalendarGenericDocProvider implements GenericDocFo
         $this->em = $entityManager;
     }
 
+    /**
+     * @throws MappingException
+     */
     public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
     {
         $classMetadata = $this->em->getClassMetadata(CalendarDoc::class);
@@ -52,15 +56,23 @@ final class AccompanyingPeriodCalendarGenericDocProvider implements GenericDocFo
             $classMetadata->getSchemaName().'.'.$classMetadata->getTableName().' AS cd'
         );
         $query->addJoinClause(
-            'JOIN chill_doc.stored_object doc_store ON doc_store.id = cd.storedobject_id'
-        );
+            sprintf('JOIN %s doc_store ON doc_store.%s = cd.%s',
+            $storedObjectMetadata->getSchemaName().'.'.$storedObjectMetadata->getTableName(),
+            $storedObjectMetadata->getColumnName('id'),
+            $classMetadata->getSingleAssociationJoinColumnName('storedObject')
+        ));
 
         $query->addJoinClause(
-            'JOIN chill_calendar.calendar calendar ON calendar.id = cd.calendar_id'
+            sprintf('JOIN %s calendar ON calendar.%s = cd.%s',
+                $calendarMetadata->getSchemaName().'.'.$calendarMetadata->getTableName(),
+                $calendarMetadata->getColumnName('id'),
+                $classMetadata->getSingleAssociationJoinColumnName('calendar')
+            )
         );
 
         $query->addWhereClause(
-            'calendar.accompanyingperiod_id = ?',
+            sprintf('calendar.%s = ?',
+                $calendarMetadata->getAssociationMapping('accompanyingPeriod')['joinColumns'][0]['name']),
             [$accompanyingPeriod->getId()],
             [Types::INTEGER]
         );
@@ -83,7 +95,7 @@ final class AccompanyingPeriodCalendarGenericDocProvider implements GenericDocFo
 
         if (null !== $content) {
             $query->addWhereClause(
-                'doc_store.title ilike ?',
+                sprintf('doc_store.%s ilike ?', $storedObjectMetadata->getColumnName('title')),
                 ['%' . $content . '%'],
                 [Types::STRING]
             );