update some queries in the interface to take into account history of user's scope and user's job

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -157,7 +157,6 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     /**
      * @var Collection<int, AccompanyingPeriodWorkReferrerHistory>
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodWorkReferrerHistory::class, cascade={"persist", "remove"}, mappedBy="accompanyingPeriodWork", orphanRemoval=true)
-     * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
      */
     private Collection $referrersHistory;
 

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
 
 use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
@@ -91,7 +92,9 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
                     $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval')),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
-                        $qb->expr()->isMemberOf(':user', 'work.referrers')
+                        $qb->expr()->exists(
+                            'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = work.id AND subw_ref_history.user = :user'
+                        )
                     )
                 )
             )

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -132,10 +132,10 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
 
         // set limit and offset
         $sql .= " ORDER BY
-                     CASE WHEN enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
-                     startdate DESC,
-                     enddate DESC,
-                     id DESC";
+                     CASE WHEN w.enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
+                     w.startdate DESC,
+                     w.enddate DESC,
+                     w.id DESC";
 
         $sql .= " LIMIT :limit OFFSET :offset";
 
@@ -239,7 +239,9 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor
                     $qb->expr()->lte('w.startDate', ':until'),
                     $qb->expr()->orX(
                         $qb->expr()->eq('period.user', ':user'),
-                        $qb->expr()->isMemberOf(':user', 'w.referrers')
+                        $qb->expr()->exists(
+                            'SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' subw JOIN subw.referrersHistory subw_ref_history WHERE subw.id = w.id AND subw_ref_history.user = :user and subw.ref_history.endDate IS NULL'
+                        )
                     )
                 )
             )

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php

@@ -54,7 +54,7 @@ class AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo implements Acc
     public function getFromStatement(): string
     {
         return 'chill_person_accompanying_period_work w
-            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id';
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON w.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> w.endDate';
     }
 
     public function getWhereClause(): string

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo.php

@@ -11,10 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
 
-class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+class AccompanyingPeriodWorkEvaluationCreationQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
 {
     public function getAccompanyingPeriodIdColumn(): string
     {
@@ -33,12 +34,12 @@ class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodI
 
     public function getUserIdColumn(): string
     {
-        return 'cpapwr.user_id';
+        return 'e.createdBy_id';
     }
 
     public function getDateTimeColumn(): string
     {
-        return 'e.maxDate';
+        return 'e.createdAt';
     }
 
     public function getMetadataColumn(): string
@@ -48,18 +49,18 @@ class AccompanyingPeriodWorkEvaluationWarningDateQueryPartForAccompanyingPeriodI
 
     public function getDiscriminator(): string
     {
-        return 'accompanying_period_work_evaluation_max';
+        return 'accompanying_period_work_evaluation_creation';
     }
 
     public function getFromStatement(): string
     {
         return 'chill_person_accompanying_period_work_evaluation e
             JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
-            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id';
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate';
     }
 
     public function getWhereClause(): string
     {
-        return 'e.maxDate IS NOT NULL';
+        return 'e.createdAt IS NOT NULL';
     }
 }

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo.php

@@ -56,7 +56,7 @@ class AccompanyingPeriodWorkEvaluationMaxQueryPartForAccompanyingPeriodInfo impl
     {
         return 'chill_person_accompanying_period_work_evaluation e
             JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
-            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id';
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.maxDate';
     }
 
     public function getWhereClause(): string

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo.php

@@ -56,11 +56,11 @@ class AccompanyingPeriodWorkEvaluationStartQueryPartForAccompanyingPeriodInfo im
     {
         return 'chill_person_accompanying_period_work_evaluation e
             JOIN chill_person_accompanying_period_work cpapw ON cpapw.id = e.accompanyingperiodwork_id
-            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id';
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr ON cpapw.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> e.startDate';
     }
 
     public function getWhereClause(): string
     {
-        return '';
+        return 'e.startDate IS NOT NULL';
     }
 }

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo.php

@@ -0,0 +1,64 @@
+<?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\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoQueryPart;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface;
+
+class AccompanyingPeriodWorkNewReferrerQueryPartForAccompanyingPeriodInfo implements AccompanyingPeriodInfoUnionQueryPartInterface
+{
+    public function getAccompanyingPeriodIdColumn(): string
+    {
+        return 'w.accompanyingperiod_id';
+    }
+
+    public function getRelatedEntityColumn(): string
+    {
+        return AccompanyingPeriodWork::class;
+    }
+
+    public function getRelatedEntityIdColumn(): string
+    {
+        return 'w.id';
+    }
+
+    public function getUserIdColumn(): string
+    {
+        return 'cpapwr.user_id';
+    }
+
+    public function getDateTimeColumn(): string
+    {
+        return 'cpapwr.startDate';
+    }
+
+    public function getMetadataColumn(): string
+    {
+        return "'{}'::jsonb";
+    }
+
+    public function getDiscriminator(): string
+    {
+        return 'accompanying_period_work_referrer_new';
+    }
+
+    public function getFromStatement(): string
+    {
+        return 'chill_person_accompanying_period_work w
+            JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id';
+    }
+
+    public function getWhereClause(): string
+    {
+        return '';
+    }
+}

src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo.php

@@ -54,7 +54,7 @@ class AccompanyingPeriodWorkStartQueryPartForAccompanyingPeriodInfo implements A
     public function getFromStatement(): string
     {
         return 'chill_person_accompanying_period_work w
-            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id';
+            LEFT JOIN chill_person_accompanying_period_work_referrer cpapwr on w.id = cpapwr.accompanyingperiodwork_id AND daterange(cpapwr.startDate, cpapwr.endDate) @> w.startDate';
     }
 
     public function getWhereClause(): string

src/Bundle/ChillPersonBundle/Tests/Repository/UserRepositoryTest.php

@@ -0,0 +1,43 @@
+<?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\PersonBundle\Tests\Repository;
+
+use Chill\MainBundle\Repository\UserRepository;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class UserRepositoryTest extends KernelTestCase
+{
+    private UserRepository $userRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        self::bootKernel();
+        $this->userRepository = self::$container->get(UserRepository::class);
+    }
+
+    public function testFindAllAsArray(): void
+    {
+        $userIterator = $this->userRepository->findAllAsArray('fr');
+
+        self::assertIsIterable($userIterator);
+        $i = 0;
+        foreach ($userIterator as $u) {
+            self::assertIsArray($u);
+        }
+        self::assertGreaterThan(0, $i);
+    }
+}