Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change national event tags logic #10909

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions features/api/adherents.feature
Original file line number Diff line number Diff line change
Expand Up @@ -948,10 +948,8 @@ Feature:
"options": {
"favorite": true,
"choices": {
"national_event:event-national-1": "Event National 1",
"national_event:event-national-1--": "Non inscrit à Event National 1",
"national_event:event-national-2": "Event National 2",
"national_event:event-national-2--": "Non inscrit à Event National 2",
"national_event:2024": "Événement national 2024",
"national_event:2024--": "Non inscrit à Événement national 2024",
"procuration:mandant": "Mandant",
"procuration:mandant--": "Non Mandant",
"procuration:mandataire": "Mandataire",
Expand Down
10 changes: 2 additions & 8 deletions src/Adherent/Tag/StaticTag/EventTagBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Adherent\Tag\TagEnum;
use App\Entity\NationalEvent\NationalEvent;
use App\Repository\NationalEvent\NationalEventRepository;
use Symfony\Component\String\UnicodeString;

class EventTagBuilder
{
Expand All @@ -15,16 +14,11 @@ public function __construct(private readonly NationalEventRepository $repository

public function buildAll(): array
{
return array_map([$this, 'buildForEvent'], $this->repository->findAll());
return array_unique(array_map([$this, 'buildForEvent'], $this->repository->findAll()));
}

public function buildForEvent(NationalEvent $event): string
{
return TagEnum::getNationalEventTag($event->getSlug());
}

public function buildLabelFromSlug(string $slug)
{
return $this->repository->findOneBySlug($slug)?->name ?? (new UnicodeString(str_replace('-', ' ', $slug)))->title(true);
return TagEnum::getNationalEventTag($event->startDate->format('Y') ?? date('Y'));
}
}
4 changes: 2 additions & 2 deletions src/Adherent/Tag/TagEnum.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public static function getMainLevel(string $tag): string
return explode(':', $tag)[0];
}

public static function getNationalEventTag(string $eventSlug): string
public static function getNationalEventTag(string $year): string
{
return \sprintf(self::NATIONAL_EVENT_PATTERN, $eventSlug);
return \sprintf(self::NATIONAL_EVENT_PATTERN, $year);
}
}
4 changes: 2 additions & 2 deletions src/Adherent/Tag/TagGenerator/EventTagGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ public function __construct(

public function generate(Adherent $adherent, array $previousTags): array
{
return array_map(
return array_unique(array_map(
fn (EventInscription $inscription) => $this->eventTagBuilder->buildForEvent($inscription->event),
$this->eventInscriptionRepository->findAllByAdherent($adherent)
);
));
}
}
2 changes: 1 addition & 1 deletion src/Adherent/Tag/TagTranslator.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function trans(string $tag, bool $fullTag = true): string
}
// Matches a national_event tag in the format national_event:slug
elseif (TagEnum::NATIONAL_EVENT === TagEnum::getMainLevel($tag) && $index > 0) {
$parts[$index] = $this->eventTagBuilder->buildLabelFromSlug($part);
$parts[$index] = \sprintf('%s %s', $this->translator->trans('adherent.tag.'.TagEnum::NATIONAL_EVENT), $part);
} else {
$parts[$index] = $this->translate('adherent.tag.'.$part, $part);
}
Expand Down
4 changes: 2 additions & 2 deletions src/DataFixtures/ORM/LoadAdherentStaticLabelData.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public function load(ObjectManager $manager)
$manager->persist($this->create('burex_member', 'Membre bureau exécutif', $categoryBurex));
$manager->persist($this->create('old_burex_member', 'Ancien membre du bunrex', $categoryBurex));

$manager->persist($this->create('lille_2024', 'Participant Meeting Lille 2024', $categoryMeeting));
$manager->persist($this->create('nice_2024', 'Participant Meeting Nice 2024', $categoryMeeting));
$manager->persist($this->create('national_event:2023', 'Participant Meeting 2023', $categoryMeeting));
$manager->persist($this->create('national_event:2024', 'Participant Meeting 2024', $categoryMeeting));

$manager->flush();
}
Expand Down
4 changes: 2 additions & 2 deletions src/JMEFilter/FilterBuilder/StaticTagsFilterBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ public function __construct(TagTranslator $translator, private readonly EventTag

protected function init(): void
{
$this->tags = array_merge(
$this->tags = array_unique(array_merge(
...array_map(
fn (string $tag) => [$tag, $tag.'--'],
array_merge($this->eventTagBuilder->buildAll(), TagEnum::getStaticTags())
)
);
));

$this->fieldName = 'static_tags';
$this->fieldLabel = 'Labels divers';
Expand Down
Loading