Merge branch '111_exports' into social_action_exports

src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php

@@ -37,7 +37,7 @@ abstract class AbstractFilterTest extends KernelTestCase
 
     protected function setUp(): void
     {
-        $$this->prophet = $this->getProphet();
+        $this->prophet = $this->getProphet();
     }
 
     public function dataProviderAlterQuery()

src/Bundle/ChillPersonBundle/Export/Filter/GeographicalUnitStatFilter.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Chill\PersonBundle\Export\Filter;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * e) par zone géographique
+ *
+ *   Paramètre:
+ *    * Date
+ *    * Choix unique entre: territoire, epci, canton, commune, secteur d'intervention
+ *    * une fois le premier choix effectué, l'utilisateur choisi parmi les zones (choix multiple)
+ *
+ *   Le filtre retiendra les parcours localisé dans un des territoires cochés, à la date indiquée en paramètre.
+ */
+class GeographicalUnitStatFilter implements FilterInterface
+{
+
+    private const LOCTYPE = [
+        'center' => 'center',
+        // TODO not yet implemented: https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/626
+    ];
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date', ChillDateType::class, [
+                'data' => new \DateTime(),
+            ])
+            ->add('accepted_loctype', ChoiceType::class, [
+                'choices' => self::LOCTYPE,
+                'multiple' => false,
+                'expanded' => true,
+            ])
+        ;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'Filter by geographic unit';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by geographic unit: only %date%', [
+           '%date%' => $data['date']->format('d-m-Y'),
+        ]];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq(1, 1);
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('date', $data['date'], Types::DATE_MUTABLE);
+        $qb->setParameter('loctype', $data['accepted_loctype']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/ReferrerFilter.php

@@ -48,7 +48,7 @@ class ReferrerFilter implements FilterInterface
     /**
      * @inheritDoc
      */
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
         $users = [];
 
@@ -116,7 +116,7 @@ class ReferrerFilter implements FilterInterface
     /**
      * @inheritDoc
      */
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_SHARED;
     }

src/Bundle/ChillPersonBundle/Export/Filter/RequestorFilter.php

