Merge branch '111_exports_suite' into testing

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
+* [activity][export] Feature: improve label for aliases in "Filter by activity type"
+* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
+* [person][export] Fixed: some inconsistency with date filter on accompanying courses
+* [person][export] Fixed: use left join for related entities in accompanying course aggregators
 
 ## Test releases
 

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -17,7 +17,7 @@ use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
@@ -56,7 +56,7 @@ final class ActivityController extends AbstractController
 
     private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
 
-    private ActivityTypeRepository $activityTypeRepository;
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
 
     private CenterResolverManagerInterface $centerResolver;
 
@@ -78,7 +78,7 @@ final class ActivityController extends AbstractController
 
     public function __construct(
         ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
         ActivityTypeCategoryRepository $activityTypeCategoryRepository,
         PersonRepository $personRepository,
         ThirdPartyRepository $thirdPartyRepository,

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -516,6 +516,11 @@ class ActivityType
         return $this->userVisible;
     }
 
+    public function hasCategory(): bool
+    {
+        return null !== $this->getCategory();
+    }
+
     /**
      * Is active
      * return true if the type is active.

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -50,18 +50,15 @@ class DateAggregator implements AggregatorInterface
         switch ($data['frequency']) {
             case 'month':
                 $fmt = 'MM';
-
+                break;
-break;
 
             case 'week':
                 $fmt = 'IW';
-
+                break;
-break;
 
             case 'year':
                 $fmt = 'YYYY'; $order = 'DESC';
-
+                break; // order DESC does not works !
-break; // order DESC does not works !
 
             default:
                 throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Closure;
@@ -25,12 +25,12 @@ class ActivityTypeAggregator implements AggregatorInterface
 {
     public const KEY = 'activity_type_aggregator';
 
-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
         TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->activityTypeRepository = $activityTypeRepository;

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -55,10 +55,10 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
     {
         // add select element
         if ('reasons' === $data['level']) {
-            $elem = 'reasons.id';
+            $elem = 'actreasons.id';
             $alias = 'activity_reasons_id';
         } elseif ('categories' === $data['level']) {
-            $elem = 'category.id';
+            $elem = 'actreasoncat.id';
             $alias = 'activity_categories_id';
         } else {
             throw new RuntimeException('The data provided are not recognized.');

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -84,7 +84,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'actacp');
+            ->join('activity.accompanyingPeriod', 'acp');
 
         $qb->select('AVG(activity.durationTime) as export_avg_activity_duration');
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -84,7 +84,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'actacp');
+            ->join('activity.accompanyingPeriod', 'acp');
 
         $qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -87,10 +87,10 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         $qb = $this->repository->createQueryBuilder('activity');
 
         if (!in_array('actacp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'actacp');
+            $qb->join('activity.accompanyingPeriod', 'acp');
         }
 
-        $qb->select('COUNT(activity.id) as export_count_activity');
+        $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
 
         return $qb;
     }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -86,7 +86,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         $qb = $this->repository->createQueryBuilder('activity');
 
         if (!in_array('actacp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'actacp');
+            $qb->join('activity.accompanyingPeriod', 'acp');
         }
 
         $qb->select('SUM(activity.durationTime) as export_sum_activity_duration');

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -86,7 +86,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb = $this->repository->createQueryBuilder('activity');
 
         if (!in_array('actacp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'actacp');
+            $qb->join('activity.accompanyingPeriod', 'acp');
         }
 
         $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -86,8 +86,8 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
         $qb = $this->activityRepository->createQueryBuilder('activity');
 
-        if (!in_array('actperson', $qb->getAllAliases(), true)) {
+        if (!in_array('person', $qb->getAllAliases(), true)) {
-            $qb->join('activity.person', 'actperson');
+            $qb->join('activity.person', 'person');
         }
 
         $qb->select('COUNT(activity.id) as export_count_activity');

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -210,7 +210,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'actperson')
+            ->join('activity.person', 'person')
             ->join('actperson.center', 'actcenter')
             ->andWhere('actcenter IN (:authorized_centers)')
             ->setParameter('authorized_centers', $centers);

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -120,7 +120,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         }
 
         return $qb->select($select)
-            ->join('activity.person', 'actperson')
+            ->join('activity.person', 'person')
             ->join('actperson.center', 'actcenter')
             ->where($qb->expr()->in('actcenter', ':centers'))
             ->setParameter(':centers', $centers);

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -13,8 +13,9 @@ namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
@@ -22,15 +23,17 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- * TODO merge with ActivityTypeFilter in ChillActivity (!?).
- */
 class ActivityTypeFilter implements FilterInterface
 {
-    private TranslatableStringHelper $translatableStringHelper;
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    private TranslatableStringHelperInterface $translatableStringHelper;
-    {
+
+    public function __construct(
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->activityTypeRepository = $activityTypeRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
@@ -45,21 +48,10 @@ class ActivityTypeFilter implements FilterInterface
             $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
         }
 
-        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
-            $qb->join('activity.activityType', 'acttype');
-        }
 
-        $where = $qb->getDQLPart('where');
+        $qb->andWhere($clause);
-        $clause = $qb->expr()->in('acttype.id', ':activitytypes');
+        $qb->setParameter('selected_activity_types', $data['types']);
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('activitytypes', $data['accepted_activitytypes']);
     }
 
     public function applyOn()
