Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

DX: do not use complicated condtiion to add a group by

Browse Source
This commit is contained in:
Julien Fastré 2022-10-06 23:24:07 +02:00
parent c7de95c635
commit f5997e39cd
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
View File

@ -40,14 +40,7 @@ final class LocationAggregator implements AggregatorInterface
$qb->join('cal.location', 'calloc'); $qb->join('cal.location', 'calloc');
} }
$qb->addSelect('IDENTITY(cal.location) as location_aggregator'); $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
$qb->addGroupBy('location_aggregator');
$groupBy = $qb->getDQLPart('groupBy');
if (!empty($groupBy)) {
$qb->addGroupBy('location_aggregator');
} else {
$qb->groupBy('location_aggregator');
}
} }
public function applyOn(): string public function applyOn(): string

13
src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
View File

@ -28,13 +28,7 @@ class MonthYearAggregator implements AggregatorInterface
{ {
$qb->addSelect("to_char(cal.startDate, 'MM-YYYY') AS month_year_aggregator"); $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"); // $qb->addSelect("extract(month from age(cal.startDate, cal.endDate)) AS month_aggregator");
$groupBy = $qb->getDQLPart('groupBy'); $qb->addGroupBy('month_year_aggregator');
if (!empty($groupBy)) {
$qb->addGroupBy('month_year_aggregator');
} else {
$qb->groupBy('month_year_aggregator');
}
} }
public function applyOn(): string public function applyOn(): string
@ -54,10 +48,7 @@ class MonthYearAggregator implements AggregatorInterface
return 'by month and year'; return 'by month and year';
} }
$month = substr($value, 0, 2); return $value;
$year = substr($value, 3, 4);
return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
}; };
} }

9
src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
View File

@ -46,14 +46,7 @@ final class ScopeAggregator implements AggregatorInterface
} }
$qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator'); $qb->addSelect('IDENTITY(caluser.mainScope) as scope_aggregator');
$qb->addGroupBy('scope_aggregator');
$groupBy = $qb->getDQLPart('groupBy');
if (!empty($groupBy)) {
$qb->addGroupBy('scope_aggregator');
} else {
$qb->groupBy('scope_aggregator');
}
} }
public function applyOn(): string public function applyOn(): string