Przeglądaj źródła

https://assistance.opentalent.fr/browse/V8-1801

Olivier Massot 4 lat temu
rodzic
commit
1be13ebbcc
1 zmienionych plików z 10 dodań i 10 usunięć
  1. 10 10
      ot_core/Classes/Domain/Repository/EventRepository.php

+ 10 - 10
ot_core/Classes/Domain/Repository/EventRepository.php

@@ -49,12 +49,12 @@ class EventRepository extends BaseApiRepository
         }
         if ($fromDate !== null) {
             // Inutile a priori: la view de l'API s'en occupe déjà en amont
-            $params['filter[where][datetimeEnd][gte]'] = $fromDate->format('c');
+            $params['filter[where][datetimeStart][gte]'] = $fromDate->format('c');
         }
         if ($toDate !== null) {
-            $params['filter[where][datetimeStart][lte]'] = $toDate->format('c');
+            $params['filter[where][datetimeEnd][lte]'] = $toDate->format('c');
         }
-        $params['filter[order][0][datetimeEnd]'] = 'ASC';
+        $params['filter[order][0][datetimeStart]'] = 'ASC';
 
         return $this->getApiRecords($this::URI, $params);
     }
@@ -84,10 +84,10 @@ class EventRepository extends BaseApiRepository
         }
         if ($fromDate !== null) {
             // Inutile a priori: la view de l'API s'en occupe déjà en amont
-            $params['filter[where][datetimeEnd][gte]'] = $fromDate->format('c');
+            $params['filter[where][datetimeStart][gte]'] = $fromDate->format('c');
         }
         if ($toDate !== null) {
-            $params['filter[where][datetimeStart][lte]'] = $toDate->format('c');
+            $params['filter[where][datetimeEnd][lte]'] = $toDate->format('c');
         }
         $params['filter[order][0][datetimeStart]'] = 'ASC';
 
@@ -115,10 +115,10 @@ class EventRepository extends BaseApiRepository
         }
         if ($fromDate !== null) {
             // Inutile a priori: la view de l'API s'en occupe déjà en amont
-            $params['filter[where][datetimeEnd][gte]'] = $fromDate->format('c');
+            $params['filter[where][datetimeStart][gte]'] = $fromDate->format('c');
         }
         if ($toDate !== null) {
-            $params['filter[where][datetimeStart][lte]'] = $toDate->format('c');
+            $params['filter[where][datetimeEnd][lte]'] = $toDate->format('c');
         }
         $params['filter[order][0][datetimeStart]'] = 'ASC';
 
@@ -139,7 +139,7 @@ class EventRepository extends BaseApiRepository
     public function searchBy(int $organizationId, $searchParams = []) {
         $params = [];
         $params['organizationId'] = $organizationId;
-        $params['filter[order][0][datetimeEnd]'] = 'ASC';
+        $params['filter[order][0][datetimeStart]'] = 'ASC';
         $params = array_merge($params, $searchParams);
 
         return $this->getApiRecords($this::URI, $params);
@@ -167,9 +167,9 @@ class EventRepository extends BaseApiRepository
         $dateStart = new \DateTime($record['datetimeStart']);
         $dateStart->setTimezone(new \DateTimeZone('Europe/Paris'));
         $event->setDatetimeStart($dateStart);
-        $dateEnd = new \DateTime($record['datetimeStart']);
+        $dateEnd = new \DateTime($record['datetimeEnd']);
         $dateEnd->setTimezone(new \DateTimeZone('Europe/Paris'));
-        $event->setDatetimeEnd(new \DateTime($record['datetimeEnd'], new DateTimeZone("Europe/Paris")));
+        $event->setDatetimeEnd($dateEnd);
         $event->setDates($record['dates']);
         $event->setPlacename($record['placeName']);
         $event->setPlaceDescription($record['placeDescription']);