Merge remote-tracking branch 'origin/rector/rules-symfony' into rector/rules-symfony

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

@@ -12,15 +12,22 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+class ActivityUsersJobAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly UserJobRepositoryInterface $userJobRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    private const PREFIX = 'act_agg_user_job';
+
+    public function __construct(
+        private readonly UserJobRepositoryInterface $userJobRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -29,24 +36,37 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
-            ->addGroupBy('activity_users_job_aggregator');
+            ->leftJoin("activity.users", "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Expr\Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -73,11 +93,11 @@ class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorI
 
     public function getQueryKeys($data): array
     {
-        return ['activity_users_job_aggregator'];
+        return [self::PREFIX . '_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'Aggregate by users job';
+        return 'export.aggregator.activity.by_user_job.Aggregate by users job';
     }
 }

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

@@ -12,15 +12,22 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+class ActivityUsersScopeAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    private const PREFIX = 'act_agg_user_scope';
+
+    public function __construct(
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -29,24 +36,37 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
+        $p = self::PREFIX;
 
         $qb
-            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
-            ->addGroupBy('activity_users_main_scope_aggregator');
+            ->leftJoin("activity.users", "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Expr\Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // nothing to add in the form
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -73,11 +93,11 @@ class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\Aggregato
 
     public function getQueryKeys($data): array
     {
-        return ['activity_users_main_scope_aggregator'];
+        return [self::PREFIX . '_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
-        return 'Aggregate by users scope';
+        return 'export.aggregator.activity.by_user_scope.Aggregate by users scope';
     }
 }

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

@@ -12,16 +12,22 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class CreatorScopeAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly ScopeRepository $scopeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
+    private const PREFIX = 'acp_agg_creator_scope';
+
+    public function __construct(
+        private readonly ScopeRepository $scopeRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -30,12 +36,28 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.createdBy', 'actcreator');
-        }
+        $p = self::PREFIX;
 
-        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
-        $qb->addGroupBy('creatorscope_aggregator');
+        $qb
+            ->leftJoin("activity.createdBy", "{$p}_user")
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
     }
 
     public function applyOn(): string
@@ -43,10 +65,8 @@ class CreatorScopeAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
+    public function buildForm(FormBuilderInterface $builder) {}
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -73,11 +93,11 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['creatorscope_aggregator'];
+        return [self::PREFIX . '_select'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by creator scope';
+        return 'export.aggregator.activity.by_creator_scope.Group activity by creator scope';
     }
 }

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

@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class JobScopeAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_agg_creator_job';
+
+    public function __construct(
+        private readonly ScopeRepository $scopeRepository,
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin("activity.createdBy", "{$p}_user")
+            ->leftJoin(
+                UserJobHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // job_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                    )
+                )
+            )
+            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
+            ->addGroupBy("{$p}_select");
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [self::PREFIX . '_select'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.activity.by_creator_job.Group activity by creator job';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -57,7 +57,7 @@ class ListActivityHelper
             ->addSelect('AGGREGATE(actPerson.id) AS personsNames')
             ->leftJoin('activity.users', 'users_u')
             ->addSelect('AGGREGATE(users_u.id) AS usersIds')
-            ->addSelect('AGGREGATE(users_u.id) AS usersNames')
+            ->addSelect('AGGREGATE(JSON_BUILD_OBJECT(\'uid\', users_u.id, \'d\', activity.date)) AS usersNames')
             ->leftJoin('activity.thirdParties', 'thirdparty')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
@@ -68,9 +68,9 @@ class ListActivityHelper
             ->leftJoin('activity.location', 'location')
             ->addSelect('location.name AS locationName')
             ->addSelect('activity.sentReceived')
-            ->addSelect('IDENTITY(activity.createdBy) AS createdBy')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
             ->addSelect('activity.createdAt')
-            ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
             ->addSelect('activity.updatedAt')
             ->addGroupBy('activity.id')
             ->addGroupBy('location.id');

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

@@ -13,17 +13,21 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class UserScopeFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    private const PREFIX = 'acp_act_filter_user_scope';  // creator ? cfr translation
+
+    public function __construct(
+        private readonly TranslatableStringHelper $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -32,22 +36,33 @@ class UserScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->join('activity.user', 'actuser');
-        }
+        $p = self::PREFIX;
 
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('actuser.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
+        $qb
+            ->leftJoin("activity.user", "{$p}_user")  // createdBy ? cfr translation
+            ->leftJoin(
+                UserScopeHistory::class,
+                "{$p}_history",
+                Join::WITH,
+                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
+            )
+            // scope_at based on activity.date
+            ->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->lte("{$p}_history.startDate", "activity.date"),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull("{$p}_history.endDate"),
+                        $qb->expr()->gt("{$p}_history.endDate", "activity.date")
+                    )
+                )
+            )
+            ->andWhere(
+                $qb->expr()->in("{$p}_history.scope", ":{$p}_scopes")
+            )
+            ->setParameter(
+                "{$p}_scopes",
+                $data["scopes"],
+            );
     }
 
     public function applyOn(): string
