From f5997e39cd30a47a547d60cef40bd8676175c425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 6 Oct 2022 23:24:07 +0200
Subject: [PATCH] DX: do not use complicated condtiion to add a group by

---
 .../Export/Aggregator/LocationAggregator.php        |  9 +--------
 .../Export/Aggregator/MonthYearAggregator.php       | 13 ++-----------
 .../Export/Aggregator/ScopeAggregator.php           |  9 +--------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
index 704278b8d..cdd4c4b03 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
@@ -40,14 +40,7 @@ final class LocationAggregator implements AggregatorInterface
             $qb->join('cal.location', 'calloc');
         }
         $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_aggregator');
-        } else {
-            $qb->groupBy('location_aggregator');
-        }
+        $qb->addGroupBy('location_aggregator');
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
index 54c9584e8..11c6414ed 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
@@ -28,13 +28,7 @@ class MonthYearAggregator implements AggregatorInterface
     {
         $qb->addSelect("to_char(cal.startDate, 'MM-YYYY') AS month_year_aggregator");
         // $qb->addSelect("extract(month from age(cal.startDate, cal.endDate)) AS month_aggregator");
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('month_year_aggregator');
-        } else {
-            $qb->groupBy('month_year_aggregator');
-        }
+        $qb->addGroupBy('month_year_aggregator');
     }
 
     public function applyOn(): string
@@ -54,10 +48,7 @@ class MonthYearAggregator implements AggregatorInterface
                 return 'by month and year';
             }
 
-            $month = substr($value, 0, 2);
-            $year = substr($value, 3, 4);
-
-            return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
+            return $value;
         };
     }
 
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
index e8d0c7752..11a71654e 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
@@ -46,14 +46,7 @@ final class ScopeAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
+        $qb->addGroupBy('scope_aggregator');
     }
 
     public function applyOn(): string