Merge branch '143-doublon-list-acp' into 'master'

SocialActionFilter: use a subquery "exists" instead of a where clause (many-to-many association).

Closes #143

See merge request Chill-Projet/chill-bundles!590

.changes/unreleased/Fixed-20230913-122616.yaml

@@ -0,0 +1,5 @@
+kind: Fixed
+body: Fix filter "accompanying course by social action" to avoid duplication in list
+time: 2023-09-13T12:26:16.38720953+02:00
+custom:
+  Issue: "143"

.changes/unreleased/Fixed-20231002-120602.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: From the database, avoid the creation of location history for same period and
+  at same dates
+time: 2023-10-02T12:06:02.412233177+02:00
+custom:
+  Issue: "143"

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

@@ -12,28 +12,17 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class SocialActionFilter implements FilterInterface
+final readonly class SocialActionFilter implements FilterInterface
 {
-    private SocialActionRender $actionRender;
+    public function __construct(private SocialActionRender $actionRender) {}
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        SocialActionRender $actionRender
-    ) {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->actionRender = $actionRender;
-    }
 
     public function addRole(): ?string
     {
@@ -42,21 +31,17 @@ class SocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        $qb->andWhere(
-            $qb->join('acp.works', 'acpw');
+            $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
+                )
+            )
+        );
 
-        if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
+        $qb->setParameter('acp_by_social_action_filter_actions', SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions']));
-            $qb->join('acpw.socialAction', 'acpwsocialaction');
-        }
-
-        $clause = $qb->expr()->in('acpwsocialaction.id', ':socialactions');
-
-        $qb->andWhere($clause)
-            ->setParameter(
-                'socialactions',
-                SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])->toArray()
-            );
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/migrations/Version20231002094521.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20231002094521 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Remove doublons in chill_person_accompanying_period_location_history and add a constraint on startdate / endDate by period';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+            WITH doublons_ordered AS (
+                SELECT h2.id AS h2id, h2.createdAt AS h2createdAt, h2.startDate AS h2start, h2.endDate AS h2end, h1.*,
+                       rank() OVER (partition by h1.period_id ORDER BY h1.id, h2.id) AS ranking
+                FROM chill_person_accompanying_period_location_history h1
+                         JOIN chill_person_accompanying_period_location_history h2 ON h1.period_id = h2.period_id  AND h1.id <> h2.id
+                WHERE daterange(h1.startdate, h1.enddate) && daterange(h2.startdate, h2.enddate) ORDER BY h1.period_id, h1.id
+            ),
+            keep_only_first AS (
+                SELECT id FROM doublons_ordered WHERE ranking > 1
+            )
+            DELETE FROM chill_person_accompanying_period_location_history WHERE id IN (SELECT id FROM doublons_ordered);
+            SQL
+        );
+
+        $this->addSql(
+            <<<'SQL'
+                    ALTER TABLE chill_person_accompanying_period_location_history
+                    ADD CONSTRAINT acc_period_location_history_not_overlaps
+                    EXCLUDE USING GIST (period_id with =, tsrange(startdate, enddate) with &&)
+                    DEFERRABLE INITIALLY DEFERRED
+            SQL
+        );
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+            ALTER TABLE chill_person_accompanying_period_location_history DROP CONSTRAINT acc_period_location_history_not_overlaps
+            SQL
+        );
+    }
+}