From 9f2ecff63ed811983a438a2de4c0265dffaf715c Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 26 Sep 2022 18:52:00 +0200
Subject: [PATCH] exports: ResidentialAddressAt ThirdParty/User Filter, improve
 query (issue637 et issue638)

---
 .../ResidentialAddressAtThirdpartyFilter.php  | 11 +++++++++--
 .../ResidentialAddressAtUserFilter.php        | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
index c96fd680f..2770ae82f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
@@ -56,10 +56,17 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
         }
 
         $where = $qb->getDQLPart('where');
+
         $clause = $qb->expr()->andX(
             $qb->expr()->isNotNull('resaddr.hostThirdParty'),
-            $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
-            $qb->expr()->in('tpartycat.id', ':type')
+            $qb->expr()->in('tpartycat.id', ':type'),
+            $qb->expr()->orX(
+                $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
+                $qb->expr()->andX(
+                    $qb->expr()->lte('resaddr.startDate', ':date'),
+                    $qb->expr()->isNull('resaddr.endDate')
+                )
+            )
         );
 
         if ($where instanceof Expr\Andx) {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
index 482312143..7c07121e1 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
@@ -36,7 +37,17 @@ class ResidentialAddressAtUserFilter implements FilterInterface
         }
 
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->isNotNull('resaddr.hostPerson');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->isNotNull('resaddr.hostPerson'),
+            $qb->expr()->orX(
+                $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
+                $qb->expr()->andX(
+                    $qb->expr()->lte('resaddr.startDate', ':date'),
+                    $qb->expr()->isNull('resaddr.endDate')
+                )
+            )
+        );
 
         if ($where instanceof Andx) {
             $where->add($clause);
@@ -44,6 +55,7 @@ class ResidentialAddressAtUserFilter implements FilterInterface
             $where = $qb->expr()->andX($clause);
         }
 
+        $qb->setParameter('date', $data['date_calc']);
         $qb->add('where', $where);
     }
 
@@ -54,7 +66,10 @@ class ResidentialAddressAtUserFilter implements FilterInterface
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        // No form needed unless validity date should be added ( not specified in doc as a parameter ).
+        $builder->add('date_calc', ChillDateType::class, [
+            'label' => 'Date during which residential address was valid',
+            'data' => new \DateTime('now'),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')