Export: add clauses on the social work start date and end date within the filter "Filter accompanying period by accompanying period work"'

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php

@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
@@ -19,10 +21,17 @@ use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class SocialActionFilter implements FilterInterface
 {
-    public function __construct(private SocialActionRender $actionRender) {}
+    private const PREFIX = 'acp_by_social_action_filter';
+
+    public function __construct(
+        private SocialActionRender $actionRender,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatorInterface $translator
+    ) {}
 
     public function addRole(): ?string
     {
@@ -31,17 +40,40 @@ final readonly class SocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->andWhere(
-            $qb->expr()->exists(
-                sprintf(
-                    'SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.socialAction '
-                    .'IN (:acp_by_social_action_filter_actions) AND acp_by_social_action_filter.accompanyingPeriod = acp',
-                    AccompanyingPeriod\AccompanyingPeriodWork::class
-                )
-            )
-        );
+        $p = self::PREFIX;
 
-        $qb->setParameter('acp_by_social_action_filter_actions', SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions']));
+        $dql =
+            sprintf(
+                'SELECT 1 FROM %s acp_by_social_action_filter WHERE acp_by_social_action_filter.accompanyingPeriod = acp ',
+                AccompanyingPeriod\AccompanyingPeriodWork::class
+            );
+
+        if (0 < count($data['accepted_socialactions'])) {
+            $dql .= 'AND acp_by_social_action_filter.socialAction IN (:acp_by_social_action_filter_actions)';
+            $qb->setParameter("{$p}_actions", SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions']));
+        }
+
+        if (null !== ($data['start_date_after'] ?? null)) {
+            $dql .= " AND acp_by_social_action_filter.startDate > :{$p}_start_date_after";
+            $qb->setParameter("{$p}_start_date_after", $this->rollingDateConverter->convert($data['start_date_after']));
+        }
+
+        if (null !== ($data['start_date_before'] ?? null)) {
+            $dql .= " AND acp_by_social_action_filter.startDate <= :{$p}_start_date_before";
+            $qb->setParameter("{$p}_start_date_before", $this->rollingDateConverter->convert($data['start_date_before']));
+        }
+
+        if (null !== ($data['end_date_after'] ?? null)) {
+            $dql .= " AND acp_by_social_action_filter.endDate > :{$p}_end_date_after OR acp_by_social_action_filter.endDate IS NULL";
+            $qb->setParameter("{$p}_end_date_after", $this->rollingDateConverter->convert($data['end_date_after']));
+        }
+
+        if (null !== ($data['end_date_before'] ?? null)) {
+            $dql .= " AND acp_by_social_action_filter.endDate <= :{$p}_end_date_before OR acp_by_social_action_filter.endDate IS NULL";
+            $qb->setParameter("{$p}_end_date_before", $this->rollingDateConverter->convert($data['end_date_before']));
+        }
+
+        $qb->andWhere($qb->expr()->exists($dql));
     }
 
     public function applyOn(): string
@@ -51,14 +83,44 @@ final readonly class SocialActionFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_socialactions', PickSocialActionType::class, [
-            'multiple' => true,
-        ]);
+        $builder
+            ->add('accepted_socialactions', PickSocialActionType::class, [
+                'multiple' => true,
+                'label' => 'export.filter.course.by_social_action.Accepted socialactions',
+                'help' => 'export.filter.course.by_social_action.accepted socialations help',
+            ])
+            ->add('start_date_after', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_social_action.start date after',
+                'help' => 'export.filter.course.by_social_action.start date after help',
+                'required' => false,
+            ])
+            ->add('start_date_before', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_social_action.start date before',
+                'help' => 'export.filter.course.by_social_action.start date before help',
+                'required' => false,
+            ])
+            ->add('end_date_after', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_social_action.end date after',
+                'help' => 'export.filter.course.by_social_action.end date after help',
+                'required' => false,
+            ])
+            ->add('end_date_before', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_social_action.end date before',
+                'help' => 'export.filter.course.by_social_action.end date before help',
+                'required' => false,
+            ])
+        ;
     }
 
     public function getFormDefaultData(): array
     {
-        return [];
+        return [
+            'accepted_social_actions' => [],
+            'start_date_after' => null,
+            'start_date_before' => null,
+            'end_date_after' => null,
+            'end_date_before' => null,
+        ];
     }
 
     public function describeAction($data, $format = 'string'): array
@@ -73,13 +135,17 @@ final readonly class SocialActionFilter implements FilterInterface
             ]);
         }
 
-        return ['Filtered by socialactions: only %socialactions%', [
+        return ['export.filter.course.by_social_action.Filtered by socialactions: only %socialactions%', [
             '%socialactions%' => implode(', ', $actions),
+            '%start_date_after%' => null === ($data['start_date_after'] ?? null) ? '('.$this->translator->trans('export.filter.course.by_social_action.date ignored').')' : $this->rollingDateConverter->convert($data['start_date_after'])->format('d-m-Y'),
+            '%start_date_before%' => null === ($data['start_date_before'] ?? null) ? '('.$this->translator->trans('export.filter.course.by_social_action.date ignored').')' : $this->rollingDateConverter->convert($data['start_date_before'])->format('d-m-Y'),
+            '%end_date_after%' => null === ($data['end_date_after'] ?? null) ? '('.$this->translator->trans('export.filter.course.by_social_action.date ignored').')' : $this->rollingDateConverter->convert($data['end_date_after'])->format('d-m-Y'),
+            '%end_date_before%' => null === ($data['end_date_before'] ?? null) ? '('.$this->translator->trans('export.filter.course.by_social_action.date ignored').')' : $this->rollingDateConverter->convert($data['end_date_before'])->format('d-m-Y'),
         ]];
     }
 
     public function getTitle(): string
     {
-        return 'Filter by socialaction';
+        return 'export.filter.course.by_social_action.title';
     }
 }