Renommage de la classe de collection des antennes

Mopolo · Mopolo · commit 6e568849cc24 · 2026-02-03T09:18:59.000+01:00
En préparation pour déplacer les informations en base de données.
diff --git a/app/config/services.yml b/app/config/services.yml
@@ -195,6 +195,7 @@ services:
         arguments: ['@Psr\Http\Client\ClientInterface', null, "%google_maps_api_key%"]
 
     AppBundle\Offices\OfficeFinder:
+        autowire: true
         arguments: ['@geocoder']
 
     AppBundle\Subscriber\SitemapXmlSubscriber:
diff --git a/sources/AppBundle/Antennes/AntenneRepository.php b/sources/AppBundle/Antennes/AntenneRepository.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Antennes;
 
-final class AntennesCollection
+final class AntenneRepository
 {
     /** @var array<string, Antenne> */
     private array $antennes;
diff --git a/sources/AppBundle/Association/Form/CompanyPublicProfile.php b/sources/AppBundle/Association/Form/CompanyPublicProfile.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Association\Form;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -27,12 +27,14 @@ class CompanyPublicProfile extends AbstractType
     public const DESCRIPTION_MAX_LENGTH = 2000;
     public const MEMBERSHIP_REASON_MAX_LENGTH = 150;
 
+    public function __construct(
+        private readonly AntenneRepository $antennesRepository,
+    ) {}
+
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $antennesCollection = new AntennesCollection();
-
         $antennesInfos = [];
-        foreach ($antennesCollection->getAll() as $antenne) {
+        foreach ($this->antennesRepository->getAll() as $antenne) {
             $antennesInfos[$antenne->label] = $antenne->code;
         }
 
diff --git a/sources/AppBundle/Association/Form/ContactDetailsType.php b/sources/AppBundle/Association/Form/ContactDetailsType.php
@@ -5,7 +5,7 @@
 namespace AppBundle\Association\Form;
 
 use Afup\Site\Utils\Pays;
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Association\Model\User;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -23,15 +23,10 @@
 
 class ContactDetailsType extends AbstractType
 {
-    /**
-     * @var Pays
-     */
-    public $countryService;
-
-    public function __construct(Pays $countryService)
-    {
-        $this->countryService = $countryService;
-    }
+    public function __construct(
+        private readonly Pays $countryService,
+        private readonly AntenneRepository $antenneRepository,
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
@@ -111,9 +106,8 @@ public function configureOptions(OptionsResolver $resolver): void
      */
     private function getOfficesList(): array
     {
-        $antennesCollection = new AntennesCollection();
         $offices = ['' => '-Aucune-'];
-        foreach ($antennesCollection->getAllSortedByLabels() as $antenne) {
+        foreach ($this->antenneRepository->getAllSortedByLabels() as $antenne) {
             $offices[$antenne->label] = $antenne->code;
         }
         return $offices;
diff --git a/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php b/sources/AppBundle/Association/Form/NearestOfficeChoiceType.php
@@ -4,20 +4,23 @@
 
 namespace AppBundle\Association\Form;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class NearestOfficeChoiceType extends AbstractType
 {
+    public function __construct(
+        private readonly AntenneRepository $antennesRepository,
+    ) {}
+
     public function configureOptions(OptionsResolver $resolver): void
     {
         parent::configureOptions($resolver);
 
-        $antennesCollection = new AntennesCollection();
         $offices = ['-Aucune-' => ''];
-        foreach ($antennesCollection->getAllSortedByLabels() as $antenne) {
+        foreach ($this->antennesRepository->getAllSortedByLabels() as $antenne) {
             $offices[$antenne->label] = $antenne->code;
         }
 
diff --git a/sources/AppBundle/Association/Model/User.php b/sources/AppBundle/Association/Model/User.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Association\Model;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Association\Model\Repository\UserRepository;
 use AppBundle\Association\NotifiableInterface;
 use AppBundle\Validator\Constraints as AppAssert;
@@ -199,7 +199,7 @@ public function setNearestOffice($nearestOffice): self
         return $this;
     }
 
-    public function getNearestOfficeLabel()
+    public function getNearestOfficeLabel(AntenneRepository $antenneRepository)
     {
         $code = $this->getNearestOffice();
 
@@ -208,7 +208,7 @@ public function getNearestOfficeLabel()
             return  null;
         }
 
-        return (new AntennesCollection())->findByCode($code)->label;
+        return $antenneRepository->findByCode($code)->label;
     }
 
     /**
diff --git a/sources/AppBundle/Command/IndexMeetupsCommand.php b/sources/AppBundle/Command/IndexMeetupsCommand.php
@@ -6,6 +6,7 @@
 
 use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
 use Algolia\AlgoliaSearch\SearchClient;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Event\Model\Repository\MeetupRepository;
 use AppBundle\Indexation\Meetups\Runner;
 use Symfony\Component\Console\Command\Command;
@@ -18,6 +19,7 @@ class IndexMeetupsCommand extends Command
     public function __construct(
         private readonly SearchClient $searchClient,
         private readonly MeetupRepository $meetupRepository,
+        private readonly AntenneRepository $antenneRepository,
     ) {
         parent::__construct();
     }
@@ -40,7 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->runScraping($output);
         }
 
-        $runner = new Runner($this->searchClient, $this->meetupRepository);
+        $runner = new Runner($this->searchClient, $this->meetupRepository, $this->antenneRepository);
         $runner->run();
 
         return Command::SUCCESS;
diff --git a/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php b/sources/AppBundle/Controller/Admin/Antennes/AntenneListAction.php
@@ -5,15 +5,15 @@
 namespace AppBundle\Controller\Admin\Antennes;
 
 use AppBundle\Antennes\Antenne;
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Twig\Environment;
 
 final readonly class AntenneListAction
 {
     public function __construct(
-        private AntennesCollection $antennesCollection,
+        private AntenneRepository $antennesCollection,
         private Environment $twig,
     ) {}
 
diff --git a/sources/AppBundle/Controller/Admin/Members/UserListAction.php b/sources/AppBundle/Controller/Admin/Members/UserListAction.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Controller\Admin\Members;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Association\Model\Repository\UserRepository;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -14,7 +14,7 @@ class UserListAction
 {
     public function __construct(
         private readonly UserRepository $userRepository,
-        private readonly AntennesCollection $antennesCollection,
+        private readonly AntenneRepository $antenneRepository,
         private readonly Environment $twig,
     ) {}
 
@@ -28,7 +28,7 @@ public function __invoke(Request $request): Response
         $onlyDisplayActive = !$request->query->getBoolean('alsoDisplayInactive');
 
         return new Response($this->twig->render('admin/members/user_list.html.twig', [
-            'antennes' => $this->antennesCollection->getAll(),
+            'antennes' => $this->antenneRepository->getAll(),
             'users' => $this->userRepository->search(
                 $sort,
                 $direction,
diff --git a/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php b/sources/AppBundle/Controller/Api/Antennes/GetOneAction.php
@@ -4,15 +4,15 @@
 
 namespace AppBundle\Controller\Api\Antennes;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Event\Model\Repository\MeetupRepository;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 final readonly class GetOneAction
 {
     public function __construct(
-        private AntennesCollection $antennesCollection,
+        private AntenneRepository $antennesCollection,
         private MeetupRepository $meetupRepository,
     ) {}
 
diff --git a/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php b/sources/AppBundle/Controller/Website/CompanyPublicProfile/IndexAction.php
@@ -5,7 +5,7 @@
 namespace AppBundle\Controller\Website\CompanyPublicProfile;
 
 use AppBundle\Antennes\Antenne;
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Association\Model\CompanyMember;
 use AppBundle\Association\Model\Repository\CompanyMemberRepository;
 use AppBundle\Association\UserMembership\BadgesComputer;
@@ -18,6 +18,7 @@ public function __construct(
         CompanyMemberRepository $companyMemberRepository,
         private readonly ViewRenderer $view,
         private readonly BadgesComputer $badgesComputer,
+        private readonly AntenneRepository $antenneRepository,
     ) {
         parent::__construct($companyMemberRepository);
     }
@@ -38,10 +39,9 @@ public function __invoke(int $id, string $slug): Response
      */
     private function getRelatedAfupAntennes(CompanyMember $companyMember): array
     {
-        $antennesCollection = new AntennesCollection();
         $antennes = [];
         foreach ($companyMember->getFormattedRelatedAfupOffices() as $localOffice) {
-            $antenne = $antennesCollection->findByCode($localOffice);
+            $antenne = $this->antenneRepository->findByCode($localOffice);
             if ($antenne->hideOnOfficesPage) {
                 continue;
             }
diff --git a/sources/AppBundle/Controller/Website/Member/IndexAction.php b/sources/AppBundle/Controller/Website/Member/IndexAction.php
@@ -4,6 +4,7 @@
 
 namespace AppBundle\Controller\Website\Member;
 
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Association\Model\Repository\GeneralMeetingQuestionRepository;
 use AppBundle\Association\Model\Repository\TechletterSubscriptionsRepository;
 use AppBundle\Association\UserMembership\BadgesComputer;
@@ -26,6 +27,7 @@ public function __construct(
         private readonly BadgesComputer $badgesComputer,
         private readonly TechletterSubscriptionsRepository $techletterSubscriptionsRepository,
         private readonly Authentication $authentication,
+        private readonly AntenneRepository $antenneRepository,
     ) {}
 
     public function __invoke(): Response
@@ -64,7 +66,7 @@ public function __invoke(): Response
             'has_member_subscribed_to_techletter' => $this->techletterSubscriptionsRepository->hasUserSubscribed($user),
             'membership_fee_call_to_update' => null === $daysBeforeMembershipExpiration || $daysBeforeMembershipExpiration < self::DAYS_BEFORE_CALL_TO_UPDATE,
             'has_up_to_date_membership_fee' => $user->hasUpToDateMembershipFee(),
-            'office_label' => $user->getNearestOfficeLabel(),
+            'office_label' => $user->getNearestOfficeLabel($this->antenneRepository),
             'has_general_meeting_planned' => $hasGeneralMeetingPlanned,
             'has_user_rspved_to_next_general_meeting' => $generalMeetingFactory->hasUserRspvedToLastGeneralMeeting($user),
             'membershipfee_end_date' => $dateFinCotisation,
diff --git a/sources/AppBundle/Controller/Website/Static/OfficesAction.php b/sources/AppBundle/Controller/Website/Static/OfficesAction.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Controller\Website\Static;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Twig\ViewRenderer;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -13,12 +13,13 @@ final class OfficesAction extends AbstractController
 {
     public function __construct(
         private readonly ViewRenderer $view,
+        private readonly AntenneRepository $antennesRepository,
     ) {}
 
     public function __invoke(): Response
     {
         return $this->view->render('site/offices.html.twig', [
-            'antennes' => (new AntennesCollection())->getAllSortedByLabels(),
+            'antennes' => $this->antennesRepository->getAllSortedByLabels(),
         ]);
     }
 }
diff --git a/sources/AppBundle/Controller/Website/Talks/ListAction.php b/sources/AppBundle/Controller/Website/Talks/ListAction.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Controller\Website\Talks;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Twig\ViewRenderer;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
@@ -20,6 +20,7 @@ public function __construct(
         private readonly string $algoliaAppId,
         #[Autowire('%algolia_frontend_api_key%')]
         private readonly string $algoliaFrontendApikey,
+        private readonly AntenneRepository $antennesRepository,
     ) {}
 
     public function __invoke(Request $request): Response
@@ -43,7 +44,7 @@ public function __invoke(Request $request): Response
         return $this->view->render('site/talks/list.html.twig', [
             'title' => $title,
             'canonical' => $canonical,
-            'antennes' => (new AntennesCollection())->getAllSortedByLabels(),
+            'antennes' => $this->antennesRepository->getAllSortedByLabels(),
             'algolia_app_id' => $this->algoliaAppId,
             'algolia_api_key' => $this->algoliaFrontendApikey,
         ]);
diff --git a/sources/AppBundle/Event/Form/TicketType.php b/sources/AppBundle/Event/Form/TicketType.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Event\Form;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Event\Model\Repository\EventRepository;
 use AppBundle\Event\Model\Repository\TicketEventTypeRepository;
 use AppBundle\Event\Model\Repository\TicketSpecialPriceRepository;
@@ -29,17 +29,14 @@ class TicketType extends AbstractType
     public const MEMBER_PERSONAL = 1;
     public const MEMBER_CORPORATE = 2;
 
-    private readonly AntennesCollection $antennesCollection;
-
     public function __construct(
         private readonly EventRepository $eventRepository,
         private readonly TicketEventTypeRepository $ticketEventTypeRepository,
         private readonly TicketTypeAvailability $ticketTypeAvailability,
         private readonly TicketSpecialPriceRepository $ticketSpecialPriceRepository,
         private readonly TicketTypeRepository $ticketTypeRepository,
-    ) {
-        $this->antennesCollection = new AntennesCollection();
-    }
+        private readonly AntenneRepository $antenneRepository,
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
@@ -78,7 +75,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('nearestOffice', ChoiceType::class, [
                 'label' => 'Antenne de prédilection',
                 'required' => false,
-                'choices' => array_flip($this->antennesCollection->getOrderedLabelsByKey()),
+                'choices' => array_flip($this->antenneRepository->getOrderedLabelsByKey()),
             ])
         ;
 
diff --git a/sources/AppBundle/Indexation/Meetups/MeetupClient.php b/sources/AppBundle/Indexation/Meetups/MeetupClient.php
@@ -4,7 +4,7 @@
 
 namespace AppBundle\Indexation\Meetups;
 
-use AppBundle\Antennes\AntennesCollection;
+use AppBundle\Antennes\AntenneRepository;
 use AppBundle\Event\Model\Meetup;
 use AppBundle\Indexation\Meetups\GraphQL\QueryGroupsResponse;
 use CuyZ\Valinor\Mapper\Source\Source;
@@ -18,7 +18,7 @@
 
     public function __construct(
         private HttpClientInterface $httpClient,
-        private AntennesCollection $antennesCollection,
+        private AntenneRepository $antenneRepository,
         private MapperBuilder $mapperBuilder,
     ) {}
 
@@ -72,7 +72,7 @@ private function getEventsQuery(): string
     {
         $queries = [];
 
-        foreach ($this->antennesCollection->getAll() as $antenne) {
+        foreach ($this->antenneRepository->getAll() as $antenne) {
             if ($antenne->meetup === null) {
                 continue;
             }
diff --git a/sources/AppBundle/Indexation/Meetups/Runner.php b/sources/AppBundle/Indexation/Meetups/Runner.php
diff --git a/sources/AppBundle/Indexation/Meetups/Transformer.php b/sources/AppBundle/Indexation/Meetups/Transformer.php
diff --git a/sources/AppBundle/Offices/OfficeFinder.php b/sources/AppBundle/Offices/OfficeFinder.php
diff --git a/sources/AppBundle/Twig/OfficesExtension.php b/sources/AppBundle/Twig/OfficesExtension.php
diff --git a/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php b/tests/unit/AppBundle/Indexation/Meetups/MeetupClientTest.php
diff --git a/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php b/tests/unit/AppBundle/Indexation/Meetups/TransformerTest.php

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace AppBundle\Antennes;`
`6`	`6`
`7`		`-final class AntennesCollection`
	`7`	`+final class AntenneRepository`
`8`	`8`	`{`
`9`	`9`	`/** @var array<string, Antenne> */`
`10`	`10`	`private array $antennes;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace AppBundle\Association\Model;`
`6`	`6`
`7`		`-use AppBundle\Antennes\AntennesCollection;`
	`7`	`+use AppBundle\Antennes\AntenneRepository;`
`8`	`8`	`use AppBundle\Association\Model\Repository\UserRepository;`
`9`	`9`	`use AppBundle\Association\NotifiableInterface;`
`10`	`10`	`use AppBundle\Validator\Constraints as AppAssert;`
`@@ -199,7 +199,7 @@ public function setNearestOffice($nearestOffice): self`
`199`	`199`	`return $this;`
`200`	`200`	`}`
`201`	`201`
`202`		`- public function getNearestOfficeLabel()`
	`202`	`+ public function getNearestOfficeLabel(AntenneRepository $antenneRepository)`
`203`	`203`	`{`
`204`	`204`	`$code = $this->getNearestOffice();`
`205`	`205`
`@@ -208,7 +208,7 @@ public function getNearestOfficeLabel()`
`208`	`208`	`return null;`
`209`	`209`	`}`
`210`	`210`
`211`		`- return (new AntennesCollection())->findByCode($code)->label;`
	`211`	`+ return $antenneRepository->findByCode($code)->label;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/**`