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

exports: test if a join is already loaded

Browse Source 
when a specific join has to be shared between combined filters/aggregators, we need to check if it has been already loaded.
we cannot load it into indicator because result is wrong
This commit is contained in:
Mathieu Jaumotte 2022-08-11 11:59:35 +02:00
parent 18c17818f6
commit 70488a935d
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
View File

@ -76,6 +76,10 @@ class ChildrenNumberAggregator implements AggregatorInterface
*/ */
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data)
{ {
if (!in_array('composition', $qb->getAllAliases())) {
$qb->join('household.compositions', 'composition');
}
$qb->addSelect('composition.numberOfChildren AS childrennumber_aggregator'); $qb->addSelect('composition.numberOfChildren AS childrennumber_aggregator');
$groupBy = $qb->getDQLPart('groupBy'); $groupBy = $qb->getDQLPart('groupBy');

4
src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
View File

@ -83,6 +83,10 @@ class CompositionAggregator implements AggregatorInterface
*/ */
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data)
{ {
if (!in_array('composition', $qb->getAllAliases())) {
$qb->join('household.compositions', 'composition');
}
$qb->addSelect('IDENTITY(composition.householdCompositionType) AS composition_aggregator'); $qb->addSelect('IDENTITY(composition.householdCompositionType) AS composition_aggregator');
$groupBy = $qb->getDQLPart('groupBy'); $groupBy = $qb->getDQLPart('groupBy');

1
src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
View File

@ -107,7 +107,6 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
->join('acppart.person', 'person') ->join('acppart.person', 'person')
->join('person.householdParticipations', 'householdmember') ->join('person.householdParticipations', 'householdmember')
->join('householdmember.household', 'household') ->join('householdmember.household', 'household')
->join('household.compositions', 'composition')
; ;
$qb->select('COUNT(DISTINCT householdmember.household) AS export_result'); $qb->select('COUNT(DISTINCT householdmember.household) AS export_result');

4
src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
View File

@ -85,6 +85,10 @@ class CompositionFilter implements FilterInterface
*/ */
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data)
{ {
if (!in_array('composition', $qb->getAllAliases())) {
$qb->join('household.compositions', 'composition');
}
$where = $qb->getDQLPart('where'); $where = $qb->getDQLPart('where');
$clause = $qb->expr()->andX( $clause = $qb->expr()->andX(