Use dedicated FilterListAccompanyingPeriodHelper to filter confidential course in different lists

2025-09-03 21:34:59 +00:00 · 2023-12-07 16:18:37 +01:00
parent 54606403b4
commit f0605c6b08
10 changed files with 73 additions and 185 deletions
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriodTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriodTest.php
@@ -20,6 +20,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod;
+use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelperInterface;
 use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
@@ -27,6 +28,7 @@ use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
 use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;

 /**
 * @internal
@@ -35,6 +37,8 @@ use Doctrine\ORM\EntityManagerInterface;
 */
 class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriodTest extends AbstractExportTest
 {
+    use ProphecyTrait;
+
    protected function setUp(): void
    {
        parent::setUp();
@@ -55,6 +59,7 @@ class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriodTest extends
        $rollingDateConverter = self::$container->get(RollingDateConverterInterface::class);
        $aggregateStringHelper = self::$container->get(AggregateStringHelper::class);
        $socialActionRepository = self::$container->get(SocialActionRepository::class);
+        $filterListAccompanyingPeriodHelper = $this->prophesize(FilterListAccompanyingPeriodHelperInterface::class);

        yield new ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod(
            $entityManager,
@@ -69,23 +74,7 @@ class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriodTest extends
            $rollingDateConverter,
            $aggregateStringHelper,
            $socialActionRepository,
-            $this->getParameters(true),
-        );
-
-        yield new ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod(
-            $entityManager,
-            $dateTimeHelper,
-            $userHelper,
-            $personHelper,
-            $thirdPartyHelper,
-            $translatableStringExportLabelHelper,
-            $socialIssueRender,
-            $socialIssueRepository,
-            $socialActionRender,
-            $rollingDateConverter,
-            $aggregateStringHelper,
-            $socialActionRepository,
-            $this->getParameters(false),
+            $filterListAccompanyingPeriodHelper->reveal(),
        );
    }

--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnWorkTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnWorkTest.php
@@ -20,6 +20,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWorkAssociatePersonOnWork;
+use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelperInterface;
 use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
@@ -27,6 +28,7 @@ use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
 use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;

 /**
 * @internal
@@ -35,6 +37,8 @@ use Doctrine\ORM\EntityManagerInterface;
 */
 class ListAccompanyingPeriodWorkAssociatePersonOnWorkTest extends AbstractExportTest
 {
+    use ProphecyTrait;
+
    protected function setUp(): void
    {
        parent::setUp();
@@ -55,6 +59,7 @@ class ListAccompanyingPeriodWorkAssociatePersonOnWorkTest extends AbstractExport
        $rollingDateConverter = self::$container->get(RollingDateConverterInterface::class);
        $aggregateStringHelper = self::$container->get(AggregateStringHelper::class);
        $socialActionRepository = self::$container->get(SocialActionRepository::class);
+        $filterHelper = $this->prophesize(FilterListAccompanyingPeriodHelperInterface::class);

        yield new ListAccompanyingPeriodWorkAssociatePersonOnWork(
            $entityManager,
@@ -69,23 +74,7 @@ class ListAccompanyingPeriodWorkAssociatePersonOnWorkTest extends AbstractExport
            $rollingDateConverter,
            $aggregateStringHelper,
            $socialActionRepository,
-            $this->getParameters(true),
-        );
-
-        yield new ListAccompanyingPeriodWorkAssociatePersonOnWork(
-            $entityManager,
-            $dateTimeHelper,
-            $userHelper,
-            $personHelper,
-            $thirdPartyHelper,
-            $translatableStringExportLabelHelper,
-            $socialIssueRender,
-            $socialIssueRepository,
-            $socialActionRender,
-            $rollingDateConverter,
-            $aggregateStringHelper,
-            $socialActionRepository,
-            $this->getParameters(false),
+            $filterHelper->reveal(),
        );
    }

--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListEvaluationTest.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\PersonBundle\Tests\Export\Export;

-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
 use Chill\MainBundle\Export\Helper\DateTimeHelper;
 use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
@@ -22,13 +21,14 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\ListEvaluation;
+use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelperInterface;
 use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;

 /**
 * @internal
@@ -37,7 +37,7 @@ use Doctrine\ORM\EntityManagerInterface;
 */
 class ListEvaluationTest extends AbstractExportTest
 {
-    private ListEvaluation $listEvaluation;
+    use ProphecyTrait;

    private CenterRepositoryInterface $centerRepository;

@@ -46,7 +46,6 @@ class ListEvaluationTest extends AbstractExportTest
        parent::setUp();
        self::bootKernel();

-        $this->listEvaluation = self::$container->get(ListEvaluation::class);
        $this->centerRepository = self::$container->get(CenterRepositoryInterface::class);
    }

@@ -63,6 +62,7 @@ class ListEvaluationTest extends AbstractExportTest
        $rollingDateConverter = self::$container->get(RollingDateConverterInterface::class);
        $aggregateStringHelper = self::$container->get(AggregateStringHelper::class);
        $socialActionRepository = self::$container->get(SocialActionRepository::class);
+        $filterListHelper = $this->prophesize(FilterListAccompanyingPeriodHelperInterface::class);

        yield new ListEvaluation(
            $entityManager,
@@ -76,22 +76,7 @@ class ListEvaluationTest extends AbstractExportTest
            $translatableStringExportLabelHelper,
            $aggregateStringHelper,
            $rollingDateConverter,
-            $this->getParameters(true),
-        );
-
-        yield new ListEvaluation(
-            $entityManager,
-            $socialIssueRender,
-            $socialIssueRepository,
-            $socialActionRender,
-            $socialActionRepository,
-            $userHelper,
-            $personHelper,
-            $dateTimeHelper,
-            $translatableStringExportLabelHelper,
-            $aggregateStringHelper,
-            $rollingDateConverter,
-            $this->getParameters(false),
+            $filterListHelper->reveal(),
        );
    }

@@ -104,14 +89,4 @@ class ListEvaluationTest extends AbstractExportTest
    {
        return [[Declarations::ACP_TYPE]];
    }
-
-    public function testQuery(): void
-    {
-        $centers = $this->centerRepository->findAll();
-
-        $query = $this->listEvaluation->initiateQuery([], array_map(fn (Center $c) => ['center' => $c], $centers), ['calc_date' => new RollingDate(RollingDate::T_TODAY)]);
-        $query->setMaxResults(1);
-
-        self::assertIsArray($query->getQuery()->getResult(AbstractQuery::HYDRATE_ARRAY));
-    }
 }
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonWithAccompanyingPeriodDetailsTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonWithAccompanyingPeriodDetailsTest.php
@@ -16,9 +16,11 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriodDetails;
+use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelperInterface;
 use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
 use Chill\PersonBundle\Export\Helper\ListPersonHelper;
 use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\PhpUnit\ProphecyTrait;

 /**
 * @internal
@@ -27,6 +29,8 @@ use Doctrine\ORM\EntityManagerInterface;
 */
 class ListPersonWithAccompanyingPeriodDetailsTest extends AbstractExportTest
 {
+    use ProphecyTrait;
+
    protected function setUp(): void
    {
        parent::setUp();
@@ -39,21 +43,14 @@ class ListPersonWithAccompanyingPeriodDetailsTest extends AbstractExportTest
        $listAccompanyingPeriodHelper = self::$container->get(ListAccompanyingPeriodHelper::class);
        $entityManager = self::$container->get(EntityManagerInterface::class);
        $rollingDateConverter = self::$container->get(RollingDateConverterInterface::class);
+        $filterHelper = $this->prophesize(FilterListAccompanyingPeriodHelperInterface::class);

        yield new ListPersonWithAccompanyingPeriodDetails(
            $listPersonHelper,
            $listAccompanyingPeriodHelper,
            $entityManager,
            $rollingDateConverter,
-            $this->getParameters(true),
-        );
-
-        yield new ListPersonWithAccompanyingPeriodDetails(
-            $listPersonHelper,
-            $listAccompanyingPeriodHelper,
-            $entityManager,
-            $rollingDateConverter,
-            $this->getParameters(false),
+            $filterHelper->reveal()
        );
    }

--- a/src/Bundle/ChillPersonBundle/Tests/Export/Helper/FilterListAccompanyingPeriodHelperTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Helper/FilterListAccompanyingPeriodHelperTest.php
@@ -1,5 +1,14 @@
 <?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\Export\Helper;

 use Chill\MainBundle\Entity\Center;
@@ -13,7 +22,6 @@ use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelper;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -21,6 +29,11 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;

+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 final class FilterListAccompanyingPeriodHelperTest extends KernelTestCase
 {
    use ProphecyTrait;
@@ -40,7 +53,6 @@ final class FilterListAccompanyingPeriodHelperTest extends KernelTestCase
    }

    /**
-     * @return void
     * @dataProvider dataProviderTestAddFilterAccompanyingPeriod
     */
    public function testAddFilterAccompanyingPeriod(QueryBuilder $qb, ParameterBagInterface $parameterBag): void
@@ -64,11 +76,11 @@ final class FilterListAccompanyingPeriodHelperTest extends KernelTestCase
            ->willReturn($scopesConfidentials);

        $filter = new FilterListAccompanyingPeriodHelper(
-                $security->reveal(),
-                $this->centerRepository,
-                $authorizationHelper->reveal(),
-                $parameterBag
-            );
+            $security->reveal(),
+            $this->centerRepository,
+            $authorizationHelper->reveal(),
+            $parameterBag
+        );

        $filter->addFilterAccompanyingPeriods($qb, [], $this->getACL(), []);

@@ -89,19 +101,19 @@ final class FilterListAccompanyingPeriodHelperTest extends KernelTestCase

        yield [
            $qb,
-            new ParameterBag(['chill_main' => ['acl' => ['filter_stats_by_center' => true]]])
+            new ParameterBag(['chill_main' => ['acl' => ['filter_stats_by_center' => true]]]),
        ];

        yield [
            $qb,
-            new ParameterBag(['chill_main' => ['acl' => ['filter_stats_by_center' => false]]])
+            new ParameterBag(['chill_main' => ['acl' => ['filter_stats_by_center' => false]]]),
        ];
    }

    /**
-     * @return list<array{center: Center, circles: list<Scope>}> The ACL, structured as an array.
+     * @return list<array{center: Center, circles: list<Scope>}> the ACL, structured as an array
     *
-     * @throws \RuntimeException When no center or circle is found.
+     * @throws \RuntimeException when no center or circle is found
     */
    private function getACL(): array
    {