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

Fix CompositionFilter

Browse Source
This commit is contained in:
Julien Fastré
2023-09-12 15:42:13 +02:00
parent 899ed5d0a4
commit b36e37d9c5
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
View File

@@ -15,9 +15,8 @@ use Chill\MainBundle\Service\RollingDate\RollingDate;
use Chill\MainBundle\Test\Export\AbstractFilterTest;
use Chill\PersonBundle\Entity\Household\Household;
use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
use Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter;
use DateTime;
use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
/**
@@ -35,7 +34,7 @@ final class CompositionFilterTest extends AbstractFilterTest
$this->filter = self::$container->get('chill.person.export.filter_household_composition');
}
public function getFilter()
public function getFilter(): CompositionFilter
{
return $this->filter;
}
@@ -78,7 +77,7 @@ final class CompositionFilterTest extends AbstractFilterTest
->join('acppart.accompanyingPeriod', 'acp')
->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
->andWhere('hmember.startDate <= :count_household_at_date AND (hmember.endDate IS NULL OR hmember.endDate > :count_household_at_date)')
->setParameter('count_household_at_date', new \DateTimeImmutable('today'));
->setParameter('count_household_at_date', new DateTimeImmutable('today'));
$qb
->select('COUNT(DISTINCT household.id) AS household_export_result')