Merge branch '111_exports_suite' into 641_issues_with_children

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -13,6 +13,10 @@ namespace Chill\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
@@ -55,8 +59,12 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     getUserFunction="getUser",
  * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
     public const SENTRECEIVED_RECEIVED = 'received';
 
     public const SENTRECEIVED_SENT = 'sent';

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

@@ -13,20 +13,19 @@ namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ByUserAggregator implements AggregatorInterface
+class ByCreatorAggregator implements AggregatorInterface
 {
     private UserRender $userRender;
 
-    private UserRepository $userRepository;
+    private UserRepositoryInterface $userRepository;
 
     public function __construct(
-        UserRepository $userRepository,
+        UserRepositoryInterface $userRepository,
         UserRender $userRender
     ) {
         $this->userRepository = $userRepository;
@@ -40,12 +39,8 @@ class ByUserAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
-
-        $qb->addSelect('actusers.id AS users_aggregator');
-        $qb->addGroupBy('users_aggregator');
+        $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
+        $qb->addGroupBy('creator_aggregator');
     }
 
     public function applyOn(): string
@@ -62,7 +57,7 @@ class ByUserAggregator implements AggregatorInterface
     {
         return function ($value): string {
             if ('_header' === $value) {
-                return 'Accepted users';
+                return 'Created by';
             }
 
             if (null === $value) {
@@ -77,11 +72,11 @@ class ByUserAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['users_aggregator'];
+        return ['creator_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by linked users';
+        return 'Group activity by creator';
     }
 }

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

@@ -19,7 +19,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
 
-class UserScopeAggregator implements AggregatorInterface
+class CreatorScopeAggregator implements AggregatorInterface
 {
     private ScopeRepository $scopeRepository;
 
@@ -40,12 +40,12 @@ class UserScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.user', 'actuser');
+        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.createdBy', 'actcreator');
         }
 
-        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
-        $qb->addGroupBy('userscope_aggregator');
+        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
+        $qb->addGroupBy('creatorscope_aggregator');
     }
 
     public function applyOn(): string
@@ -79,11 +79,11 @@ class UserScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['userscope_aggregator'];
+        return ['creatorscope_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'Group activity by userscope';
+        return 'Group activity by creator scope';
     }
 }

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

@@ -0,0 +1,86 @@
+<?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\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
+    {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('actusers.id AS activity_users_aggregator')
+            ->addGroupBy('activity_users_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add on the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Activity users';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_users_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by activity users';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserJobRepositoryInterface $userJobRepository;
+
+    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->userJobRepository = $userJobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
+            ->addGroupBy('activity_users_job_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s job';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $j = $this->userJobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_job_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users job';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
+            ->addGroupBy('activity_users_main_scope_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s scope';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_main_scope_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users scope';
+    }
+}

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

@@ -15,12 +15,10 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
-class ByUserFilter implements FilterInterface
+class ByCreatorFilter implements FilterInterface
 {
     private UserRender $userRender;
 
@@ -36,22 +34,11 @@ class ByUserFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->join('activity.users', 'actusers');
-        }
-
-        $clause = $qb->expr()->in('actusers.id', ':users');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('users', $data['accepted_users']);
+        $qb
+            ->andWhere(
+                $qb->expr()->in('activity.createdBy', ':users')
+            )
+            ->setParameter('users', $data['accepted_users']);
     }
 
     public function applyOn(): string
@@ -74,13 +61,13 @@ class ByUserFilter implements FilterInterface
             $users[] = $this->userRender->renderString($u, []);
         }
 
-        return ['Filtered activity by linked users: only %users%', [
+        return ['Filtered activity by creator: only %users%', [
             '%users%' => implode(', ou ', $users),
         ]];
     }
 
     public function getTitle(): string
     {
-        return 'Filter activity by linked users';
+        return 'Filter activity by creator';
     }
 }

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

@@ -0,0 +1,77 @@
+<?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\Filter;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ActivityUsersFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $orX = $qb->expr()->orX();
+
+        foreach ($data['accepted_users'] as $key => $user) {
+            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
+            $qb->setParameter('activity_users_filter_u' . $key, $user);
+        }
+
+        $qb->andWhere($orX);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', PickUserDynamicType::class, [
+            'multiple' => true,
+            'label' => 'Users',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by users: only %users%', [
+            '%users%' => implode(', ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by users';
+    }
+}

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

