DX: rename UserScopeFilter to CreatorScopeFilter

This commit is contained in:
Julien Fastré 2023-10-24 14:17:08 +02:00
parent 5f805626f7
commit 7bff5ce39e
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 10 additions and 8 deletions

View File

@ -21,9 +21,9 @@ use Doctrine\ORM\QueryBuilder;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\FormBuilderInterface;
class UserScopeFilter implements FilterInterface
class CreatorScopeFilter implements FilterInterface
{
private const PREFIX = 'acp_act_filter_user_scope'; // creator ? cfr translation
private const PREFIX = 'acp_act_filter_creator_scope';
public function __construct(
private readonly TranslatableStringHelper $translatableStringHelper
@ -39,7 +39,7 @@ class UserScopeFilter implements FilterInterface
$p = self::PREFIX;
$qb
->leftJoin('activity.user', "{$p}_user") // createdBy ? cfr translation
->leftJoin('activity.createdBy', "{$p}_user")
->leftJoin(
UserScopeHistory::class,
"{$p}_history",

View File

@ -12,7 +12,7 @@ declare(strict_types=1);
namespace Chill\ActivityBundle\Tests\Export\Filter;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Export\Filter\UserScopeFilter;
use Chill\ActivityBundle\Export\Filter\CreatorScopeFilter;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Test\Export\AbstractFilterTest;
use Doctrine\ORM\EntityManagerInterface;
@ -22,15 +22,15 @@ use Doctrine\ORM\EntityManagerInterface;
*
* @coversNothing
*/
final class UserScopeFilterTest extends AbstractFilterTest
final class CreatorScopeFilterTest extends AbstractFilterTest
{
private UserScopeFilter $filter;
private CreatorScopeFilter $filter;
protected function setUp(): void
{
self::bootKernel();
$this->filter = self::$container->get(UserScopeFilter::class);
$this->filter = self::$container->get(CreatorScopeFilter::class);
}
public function getFilter()

View File

@ -109,8 +109,10 @@ services:
tags:
- { name: chill.export_filter, alias: 'activity_user_filter' }
Chill\ActivityBundle\Export\Filter\UserScopeFilter:
Chill\ActivityBundle\Export\Filter\CreatorScopeFilter:
tags:
# WARNING: for backward compatibility reason, the alias is named with userscope. Changing this will
# affect all saved exports (unless we write a migration for that)
- { name: chill.export_filter, alias: 'activity_userscope_filter' }
Chill\ActivityBundle\Export\Filter\UsersJobFilter: