Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed: fix empty result in household api search

Browse Source 
fix https://gitlab.com/Chill-Projet/chill-bundles/-/issues/85
This commit is contained in:
Julien Fastré
2023-04-07 17:34:12 +02:00
parent 839b0fc826
commit a42a4ab9bd
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
View File

@@ -84,15 +84,19 @@ class SearchHouseholdApiProvider implements SearchApiInterface
count($phoneResult->getFound()) > 0 ? $phoneResult->getFound()[0] : null
);
$previousFrom = $query->getFromClause();
$previousParams = $query->getFromParams();
$query
->setDistinct(true, 'household_id')
->setDistinct(true, 'cpphm.household_id')
->setFromClause(
'view_chill_person_household_address AS vcpha ' .
'JOIN chill_person_person AS person ON vcpha.person_id = person.id'
$previousFrom . ' '.
'JOIN chill_person_household_members AS cpphm ON cpphm.person_id = person.id',
$previousParams
)
->andWhereClause('(cpphm.startDate <= NOW() AND (cpphm.endDate IS NULL or cpphm.endDate > NOW()))')
->setSelectKey('household')
->andWhereClause('vcpha.validTo IS NULL', [])
->setSelectJsonbMetadata("jsonb_build_object('id', vcpha.household_id)");
->setSelectJsonbMetadata("jsonb_build_object('id', cpphm.household_id)");
return $query;
}