@@ -0,0 +1,153 @@
+<?php
+
+namespace Chill\PersonBundle\Export\Filter;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class RequestorFilter implements FilterInterface
+{
+
+    private const REQUESTOR_CHOICES = [
+        'is person concerned' => 'participation',
+        'is other person' => 'other_person',
+        'is thirdparty' => 'thirdparty',
+        'no requestor' => 'no_requestor',
+    ];
+
+    private const DEFAULT_CHOICE = 'participation';
+
+    protected TranslatorInterface $translator;
+
+    protected EntityManagerInterface $em;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        EntityManagerInterface $em
+    ) {
+        $this->translator = $translator;
+        $this->em = $em;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_choices', ChoiceType::class, [
+            'choices' => self::REQUESTOR_CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTitle(): string
+    {
+        return 'Filter by requestor';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function describeAction($data, $format = 'string'): array
+    {
+        $choice = array_flip(self::REQUESTOR_CHOICES)[$data['accepted_choices']];
+
+        return ['Filtered by requestor: only %choice%', [
+            '%choice%' => $this->translator->trans($choice)
+        ]];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function addRole()
+    {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        switch ($data['accepted_choices']) {
+            case 'participation':
+
+                $qb->join('acp.participations', 'part');
+
+                $clause = $qb->expr()->andX(
+                    $qb->expr()->isNotNull('acp.requestorPerson'),
+                    $qb->expr()->eq('acp.requestorPerson', 'part.person')
+                );
+                break;
+
+            case 'other_person':
+
+                $expr = $this->em->getExpressionBuilder();
+
+                $qb->join('acp.participations','part');
+
+                $clause = $expr->andX(
+                    $expr->isNotNull('acp.requestorPerson'),
+                    $expr->notIn('acp.requestorPerson',
+
+                        // subquery
+                        $this->em->createQueryBuilder()
+                            ->select('identity(acp2.requestorPerson)')
+                            ->from('ChillPersonBundle:AccompanyingPeriod', 'acp2')
+                            ->join('acp2.participations', 'part2')
+                            ->where($expr->eq('acp2.requestorPerson', 'part2.person'))
+                            ->getDQL()
+
+                    )
+                );
+                break;
+
+            case 'thirdparty':
+
+                $clause = $qb->expr()->isNotNull('acp.requestorThirdParty');
+                break;
+
+            case 'no_requestor':
+
+                $clause = $qb->expr()->andX(
+                    $qb->expr()->isNull('acp.requestorPerson'),
+                    $qb->expr()->isNull('acp.requestorThirdParty')
+                );
+                break;
+
+            default:
+                throw new \Exception('Uncaught choice exception');
+        }
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ActionTypeAggregatorTest.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\ActionTypeAggregator;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GoalAggregatorTest.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\GoalAggregator;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ReferrerAggregatorTest.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\ReferrerAggregator;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/ResultAggregatorTest.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Tests\Export\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\ResultAggregator;
 
 /**
  * @internal

src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOnDateFilterTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\ActiveOnDateFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ActiveOnDateFilterTest extends AbstractFilterTest
+{
+    private ActiveOnDateFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_activeondate');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActiveOneDayBetweenDatesFilterTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\ActiveOneDayBetweenDatesFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest
+{
+    private ActiveOneDayBetweenDatesFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_activeonedaybetweendates');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            [
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-06-01'),
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/ActivityTypeFilterTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Export\Filter;
+
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\ActivityTypeFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ActivityTypeFilterTest extends AbstractFilterTest
+{
+    private ActivityTypeFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_activitytype');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(ActivityType::class, 'at')
+            ->select('at')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $t) {
+            $data[] = ['accepted_activitytypes' => $t];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AdministrativeLocationFilterTest.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Export\Filter;
+
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\AdministrativeLocationFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class AdministrativeLocationFilterTest extends AbstractFilterTest
+{
+    private AdministrativeLocationFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_administrative_location');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(Location::class, 'l')
+            ->select('l')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $l) {
+            $data[] = ['accepted_locations' => $l];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilterTest.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Export\Filter\EvaluationFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class EvaluationFilterTest extends AbstractFilterTest
+{
+    private EvaluationFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_evaluation');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(Evaluation::class, 'ev')
+            ->select('ev')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $e) {
+            $data[] = ['accepted_evaluations' => $e];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/GeographicalUnitStatFilterTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class GeographicalUnitStatFilterTest extends AbstractFilterTest
+{
+    private GeographicalUnitStatFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_geographicalunitstat');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            [
+                'date' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'accepted_loctype' => 'center'
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/OpenBetweenDatesFilterTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\OpenBetweenDatesFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class OpenBetweenDatesFilterTest extends AbstractFilterTest
+{
+    private OpenBetweenDatesFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_openbetweendates');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            [
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2022-05-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-06-01'),
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/ReferrerFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Chill\PersonBundle\Tests\Export\Filter;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\ReferrerFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ReferrerFilterTest extends AbstractFilterTest
+{
+    private ReferrerFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_referrer');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(User::class, 'u')
+            ->select('u')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $u) {
+            $data[] = ['accepted_referrers' => $u];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod\AccompanyingPeriodWork', 'acpw')
+                ->select('acpw.id'),
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod\AccompanyingPeriodWork', 'acpw')
+                ->join('acpw.referrers', 'r')
+                ->select('r.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/RequestorFilterTest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Export\Filter;
+
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Export\Filter\RequestorFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class RequestorFilterTest extends AbstractFilterTest
+{
+    private RequestorFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_requestor');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_choices' => 'participation'],
+            ['accepted_choices' => 'other_person'],
+            ['accepted_choices' => 'thirdparty'],
+            ['accepted_choices' => 'no_requestor'],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialActionFilterTest.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Export\Filter;
+
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Export\Filter\SocialActionFilter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialActionFilterTest extends AbstractFilterTest
+{
+    private SocialActionFilter $filter;
+
+    protected function setUp(): void
+    {
+        //parent::setUp();
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.person.export.filter_socialaction');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(SocialAction::class, 'sa')
+            ->select('sa')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach($array as $a) {
+            $data[] = ['accepted_socialactions' => $a];
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('acp.id'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml

@@ -60,6 +60,13 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
 
+    chill.person.export.filter_geographicalunitstat:
+        class: Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_geographicalunitstat_filter }
+
     chill.person.export.filter_socialaction:
         class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter
         autowire: true
@@ -102,6 +109,13 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_administrative_location_filter }
 
+    chill.person.export.filter_requestor:
+        class: Chill\PersonBundle\Export\Filter\RequestorFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_requestor_filter }
+
     chill.person.export.filter_confidential:
         class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter
         autowire: true

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -447,6 +447,14 @@ Filter by administrative location: Filtrer par localisation administrative
 Accepted locations: Localisations administratives
 "Filtered by administratives locations: only %locations%": "Filtré par localisation administrative: uniquement %locations%"
 
+Filter by requestor: Filtrer les parcours selon la présence du demandeur au sein des usagers concernés
+Accepted choices: ''
+is person concerned: Le demandeur est un usager concerné
+is other person: Le demandeur est un autre usager
+is thirdparty: Le demandeur est un tiers
+no requestor: Il n'y a pas de demandeur
+"Filtered by requestor: only %choice%": "Filtré par présence du demandeur au sein des usagers concernés: uniquement si %choice%"
+
 Filter by confidential: Filtrer par confidentialité
 Accepted confidentials: ''
 is confidential: le parcours est confidentiel