Merge branch 'person-change-center-history' into '111_exports_suite'

Track the change of person's centers See merge request Chill-Projet/chill-bundles!454
2025-08-20 22:53:49 +00:00 · 2022-09-28 13:52:55 +00:00
parent 9f2ecff63e 32f252149b
commit b777e9c819
25 changed files with 1030 additions and 69 deletions
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -90,9 +92,25 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
        $qb = $this->repository->createQueryBuilder('acp');

-        $qb->select('COUNT(acp.id) AS export_result');
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+            ;
+
+        $qb->select('COUNT(DISTINCT acp.id) AS export_result');

        return $qb;
    }
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,6 +90,10 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
        $qb = $this->repository->createQueryBuilder('acp');

        if (!in_array('acpw', $qb->getAllAliases(), true)) {
@@ -98,6 +104,18 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
            $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
        }

+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+        ;
+
        $qb->select('COUNT(DISTINCT workeval.id) AS export_result');

        return $qb;
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
@@ -15,6 +15,9 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,23 +91,29 @@ class CountHousehold implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('acp');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);

-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
-            $qb->join('acp.participations', 'acppart');
-        }
+        $qb = $this->repository
+            ->createQueryBuilder('acp')
+            ->join('acp.participations', 'acppart')
+            // little optimization: we remove joins and make a direct join between participations and household members
+            ->join(HouseholdMember::class, 'member', Query\Expr\Join::WITH, 'IDENTITY(acppart.person) = IDENTITY(member.person)')
+            ->join('member.household', 'household')
+        ;

-        if (!in_array('partperson', $qb->getAllAliases(), true)) {
-            $qb->join('acppart.person', 'partperson');
-        }
-
-        if (!in_array('member', $qb->getAllAliases(), true)) {
-            $qb->join('partperson.householdParticipations', 'member');
-        }
-
-        if (!in_array('household', $qb->getAllAliases(), true)) {
-            $qb->join('member.household', 'household');
-        }
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+        ;

        $qb->select('COUNT(DISTINCT household.id) AS export_result');

--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php
@@ -14,9 +14,11 @@ namespace Chill\PersonBundle\Export\Export;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
@@ -100,9 +102,12 @@ class CountPerson implements ExportInterface, GroupedExportInterface
        $qb = $this->personRepository->createQueryBuilder('person');

        $qb->select('COUNT(person.id) AS export_result')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $centers);
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                )
+            )
+        ->setParameter('authorized_centers', $centers);

        return $qb;
    }
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,6 +89,10 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
        $qb = $this->repository->createQueryBuilder('acp');

        if (!in_array('acppart', $qb->getAllAliases(), true)) {
@@ -98,6 +103,12 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
            $qb->join('acppart.person', 'person');
        }

+        $qb->andWhere(
+            $qb->expr()->exists(
+                'SELECT 1 FROM '.PersonCenterHistory::class.' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+            )
+        )->setParameter('authorized_centers', $centers);
+
        $qb->select('COUNT(DISTINCT person.id) AS export_result');

        return $qb;
--- a/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
@@ -15,6 +15,8 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -90,13 +92,26 @@ class CountSocialWorkActions implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
    {
-        $qb = $this->repository->createQueryBuilder('acp');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);

-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
-            $qb->join('acp.works', 'acpw');
-        }
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.works', 'acpw');

-        $qb->select('COUNT(acpw.id) as export_result');
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+        ;
+
+        $qb->select('COUNT(DISTINCT acpw.id) as export_result');

        return $qb;
    }
--- a/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
+++ b/src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
@@ -16,6 +16,8 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use DateTime;
@@ -94,15 +96,27 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
        $qb = $this->repository->createQueryBuilder('acp');

+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers)
+        ;
+
        $qb
            ->select('AVG(
-                ( CASE
-                    WHEN acp.closingDate IS NOT NULL
-                    THEN acp.closingDate
-                    ELSE :force_closingDate
-                END ) - acp.openingDate
+                COALESCE(acp.closingDate, :force_closingDate) - acp.openingDate
            ) AS export_result')
            ->setParameter('force_closingDate', $data['closingdate']);