@@ -12,7 +12,7 @@ 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\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -22,7 +22,7 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class ByUserAggregatorTest extends AbstractAggregatorTest
 {
-    private ByUserAggregator $aggregator;
+    private ByCreatorAggregator $aggregator;
 
     protected function setUp(): void
     {

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

@@ -12,7 +12,7 @@ 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\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 
@@ -22,7 +22,7 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class UserScopeAggregatorTest extends AbstractAggregatorTest
 {
-    private UserScopeAggregator $aggregator;
+    private CreatorScopeAggregator $aggregator;
 
     protected function setUp(): void
     {

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

@@ -12,7 +12,7 @@ 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\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\ORM\EntityManagerInterface;
@@ -23,7 +23,7 @@ use Doctrine\ORM\EntityManagerInterface;
  */
 final class ByUserFilterTest extends AbstractFilterTest
 {
-    private ByUserFilter $filter;
+    private ByCreatorFilter $filter;
 
     protected function setUp(): void
     {

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

@@ -55,6 +55,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
+    Chill\ActivityBundle\Export\Filter\ActivityUsersFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'activity_users_filter' }
+
     chill.activity.export.reason_filter:
         class: Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter
         tags:
@@ -77,10 +81,9 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_locationtype_filter' }
 
-    chill.activity.export.byuser_filter:  # TMS (M2M)
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter
+    Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter:
         tags:
-            - { name: chill.export_filter, alias: 'activity_byuser_filter' }
+            - { name: chill.export_filter, alias: 'activity_bycreator_filter' }
 
     chill.activity.export.emergency_filter:
         class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
@@ -138,10 +141,9 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_date_aggregator }
 
-    chill.activity.export.byuser_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator
+    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator:
         tags:
-            - { name: chill.export_aggregator, alias: activity_byuser_aggregator }
+            - { name: chill.export_aggregator, alias: activity_by_creator_aggregator }
 
     chill.activity.export.bythirdparty_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
@@ -158,7 +160,18 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
 
-    chill.activity.export.userscope_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator
+    Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator:
         tags:
-            - { name: chill.export_aggregator, alias: activity_userscope_aggregator }
+            - { name: chill.export_aggregator, alias: activity_creator_scope_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersScopeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_scope_aggregator }
+
+    Chill\ActivityBundle\Export\Aggregator\ActivityUsersJobAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_users_job_aggregator }

src/Bundle/ChillActivityBundle/migrations/Version20221014130554.php

@@ -0,0 +1,59 @@
+<?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\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20221014130554 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP updatedAt');
+        $this->addSql('ALTER TABLE activity DROP createdAt');
+        $this->addSql('ALTER TABLE activity DROP updatedBy_id');
+        $this->addSql('ALTER TABLE activity DROP createdBy_id');
+
+        // rename some indexes on activity
+        $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
+        $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
+        $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
+        $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Track update and create on activity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE activity ADD createdBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN activity.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN activity.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095A65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095A3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_AC74095A65FF1AEC ON activity (updatedBy_id)');
+        $this->addSql('CREATE INDEX IDX_AC74095A3174800F ON activity (createdBy_id)');
+
+        // rename some indexes on activity
+        $this->addSql('ALTER INDEX idx_55026b0cc54c8c93 RENAME TO IDX_AC74095AC54C8C93');
+        $this->addSql('ALTER INDEX idx_55026b0c217bbb47 RENAME TO IDX_AC74095A217BBB47');
+        $this->addSql('ALTER INDEX idx_55026b0c682b5931 RENAME TO IDX_AC74095A682B5931');
+        $this->addSql('ALTER INDEX idx_55026b0ca76ed395 RENAME TO IDX_AC74095AA76ED395');
+
+        $this->addSql('UPDATE activity SET updatedBy_id=user_id, createdBy_id=user_id, createdAt="date", updatedAt="date"');
+    }
+}

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

@@ -252,8 +252,6 @@ Filter by activity type: Filtrer les activités par type
 Filter activity by locationtype: Filtrer les activités par type de localisation
 'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
 Accepted locationtype: Types de localisation
-Filter activity by linked users: Filtrer les activités par TMS
-'Filtered activity by linked users: only %users%': "Filtré par TMS: uniquement %users%"
 Accepted users: TMS(s)
 Filter activity by emergency: Filtrer les activités par urgence
 'Filtered activity by emergency: only %emergency%': "Filtré par urgence: uniquement si %emergency%"
@@ -269,7 +267,11 @@ Filter activity by linked socialaction: Filtrer les activités par action liée
 Filter activity by linked socialissue: Filtrer les activités par problématique liée
 'Filtered activity by linked socialissue: only %issues%': "Filtré par problématique liée: uniquement %issues%"
 Filter activity by user: Filtrer les activités par créateur
-'Filtered activity by user: only %users%': "Filtré par créateur: uniquement %users%"
+Filter activity by users: Filtrer les activités par utilisateur participant
+Filter activity by creator: Filtrer les activités par créateur de l'échange
+'Filtered activity by user: only %users%': "Filtré par référent: uniquement %users%"
+'Filtered activity by users: only %users%': "Filtré par utilisateurs participants: uniquement %users%"
+'Filtered activity by creator: only %users%': "Filtré par créateur: uniquement %users%"
 Creators: Créateurs
 Filter activity by userscope: Filtrer les activités par service du créateur
 'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
@@ -282,9 +284,14 @@ By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper les activités par utilisateur
+Aggregate by activity user: Grouper les activités par référent
+Aggregate by activity users: Grouper les activités par utilisateurs participants
 Aggregate by activity type: Grouper les activités par type
 Aggregate by activity reason: Grouper les activités par sujet
+Aggregate by users scope: Grouper les activités par service principal de l'utilisateur
+Users 's scope: Service principal des utilisateurs participants à l'activité
+Aggregate by users job: Grouper les activités par métier des utilisateurs participants
+Users 's job: Métier des utilisateurs participants à l'activité
 
 Group activity by locationtype: Grouper les activités par type de localisation
 Group activity by date: Grouper les activités par date
@@ -294,7 +301,8 @@ by week: Par semaine
 for week: Semaine
 by year: Par année
 in year: En
-Group activity by linked users: Grouper les activités par TMS impliqué
+Group activity by creator: Grouper les activités par créateur de l'échange
+Group activity by creator scope: Grouper les activités par service du créateur de l'échange
 Group activity by linked thirdparties: Grouper les activités par tiers impliqué
 Accepted thirdparty: Tiers impliqué
 Group activity by linked socialaction: Grouper les activités par action liée