@@ -71,8 +63,12 @@ class ActivityTypeFilter implements FilterInterface
     {
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
+            'choices' => $this->activityTypeRepository->findAllActive(),
             'choice_label' => function (ActivityType $aty) {
-                return $this->translatableStringHelper->localize($aty->getName());
+                return
+                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+                    .
+                    $this->translatableStringHelper->localize($aty->getName());
             },
             'multiple' => true,
             'expanded' => true,
@@ -88,7 +84,7 @@ class ActivityTypeFilter implements FilterInterface
         }
 
         return ['Filtered by activity types: only %activitytypes%', [
-            '%activitytypes%' => implode(', ou ', $types),
+            '%activitytypes%' => implode(', ', $types),
         ]];
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -13,7 +13,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -28,13 +28,13 @@ use function count;
 
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
         TranslatableStringHelperInterface $translatableStringHelper,
-        ActivityTypeRepository $activityTypeRepository
+        ActivityTypeRepositoryInterface $activityTypeRepository
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->activityTypeRepository = $activityTypeRepository;
@@ -47,16 +47,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
 
-        if ($where instanceof Expr\Andx) {
+        $qb->andWhere($clause);
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
         $qb->setParameter('selected_activity_types', $data['types']);
     }
 
@@ -68,11 +61,26 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('types', EntityType::class, [
+            'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+            'choice_label' => function (ActivityType $aty) {
-            'group_by' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getCategory()->getName()),
+                return
+                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+                    .
+                    $this->translatableStringHelper->localize($aty->getName());
+            },
+            'group_by' => function (ActivityType $type) {
+                if (!$type->hasCategory()) {
+                    return null;
+                }
+
+                return $this->translatableStringHelper->localize($type->getCategory()->getName());
+            },
             'multiple' => true,
             'expanded' => false,
+            'attr' => [
+                'class' => 'select2'
+            ]
         ]);
     }
 

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -59,10 +60,10 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        // create a query for activity
+        // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
         $sqb->select('person_person_having_activity.id')
-            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
+            ->from(Activity::class, 'activity_person_having_activity')
             ->join('activity_person_having_activity.person', 'person_person_having_activity');
 
         // add clause between date

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -23,37 +23,25 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslatableActivityType extends AbstractType
 {
-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
         TranslatableStringHelperInterface $helper,
-        ActivityTypeRepository $activityTypeRepository
+        ActivityTypeRepositoryInterface $activityTypeRepository
     ) {
         $this->translatableStringHelper = $helper;
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        /** @var QueryBuilder $qb */
-        $qb = $options['query_builder'];
-
-        if (true === $options['active_only']) {
-            $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, Types::BOOLEAN);
-        }
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
                 'class' => ActivityType::class,
                 'active_only' => true,
-                'query_builder' => $this->activityTypeRepository
+                'choices' => $this->activityTypeRepository->findAllActive(),
-                    ->createQueryBuilder('at'),
                 'choice_label' => function (ActivityType $type) {
                     return $this->translatableStringHelper->localize($type->getName());
                 },

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -13,18 +13,58 @@ namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
+use UnexpectedValueException;
 
-/**
+final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
- * @method ActivityType|null find($id, $lockMode = null, $lockVersion = null)
- * @method ActivityType|null findOneBy(array $criteria, array $orderBy = null)
- * @method ActivityType[]    findAll()
- * @method ActivityType[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ActivityTypeRepository extends ServiceEntityRepository
 {
-    public function __construct(ManagerRegistry $registry)
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
     {
-        parent::__construct($registry, ActivityType::class);
+        $this->repository =  $em->getRepository(ActivityType::class);
     }
+
+    /**
+     * @return array|ActivityType[]
+     */
+    public function findAllActive(): array
+    {
+        return $this->findBy(['active' => true]);
+    }
+
+    public function find($id): ?ActivityType
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|ActivityType[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array|ActivityType[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?ActivityType
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return ActivityType::class;
+    }
+
+
 }

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Chill\ActivityBundle\Repository;
+
+use Chill\ActivityBundle\Entity\ActivityType;
+use Doctrine\Persistence\ObjectRepository;
+
+interface ActivityTypeRepositoryInterface extends ObjectRepository
+{
+    /**
+     * @return array|ActivityType[]
+     */
+    public function findAllActive(): array;
+
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class BySocialActionAggregatorTest extends AbstractAggregatorTest
+{
+    private BySocialActionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bysocialaction_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.socialActions', 'actsocialaction')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
+{
+    private BySocialIssueAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bysocialissue_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.socialIssues', 'actsocialissue')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
+{
+    private ByThirdpartyAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.bythirdparty_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.thirdParties', 'acttparty')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ByUserAggregatorTest extends AbstractAggregatorTest
+{
+    private ByUserAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.byuser_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.users', 'actusers')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php

@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class DateAggregatorTest extends AbstractAggregatorTest
+{
+    private DateAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.date_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'frequency' => 'month',
+            ],
+            [
+                'frequency' => 'week',
+            ],
+            [
+                'frequency' => 'year',
+            ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class LocationTypeAggregatorTest extends AbstractAggregatorTest
+{
+    private LocationTypeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.locationtype_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.location', 'actloc')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class UserScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private UserScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.userscope_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.accompanyingPeriod', 'actacp')
+                ->join('activity.user', 'actuser')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
+use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -21,10 +22,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
-    /**
+    private ActivityReasonAggregator $aggregator;
-     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
-     */
-    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
+use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -21,10 +22,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
-    /**
+    private ActivityTypeAggregator $aggregator;
-     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
-     */
-    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
+use Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -21,10 +22,7 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
-    /**
+    private ActivityUserAggregator $aggregator;
-     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
-     */
-    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
+{
+    private ActivityReasonAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.activity.export.reason_aggregator');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'level' => 'reasons',
+            ],
+            [
+                'level' => 'categories',
+            ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.person', 'actperson')
+                ->innerJoin('activity.reasons', 'actreasons')
+                ->join('actreasons.category', 'actreasoncat')
+                ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php

@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityTypeFilterTest extends AbstractFilterTest
+{
+    private ActivityTypeFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.filter_activitytype');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    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 $a) {
+            $data[] = [
+                'accepted_activitytypes' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp')
+                ->join('activity.activityType', 'acttype'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class BySocialActionFilterTest extends AbstractFilterTest
+{
+    private BySocialActionFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.bysocialaction_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    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;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.socialActions', 'actsocialaction'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php

@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class BySocialIssueFilterTest extends AbstractFilterTest
+{
+    private BySocialIssueFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.bysocialissue_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(SocialIssue::class, 'si')
+            ->select('si')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'accepted_socialissues' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.socialIssues', 'actsocialissue')
+            ,
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ByUserFilterTest extends AbstractFilterTest
+{
+    private ByUserFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.byuser_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    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 $a) {
+            $data[] = [
+                'accepted_users' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.users', 'actusers'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EmergencyFilterTest extends AbstractFilterTest
+{
+    private EmergencyFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.emergency_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_emergency' => true ],
+            ['accepted_emergency' => false ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter;
+use Chill\MainBundle\Entity\LocationType;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class LocationTypeFilterTest extends AbstractFilterTest
+{
+    private LocationTypeFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.locationtype_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(LocationType::class, 'lt')
+            ->select('lt')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'accepted_locationtype' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.location', 'actloc'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SentReceivedFilterTest extends AbstractFilterTest
+{
+    private SentReceivedFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.sentreceived_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            ['accepted_sentreceived' => Activity::SENTRECEIVED_SENT ],
+            ['accepted_sentreceived' => Activity::SENTRECEIVED_RECEIVED ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php

@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class UserFilterTest extends AbstractFilterTest
+{
+    private UserFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.user_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    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 $a) {
+            $data[] = [
+                'accepted_users' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class UserScopeFilterTest extends AbstractFilterTest
+{
+    private UserScopeFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.userscope_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(Scope::class, 's')
+            ->select('s')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'accepted_userscope' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.user', 'actuser'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php

@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Filter\ActivityDateFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityDateFilterTest extends AbstractFilterTest
+{
+    private ActivityDateFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.date_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2020-01-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2021-01-01'),
+            ]
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
+use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
 
@@ -20,10 +21,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
 {
-    /**
+    private ActivityReasonFilter $filter;
-     * @var \Chill\PersonBundle\Export\Filter\GenderFilter
-     */
-    private $filter;
 
     protected function setUp(): void
     {

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

@@ -9,13 +9,13 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Tests\Export\Filter\AccompanyingCourseFilters;
+namespace Chill\ActivityBundle\Tests\Export\Filter;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Export\Filter\ActivityTypeFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActivityTypeFilter;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @internal
@@ -27,16 +27,15 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
     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->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $this->filter = self::$container->get('chill.person.export.filter_activitytype');
+        $this->filter = self::$container->get('chill.activity.export.type_filter');
     }
 
     public function getFilter()
@@ -56,8 +55,10 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         $data = [];
 
-        foreach ($array as $t) {
+        foreach ($array as $a) {
-            $data[] = ['accepted_activitytypes' => $t];
+            $data[] = [
+                'types' => $a
+            ];
         }
 
         return $data;
@@ -73,8 +74,8 @@ final class ActivityTypeFilterTest extends AbstractFilterTest
 
         return [
             $em->createQueryBuilder()
-                ->from('ChillPersonBundle:AccompanyingPeriod', 'acp')
+                ->select('count(activity.id)')
-                ->select('acp.id'),
+                ->from(Activity::class, 'activity'),
         ];
     }
 }

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityReasonFilterTest extends AbstractFilterTest
+{
+    private ActivityReasonFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.reason_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(ActivityReason::class, 'ar')
+            ->select('ar')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'reasons' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity')
+                ->join('activity.reasons', 'actreasons'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php

@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
+use Chill\MainBundle\Test\Export\AbstractFilterTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
+{
+    private PersonHavingActivityBetweenDateFilter $filter;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        // add a fake request with a default locale (used in translatable string)
+        $request = $this->prophesize();
+
+        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request->getLocale()->willReturn('fr');
+
+        $this->filter = self::$container->get('chill.activity.export.person_having_an_activity_between_date_filter');
+    }
+
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    public function getFormData(): array
+    {
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        $array = $em->createQueryBuilder()
+            ->from(ActivityReason::class, 'ar')
+            ->select('ar')
+            ->getQuery()
+            ->getResult();
+
+        $data = [];
+
+        foreach ($array as $a) {
+            $data[] = [
+                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
+                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+                'reasons' => $a
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(activity.id)')
+                ->from(Activity::class, 'activity'),
+        ];
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
+use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;
 use function array_slice;
@@ -21,10 +22,7 @@ use function array_slice;
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 {
-    /**
+    private PersonHavingActivityBetweenDateFilter $filter;
-     * @var \Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
-     */
-    private $filter;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -67,10 +67,10 @@ services:
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
 
-    chill.person.export.filter_activitytype:
+    chill.activity.export.filter_activitytype:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter
         tags:
-            - { name: chill.export_filter, alias: accompanyingcourse_activitytype_filter }
+            - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
 
     chill.activity.export.locationtype_filter:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -442,6 +442,12 @@ class ExportController extends AbstractController
         }
 
         $rawData = unserialize($serialized);
+
+        $this->logger->notice('[export] choices for an export unserialized', [
+            'key' => $key,
+            'rawData' => json_encode($rawData)
+        ]);
+
         $alias = $rawData['alias'];
 
         $formCenters = $this->createCreateFormExport($alias, 'generate_centers');

src/Bundle/ChillMainBundle/Export/ExportManager.php

@@ -264,15 +264,17 @@ class ExportManager
             //handle aggregators
             $this->handleAggregators($export, $query, $data[ExportType::AGGREGATOR_KEY], $centers);
 
-            $this->logger->debug('current query is ' . $query->getDQL(), [
+            $this->logger->notice('[export] will execute this qb in export', [
-                'class' => self::class, 'function' => __FUNCTION__,
+                'dql' => $query->getDQL()
             ]);
+
         } else {
             throw new UnexpectedValueException('The method `intiateQuery` should return '
                     . 'a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` '
                     . 'object.');
         }
 
+
         $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]);
 
         if (!is_iterable($result)) {

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

@@ -25,7 +25,6 @@ use function is_string;
 /**
  * Helper which creates a set of test for aggregators.
  *
- * @internal
  */
 abstract class AbstractAggregatorTest extends KernelTestCase
 {

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

@@ -24,7 +24,6 @@ use function is_string;
 /**
  *  Helper to test filters.
  *
- * @internal
  */
 abstract class AbstractFilterTest extends KernelTestCase
 {

src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php

@@ -25,23 +25,17 @@ class AbstractAccompanyingPeriodExportElement
      */
     protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
     {
-        if (false === $this->havingAccompanyingPeriodInJoin($query)) {
+        if (false === in_array('person', $query->getAllAliases(), true)) {
-            if (false === in_array('person', $query->getAllAliases(), true)) {
+            throw new LogicException("the alias 'person' does not exists in "
-                throw new LogicException("the alias 'person' does not exists in "
+                . 'query builder');
-                    . 'query builder');
+        }
-            }
 
-            $query->join('person.accompanyingPeriods', 'accompanying_period');
+        if (!in_array('acppart', $query->getAllAliases(), true)) {
+            $query->join('person.accompanyingPeriodParticipations', 'acppart');
+        }
+
+        if (!in_array('acp', $query->getAllAliases(), true)) {
+            $query->join('acppart.accompanyingPeriod', 'acp');
         }
     }
-
-    /**
-     * Return true if "accompanying_period" alias is present in the query alises.
-     */
-    protected function havingAccompanyingPeriodInJoin(QueryBuilder $query): bool
-    {
-        $joins = $query->getDQLPart('join') ?? [];
-
-        return in_array('accompanying_period', $query->getAllAliases(), true);
-    }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php

@@ -40,18 +40,11 @@ class AdministrativeLocationAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acploc', $qb->getAllAliases(), true)) {
-            $qb->join('acp.administrativeLocation', 'acploc');
+            $qb->leftJoin('acp.administrativeLocation', 'acploc');
         }
 
         $qb->addSelect('IDENTITY(acp.administrativeLocation) AS location_aggregator');
-
+        $qb->addGroupBy('location_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_aggregator');
-        } else {
-            $qb->groupBy('location_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ class AdministrativeLocationAggregator implements AggregatorInterface
                 return 'Administrative location';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $l = $this->locationRepository->find($value);
 
             return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php

@@ -15,6 +15,7 @@ use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,10 +27,10 @@ class ClosingMotiveAggregator implements AggregatorInterface
     private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
-        EntityManagerInterface $em,
+        ClosingMotiveRepository $motiveRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
-        $this->motiveRepository = $em->getRepository(ClosingMotive::class);
+        $this->motiveRepository = $motiveRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
@@ -40,19 +41,8 @@ class ClosingMotiveAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpmotive', $qb->getAllAliases(), true)) {
-            $qb->join('acp.closingMotive', 'acpmotive');
-        }
-
         $qb->addSelect('IDENTITY(acp.closingMotive) AS closingmotive_aggregator');
-
+        $qb->addGroupBy('closingmotive_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('closingmotive_aggregator');
-        } else {
-            $qb->groupBy('closingmotive_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -72,6 +62,10 @@ class ClosingMotiveAggregator implements AggregatorInterface
                 return 'Closing motive';
             }
 
+            if (NULL === $value) {
+                return '';
+            }
+
             $cm = $this->motiveRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php

@@ -35,14 +35,7 @@ class ConfidentialAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.confidential AS confidential_aggregator');
-
+        $qb->addGroupBy('confidential_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('confidential_aggregator');
-        } else {
-            $qb->groupBy('confidential_aggregator');
-        }
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php

@@ -44,15 +44,8 @@ final class DurationAggregator implements AggregatorInterface
         // et ajouter une fonction custom qui calcule plus précisément les intervals, comme doctrineum/date-interval
         // https://packagist.org/packages/doctrineum/date-interval#3.1.0 (mais composer fait un conflit de dépendance)
 
-        $groupBy = $qb->getDQLPart('groupBy');
+        $qb->addGroupBy('duration_aggregator');
-
+        $qb->addOrderBy('duration_aggregator');
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('duration_aggregator');
-        } else {
-            $qb->groupBy('duration_aggregator');
-        }
-
-        $qb->orderBy('duration_aggregator');
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php

@@ -35,14 +35,7 @@ class EmergencyAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.emergency AS emergency_aggregator');
-
+        $qb->addGroupBy('emergency_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('emergency_aggregator');
-        } else {
-            $qb->groupBy('emergency_aggregator');
-        }
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php

@@ -41,22 +41,15 @@ final class EvaluationAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpw', $qb->getAllAliases(), true)) {
-            $qb->join('acp.works', 'acpw');
+            $qb->leftJoin('acp.works', 'acpw');
         }
 
         if (!in_array('workeval', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
+            $qb->leftJoin('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
         $qb->addSelect('IDENTITY(workeval.evaluation) AS evaluation_aggregator');
-
+        $qb->addGroupBy('evaluation_aggregator');
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('evaluation_aggregator');
-        } else {
-            $qb->groupBy('evaluation_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -76,6 +69,10 @@ final class EvaluationAggregator implements AggregatorInterface
                 return 'Evaluation';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $e = $this->evaluationRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php

@@ -35,14 +35,7 @@ class IntensityAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.intensity AS intensity_aggregator');
-
+        $qb->addGroupBy('intensity_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('intensity_aggregator');
-        } else {
-            $qb->groupBy('intensity_aggregator');
-        }
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php

@@ -40,18 +40,11 @@ final class JobAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpjob', $qb->getAllAliases(), true)) {
-            $qb->join('acp.job', 'acpjob');
+            $qb->leftJoin('acp.job', 'acpjob');
         }
 
         $qb->addSelect('IDENTITY(acp.job) AS job_aggregator');
-
+        $qb->addGroupBy('job_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class JobAggregator implements AggregatorInterface
                 return 'Job';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $j = $this->jobRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php

@@ -42,18 +42,11 @@ final class OriginAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acporigin', $qb->getAllAliases(), true)) {
-            $qb->join('acp.origin', 'acporigin');
+            $qb->leftJoin('acp.origin', 'acporigin');
         }
 
         $qb->addSelect('acporigin.id AS origin_aggregator');
-
+        $qb->addGroupBy('origin_aggregator');
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('origin_aggregator');
-        } else {
-            $qb->groupBy('origin_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -73,6 +66,10 @@ final class OriginAggregator implements AggregatorInterface
                 return 'Origin';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $o = $this->repository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php

@@ -40,18 +40,11 @@ final class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpuser', $qb->getAllAliases(), true)) {
-            $qb->join('acp.user', 'acpuser');
+            $qb->leftJoin('acp.user', 'acpuser');
         }
 
         $qb->addSelect('acpuser.id AS referrer_aggregator');
-
+        $qb->addGroupBy('referrer_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('referrer_aggregator');
-        } else {
-            $qb->groupBy('referrer_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class ReferrerAggregator implements AggregatorInterface
                 return 'Referrer';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $r = $this->userRepository->find($value);
 
             return $this->userRender->renderString($r, []);

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php

@@ -57,15 +57,7 @@ final class RequestorAggregator implements AggregatorInterface
             END ) AS requestor_aggregator
         ");
 
-        $groupBy = $qb->getDQLPart('groupBy');
+        $qb->addGroupBy('requestor_aggregator');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('requestor_aggregator');
-        } else {
-            $qb->groupBy('requestor_aggregator');
-        }
-
-        // TODO 'order by' does not works !
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php

@@ -40,18 +40,11 @@ final class ScopeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpscope', $qb->getAllAliases(), true)) {
-            $qb->join('acp.scopes', 'acpscope');
+            $qb->leftJoin('acp.scopes', 'acpscope');
         }
 
         $qb->addSelect('acpscope.id as scope_aggregator');
-
+        $qb->addGroupBy('scope_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class ScopeAggregator implements AggregatorInterface
                 return 'Scope';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $s = $this->scopeRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php

@@ -41,18 +41,12 @@ final class SocialActionAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpw', $qb->getAllAliases(), true)) {
+            // here, we will only see accompanying period linked with a socialAction
             $qb->join('acp.works', 'acpw');
         }
 
-        $qb->addSelect('IDENTITY(acpw.socialAction) AS socialaction_aggregator'); // DISTINCT ??
+        $qb->addSelect('IDENTITY(acpw.socialAction) AS socialaction_aggregator');
-
+        $qb->addGroupBy('socialaction_aggregator');
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialaction_aggregator');
-        } else {
-            $qb->groupBy('socialaction_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -72,6 +66,10 @@ final class SocialActionAggregator implements AggregatorInterface
                 return 'Social action';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $sa = $this->actionRepository->find($value);
 
             return $this->actionRender->renderString($sa, []);

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php

@@ -40,18 +40,12 @@ final class SocialIssueAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+            // we will see accompanying period linked with social issues
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
-        
+
         $qb->addSelect('acpsocialissue.id as socialissue_aggregator');
-
+        $qb->addGroupBy('socialissue_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialissue_aggregator');
-        } else {
-            $qb->groupBy('socialissue_aggregator');
-        }
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php

@@ -41,15 +41,9 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.step AS step_aggregator');
+        $qb->addGroupBy('step_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
+        /*
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('step_aggregator');
-        } else {
-            $qb->groupBy('step_aggregator');
-        }
-
         // add date in where clause
         $where = $qb->getDQLPart('where');
 
@@ -69,6 +63,7 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
 
         $qb->add('where', $where);
         $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        */
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php

@@ -39,15 +39,8 @@ class EvaluationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->addSelect('IDENTITY(eval.evaluation) AS evaluationtype_aggregator');
+        $qb->addSelect('IDENTITY(workeval.evaluation) AS eval_evaluationtype_aggregator');
-
+        $qb->addGroupBy('eval_evaluationtype_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('evaluationtype_aggregator');
-        } else {
-            $qb->groupBy('evaluationtype_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -67,6 +60,10 @@ class EvaluationTypeAggregator implements AggregatorInterface
                 return 'Evaluation type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $ev = $this->evaluationRepository->find($value);
 
             return $this->translatableStringHelper->localize($ev->getTitle());
@@ -75,7 +72,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['evaluationtype_aggregator'];
+        return ['eval_evaluationtype_aggregator'];
     }
 
     public function getTitle(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/MaritalStatusAggregator.php

@@ -59,6 +59,7 @@ final class MaritalStatusAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
+        // no form
     }
 
     public function getLabels($key, array $values, $data)

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php

@@ -44,14 +44,7 @@ final class ActionTypeAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('acpwsocialaction.id as action_type_aggregator');
-
+        $qb->addGroupBy('action_type_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('action_type_aggregator');
-        } else {
-            $qb->groupBy('action_type_aggregator');
-        }
     }
 
     public function applyOn()
@@ -71,6 +64,10 @@ final class ActionTypeAggregator implements AggregatorInterface
                 return 'Social Action Type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $sa = $this->socialActionRepository->find($value);
 
             return $this->actionRender->renderString($sa, []);

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php

@@ -38,18 +38,11 @@ final class GoalAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('goal', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.goals', 'goal');
+            $qb->leftJoin('acpw.goals', 'goal');
         }
 
-        $qb->addSelect('IDENTITY(goal.goal) as goal_aggregator');
+        $qb->addSelect('IDENTITY(goal.goal) as acpw_goal_aggregator');
-
+        $qb->addGroupBy('acpw_goal_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('goal_aggregator');
-        } else {
-            $qb->groupBy('goal_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -69,8 +62,12 @@ final class GoalAggregator implements AggregatorInterface
                 return 'Goal Type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $g = $this->goalRepository->find($value);
-            
+
             return $this->translatableStringHelper->localize(
                 $g->getTitle()
             );
@@ -79,7 +76,7 @@ final class GoalAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['goal_aggregator'];
+        return ['acpw_goal_aggregator'];
     }
 
     public function getTitle(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php

@@ -40,18 +40,11 @@ final class JobAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
-        $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator');
+        $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator')
-
+            ->addGroupBy('job_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class JobAggregator implements AggregatorInterface
                 return 'Job';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $j = $this->jobRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php

@@ -40,18 +40,11 @@ final class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
         $qb->addSelect('acpwuser.id AS referrer_aggregator');
-
+        $qb->addGroupBy('referrer_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('referrer_aggregator');
-        } else {
-            $qb->groupBy('referrer_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class ReferrerAggregator implements AggregatorInterface
                 return 'Referrer';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $r = $this->userRepository->find($value);
 
             return $this->userRender->renderString($r, []);

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php

@@ -41,15 +41,8 @@ final class ResultAggregator implements AggregatorInterface
             $qb->join('acpw.results', 'result');
         }
 
-        $qb->addSelect('result.id as result_aggregator');
+        $qb->addSelect('result.id AS acpw_result_aggregator');
-
+        $qb->addGroupBy('acpw_result_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('result_aggregator');
-        } else {
-            $qb->groupBy('result_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -69,6 +62,10 @@ final class ResultAggregator implements AggregatorInterface
                 return 'Result Type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $r = $this->resultRepository->find($value);
 
             return $this->translatableStringHelper->localize(
@@ -79,7 +76,7 @@ final class ResultAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['result_aggregator'];
+        return ['acpw_result_aggregator'];
     }
 
     public function getTitle(): string

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php

@@ -40,18 +40,11 @@ final class ScopeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
         $qb->addSelect('IDENTITY(acpwuser.mainScope) as scope_aggregator');
-
+        $qb->addGroupBy('scope_aggregator');
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
     }
 
     public function applyOn(): string
@@ -71,6 +64,10 @@ final class ScopeAggregator implements AggregatorInterface
                 return 'Scope';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $s = $this->scopeRepository->find($value);
 
             return $this->translatableStringHelper->localize(

src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php

@@ -98,7 +98,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
             $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
-        $qb->select('COUNT(workeval.id) AS export_result');
+        $qb->select('COUNT(DISTINCT workeval.id) AS export_result');
 
         return $qb;
     }

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

@@ -29,24 +29,9 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
+        $clause = "OVERLAPSI (acp.openingDate, acp.closingDate), (:datefrom, :dateto) = 'TRUE'";
 
-        $clause = $qb->expr()->orX(
+        $qb->andWhere($clause);
-            $qb->expr()->lt('(acp.openingDate + 1)', ':dateto'),
-            $qb->expr()->andX(
-                $qb->expr()->lt('acp.openingDate', ':datefrom'),
-                $qb->expr()->isNull('acp.closingDate')
-            ),
-            $qb->expr()->gt('(acp.closingDate - 1)', ':datefrom')
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
         $qb->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
         $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
     }

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

@@ -29,20 +29,12 @@ class OpenBetweenDatesFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
-
         $clause = $qb->expr()->andX(
-            $qb->expr()->lt('acp.openingDate', ':datefrom'),
+            $qb->expr()->gte('acp.openingDate', ':datefrom'),
-            $qb->expr()->gt('acp.closingDate', ':dateto')
+            $qb->expr()->lte('acp.openingDate', ':dateto')
         );
 
-        if ($where instanceof Andx) {
+        $qb->andWhere($clause);
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
         $qb->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
         $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
     }

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

@@ -70,10 +70,6 @@ final class RequestorFilter implements FilterInterface
             case 'other_person':
                 $expr = $this->em->getExpressionBuilder();
 
-                if (!in_array('acppart', $qb->getAllAliases(), true)) {
-                    $qb->join('acp.participations', 'acppart');
-                }
-
                 $clause = $expr->andX(
                     $expr->isNotNull('acp.requestorPerson'),
                     $expr->notIn(
@@ -85,6 +81,7 @@ final class RequestorFilter implements FilterInterface
                             ->join('acp2.participations', 'acppart2')
                             ->select('identity(acp2.requestorPerson)')
                             ->where($expr->eq('acp2.requestorPerson', 'acppart2.person'))
+                            ->andWhere('acp2.id = acp.id')
                             ->getDQL()
                     )
                 );

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php

@@ -32,8 +32,8 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
         $this->addJoinAccompanyingPeriod($qb);
 
         $clause = $qb->expr()->andX(
-            $qb->expr()->lte('accompanying_period.closingDate', ':date_to'),
+            $qb->expr()->lte('acp.closingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.closingDate', ':date_from')
+            $qb->expr()->gte('acp.closingDate', ':date_from')
         );
 
         $qb->andWhere($clause);

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php

@@ -34,12 +34,12 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
         $clause = $qb->expr()->andX();
 
         $clause->add(
-            $qb->expr()->lte('accompanying_period.openingDate', ':date_to')
+            $qb->expr()->lte('acp.openingDate', ':date_to')
         );
         $clause->add(
             $qb->expr()->orX(
-                $qb->expr()->gte('accompanying_period.closingDate', ':date_from'),
+                $qb->expr()->gte('acp.closingDate', ':date_from'),
-                $qb->expr()->isNull('accompanying_period.closingDate')
+                $qb->expr()->isNull('acp.closingDate')
             )
         );
 

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php

@@ -32,8 +32,8 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
         $this->addJoinAccompanyingPeriod($qb);
 
         $clause = $qb->expr()->andX(
-            $qb->expr()->lte('accompanying_period.openingDate', ':date_to'),
+            $qb->expr()->lte('acp.openingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.openingDate', ':date_from')
+            $qb->expr()->gte('acp.openingDate', ':date_from')
         );
 
         $qb->andWhere($clause);

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
+{
+    private AdministrativeLocationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_administrative_location');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.administrativeLocation', 'acploc')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
+{
+    private ClosingMotiveAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_closingmotive');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.closingMotive', 'acpmotive')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ConfidentialAggregatorTest extends AbstractAggregatorTest
+{
+    private ConfidentialAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_confidential');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class DurationAggregatorTest extends AbstractAggregatorTest
+{
+    private DurationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_duration');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EmergencyAggregatorTest extends AbstractAggregatorTest
+{
+    private EmergencyAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_emergency');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EvaluationAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluation');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class IntensityAggregatorTest extends AbstractAggregatorTest
+{
+    private IntensityAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_intensity');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class JobAggregatorTest extends AbstractAggregatorTest
+{
+    private JobAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_job');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.job', 'acpjob')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class OriginAggregatorTest extends AbstractAggregatorTest
+{
+    private OriginAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_origin');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.origin', 'acporigin')
+                ,
+        ];
+    }
+}

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

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ReferrerAggregatorTest extends AbstractAggregatorTest
+{
+    private ReferrerAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.user', 'acpuser')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class RequestorAggregatorTest extends AbstractAggregatorTest
+{
+    private RequestorAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_requestor');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private ScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_scope');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.scopes', 'acpscope')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class SocialActionAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialActionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialaction');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class SocialIssueAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialIssueAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialissue');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.socialIssues', 'acpsocialissue')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class StepAggregatorTest extends AbstractAggregatorTest
+{
+    private StepAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_step');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-01-01'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\EvaluationAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationTypeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluationtype');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
+{
+    private ChildrenNumberAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_childrennumber');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition')
+                ,
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class CompositionAggregatorTest extends AbstractAggregatorTest
+{
+    private CompositionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_composition');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => \DateTime::createFromFormat('Y-m-d', '2022-07-01')
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition')
+                ,
+        ];
+    }
+}