Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +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
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,13 @@ use Doctrine\ORM\Query\Expr;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use function in_array;
class CompositionFilter implements FilterInterface readonly class CompositionFilter implements FilterInterface
{ {
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) public function __construct(
{ private TranslatableStringHelper $translatableStringHelper,
private RollingDateConverterInterface $rollingDateConverter
) {
} }
public function addRole(): ?string public function addRole(): ?string
@ -35,25 +36,24 @@ class CompositionFilter implements FilterInterface
return null; return null;
} }
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data): void
{ {
if (!in_array('composition_type_filter', $qb->getAllAliases(), true)) { // there is no test on the aliases here: the name should be unique
$clause = $clause =
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->lte('composition_type_filter.startDate', ':ondate_composition_type_filter'), $qb->expr()->lte('composition_type_filter_composition.startDate', ':ondate_composition_type_filter'),
$qb->expr()->orX( $qb->expr()->orX(
$qb->expr()->gt('composition_type_filter.endDate', ':ondate_composition_type_filter'), $qb->expr()->gt('composition_type_filter_composition.endDate', ':ondate_composition_type_filter'),
$qb->expr()->isNull('composition_type_filter.endDate') $qb->expr()->isNull('composition_type_filter_composition.endDate')
) )
); );
$qb->join('household.compositions', 'composition', Expr\Join::WITH, $clause); $qb->join('household.compositions', 'composition_type_filter_composition', Expr\Join::WITH, $clause);
}
$whereClause = $qb->expr()->in('composition_type_filter.householdCompositionType', ':compositions'); $whereClause = $qb->expr()->in('composition_type_filter_composition.householdCompositionType', ':compositions_composition_type_filter');
$qb->andWhere($whereClause); $qb->andWhere($whereClause);
$qb->setParameter('compositions', $data['accepted_composition']); $qb->setParameter('compositions_composition_type_filter', $data['accepted_composition']);
$qb->setParameter( $qb->setParameter(
'ondate_composition_type_filter', 'ondate_composition_type_filter',
$this->rollingDateConverter->convert($data['on_date']) $this->rollingDateConverter->convert($data['on_date'])
@ -65,7 +65,7 @@ class CompositionFilter implements FilterInterface
return Declarations::HOUSEHOLD_TYPE; return Declarations::HOUSEHOLD_TYPE;
} }
public function buildForm(FormBuilderInterface $builder) public function buildForm(FormBuilderInterface $builder): void
{ {
$builder $builder
->add('accepted_composition', EntityType::class, [ ->add('accepted_composition', EntityType::class, [

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