Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-04 13:54:59 +00:00
Code Issues Actions Projects Releases Wiki Activity

use correct repository for filters and aggregators

Browse Source
This commit is contained in:
Julien Fastré
2025-03-12 17:41:59 +01:00
parent a789bf5e1c
commit 3a738179f2
51 changed files with 163 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php
View File

@@ -27,9 +27,9 @@ class ByActivityTypeFilter implements FilterInterface
use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
public function __construct(
private readonly CategoryRender $categoryRender,
private readonly CategoryRender $categoryRender,
private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly AsideActivityCategoryRepository $asideActivityTypeRepository,
private readonly AsideActivityCategoryRepository $asideActivityTypeRepository, private readonly AsideActivityCategoryRepository $asideActivityCategoryRepository,
) {}
public function addRole(): ?string
@@ -82,7 +82,7 @@ class ByActivityTypeFilter implements FilterInterface
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['types' => $this->denormalizeDoctrineEntity($formData['types'], $this->someRepository)];
return ['types' => $this->denormalizeDoctrineEntity($formData['types'], $this->asideActivityCategoryRepository)];
}
public function getFormDefaultData(): array

4
src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php
View File

@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\PickUserLocationType;
use Chill\MainBundle\Repository\LocationRepository;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
@@ -27,6 +28,7 @@ final readonly class ByLocationFilter implements FilterInterface
public function __construct(
private Security $security,
private LocationRepository $locationRepository,
) {}
public function getTitle(): string
@@ -52,7 +54,7 @@ final readonly class ByLocationFilter implements FilterInterface
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['locations' => $this->denormalizeDoctrineEntity($formData['locations'], $this->someRepository)];
return ['locations' => $this->denormalizeDoctrineEntity($formData['locations'], $this->locationRepository)];
}
public function getFormDefaultData(): array

7
src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserFilter.php
View File

@@ -14,15 +14,16 @@ namespace Chill\AsideActivityBundle\Export\Filter;
use Chill\AsideActivityBundle\Export\Declarations;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\PickUserDynamicType;
use Chill\MainBundle\Repository\UserRepository;
use Chill\MainBundle\Templating\Entity\UserRender;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
class ByUserFilter implements FilterInterface
final readonly class ByUserFilter implements FilterInterface
{
use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
public function __construct(private readonly UserRender $userRender) {}
public function __construct(private UserRender $userRender, private UserRepository $userRepository) {}
public function addRole(): ?string
{
@@ -63,7 +64,7 @@ class ByUserFilter implements FilterInterface
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['accepted_users' => $this->denormalizeDoctrineEntity($formData['accepted_users'], $this->someRepository)];
return ['accepted_users' => $this->denormalizeDoctrineEntity($formData['accepted_users'], $this->userRepository)];
}
public function getFormDefaultData(): array

2
src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php
View File

@@ -90,7 +90,7 @@ class ByUserJobFilter implements FilterInterface
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['jobs' => $this->denormalizeDoctrineEntity($formData['jobs'], $this->someRepository)];
return ['jobs' => $this->denormalizeDoctrineEntity($formData['jobs'], $this->userJobRepository)];
}
public function describeAction($data, $format = 'string'): array

2
src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php
View File

@@ -90,7 +90,7 @@ class ByUserScopeFilter implements FilterInterface
public function denormalizeFormData(array $formData, int $fromVersion): array
{
return ['scopes' => $this->denormalizeDoctrineEntity($formData['scopes'], $this->someRepository)];
return ['scopes' => $this->denormalizeDoctrineEntity($formData['scopes'], $this->scopeRepository)];
}
public function describeAction($data, $format = 'string')