@@ -57,37 +72,41 @@ class UserScopeFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('accepted_userscope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
-                $s->getName()
-            ),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-    public function getFormDefaultData(): array
-    {
-        return [];
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                    $s->getName()
+                ),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
     public function describeAction($data, $format = 'string'): array
     {
         $scopes = [];
 
-        foreach ($data['accepted_userscope'] as $s) {
+        foreach ($data['scopes'] as $s) {
             $scopes[] = $this->translatableStringHelper->localize(
                 $s->getName()
             );
         }
 
-        return ['Filtered activity by userscope: only %scopes%', [
+        return ['export.filter.activity.by_creator_scope.Filtered activity by user scope: only %scopes%', [
             '%scopes%' => implode(', ', $scopes),
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'scopes' => [],
+        ];
+    }
+
     public function getTitle(): string
     {
-        return 'Filter activity by userscope';
+        return 'export.filter.activity.by_creator_scope.Filter activity by user scope';
     }
 }

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

@@ -13,6 +13,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -22,7 +23,11 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersJobFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    private const PREFIX = 'act_filter_user_job';
+
+    public function __construct(
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -31,14 +36,25 @@ class UsersJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
-                JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND  activity_users_job_filter_act = activity '
+                    "SELECT 1 FROM " . Activity::class . " {$p}_act "
+                    . "JOIN {$p}_act.users {$p}_user "
+                    . "JOIN " . UserJobHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
+                    . "WHERE {$p}_act = activity "
+                    // job_at based on activity.date
+                    . "AND {$p}_history.startDate <= activity.date "
+                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    . "AND {$p}_history.job IN ( :{$p}_jobs )"
                 )
             )
-            ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
+            ->setParameter(
+                "{$p}_jobs",
+                $data["jobs"]
+            );
     }
 
     public function applyOn()
@@ -48,21 +64,18 @@ class UsersJobFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('jobs', EntityType::class, [
-            'class' => UserJob::class,
-            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-    public function getFormDefaultData(): array
-    {
-        return [];
+        $builder
+            ->add('jobs', EntityType::class, [
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [
+        return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [
             '%jobs%' => implode(
                 ', ',
                 array_map(
@@ -73,8 +86,15 @@ class UsersJobFilter implements FilterInterface
         ]];
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'jobs' => [],
+        ];
+    }
+
     public function getTitle()
     {
-        return 'export.filter.activity.by_usersjob.Filter by users job';
+        return 'export.filter.activity.by_users_job.Filter by users job';
     }
 }

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

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -23,7 +24,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersScopeFilter implements FilterInterface
 {
-    public function __construct(private readonly ScopeRepositoryInterface $scopeRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+    private const PREFIX = 'act_filter_user_scope';
+
+    public function __construct(
+        private readonly ScopeRepositoryInterface $scopeRepository,
+        private readonly TranslatableStringHelperInterface $translatableStringHelper
+    ) {}
 
     public function addRole(): ?string
     {
@@ -32,39 +38,47 @@ class UsersScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        $p = self::PREFIX;
+
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act
-                JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND  activity_users_scope_filter_act = activity '
+                    "SELECT 1 FROM " . Activity::class . " {$p}_act "
+                    . "JOIN {$p}_act.users {$p}_user "
+                    . "JOIN " . UserScopeHistory::class . " {$p}_history WITH {$p}_history.user = {$p}_user "
+                    . "WHERE {$p}_act = activity "
+                    // scope_at based on activity.date
+                    . "AND {$p}_history.startDate <= activity.date "
+                    . "AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
+                    . "AND {$p}_history.scope IN ( :{$p}_scopes )"
                 )
             )
-            ->setParameter('activity_users_scope_filter_scopes', $data['scopes']);
+            ->setParameter(
+                "{$p}_scopes",
+                $data["scopes"]
+            );
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('scopes', EntityType::class, [
-            'class' => Scope::class,
-            'choices' => $this->scopeRepository->findAllActive(),
-            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-    public function getFormDefaultData(): array
-    {
-        return [];
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choices' => $this->scopeRepository->findAllActive(),
+                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+                'multiple' => true,
+                'expanded' => true,
+            ]);
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
-        return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [
+        return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [
             '%scopes%' => implode(
                 ', ',
                 array_map(
@@ -75,8 +89,15 @@ class UsersScopeFilter implements FilterInterface
         ]];
     }
 
-    public function getTitle()
+    public function getFormDefaultData(): array
     {
-        return 'export.filter.activity.by_usersscope.Filter by users scope';
+        return [
+            'scopes' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.activity.by_users_scope.Filter by users scope';
     }
 }