[Adherent] Generate unique public ids

features/api/adherents.feature

@@ -386,7 +386,7 @@ Feature:
                         "last_name": "Fullstack",
                         "image_url": null,
                         "birthdate": "1942-01-10T00:00:00+02:00",
-                        "age": 82,
+                        "age": 83,
                         "phone": null,
                         "nationality": null,
                         "tags": [
@@ -756,7 +756,7 @@ Feature:
                         "last_name": "Fullstack",
                         "image_url": null,
                         "birthdate": "1942-01-10T00:00:00+02:00",
-                        "age": 82,
+                        "age": 83,
                         "phone": null,
                         "nationality": null,
                         "tags": [

features/api/profile.feature

@@ -17,7 +17,7 @@ Feature:
             """
             {
                 "uuid": "e6977a4d-2646-5f6c-9c82-88e58dca8458",
-                "id": "C9E-7BB",
+                "id": "@string@",
                 "email_address": "[email protected]",
                 "first_name": "Carl",
                 "last_name": "Mirabeau",
@@ -784,7 +784,7 @@ Feature:
             """
             {
                 "uuid": "313bd28f-efc8-57c9-8ab7-2106c8be9699",
-                "id": "B6H-873",
+                "id": "@string@",
                 "first_name": "Simple",
                 "last_name": "User",
                 "certified": false,
@@ -1325,7 +1325,7 @@ Feature:
                 "party_membership": "exclusive",
                 "other_party_membership": false,
                 "uuid": "b4219d47-3138-5efd-9762-2ef9f9495084",
-                "id": "G86-5E4",
+                "id": "@string@",
                 "first_name": "Gisele",
                 "last_name": "Berthoux",
                 "committee_membership": {
@@ -1437,7 +1437,7 @@ Feature:
                 "party_membership": "exclusive",
                 "other_party_membership": false,
                 "uuid": "b4219d47-3138-5efd-9762-2ef9f9495084",
-                "id": "G86-5E4",
+                "id": "@string@",
                 "first_name": "Gisele",
                 "last_name": "Berthoux",
                 "committee_membership": {
@@ -1523,7 +1523,7 @@ Feature:
                 "party_membership": "exclusive",
                 "other_party_membership": false,
                 "uuid": "b4219d47-3138-5efd-9762-2ef9f9495084",
-                "id": "G86-5E4",
+                "id": "@string@",
                 "first_name": "Gisele",
                 "last_name": "Berthoux",
                 "committee_membership": {

features/api/user.feature

@@ -16,7 +16,7 @@ Feature:
         And the JSON should be equal to:
             """
             {
-                "id": "C9E-7BB",
+                "id": "@string@",
                 "uuid": "e6977a4d-2646-5f6c-9c82-88e58dca8458",
                 "email_address": "[email protected]",
                 "email_subscribed": true,
@@ -67,7 +67,7 @@ Feature:
         And the JSON should be equal to:
             """
             {
-                "id": "D5C-399",
+                "id": "@string@",
                 "nickname": "kikouslove",
                 "email_address": "[email protected]",
                 "uuid": "a046adbe-9c7b-56a9-a676-6151a6785dda",

src/Adherent/PublicIdGenerator.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Adherent;
+
+use App\Repository\AdherentRepository;
+
+class PublicIdGenerator
+{
+    public function __construct(public readonly AdherentRepository $adherentRepository)
+    {
+    }
+
+    public function generate(): string
+    {
+        $publicId = self::build();
+
+        return !$this->checkIfAlreadyExists($publicId)
+            ? $publicId
+            : $this->generate();
+    }
+
+    public static function build(): string
+    {
+        $characters = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+
+        $charactersArray = str_split($characters);
+
+        shuffle($charactersArray);
+
+        $block1 = self::generateRandomBlock($charactersArray, 3);
+        $block2 = self::generateRandomBlock($charactersArray, 3);
+
+        return $block1.'-'.$block2;
+    }
+
+    private static function generateRandomBlock(array $characters, int $length): string
+    {
+        $block = '';
+        $maxIndex = \count($characters) - 1;
+
+        for ($i = 0; $i < $length; ++$i) {
+            $block .= $characters[random_int(0, $maxIndex)];
+        }
+
+        return $block;
+    }
+
+    private function checkIfAlreadyExists(string $publicId): bool
+    {
+        return $this->adherentRepository->count(['publicId' => $publicId]) > 0;
+    }
+}

src/DataFixtures/ORM/LoadBannedAdherentData.php

@@ -12,7 +12,7 @@ class LoadBannedAdherentData extends Fixture
 {
     public function load(ObjectManager $manager): void
     {
-        $adherent = Adherent::createBlank('male', 'test', 'test', 'FR', PostAddress::createEmptyAddress(), '[email protected]', null, new \DateTime('-18 years'));
+        $adherent = Adherent::createBlank('ABC-234', 'male', 'test', 'test', 'FR', PostAddress::createEmptyAddress(), '[email protected]', null, new \DateTime('-18 years'));
 
         $manager->persist(BannedAdherent::createFromAdherent($adherent));
         $manager->flush();

src/Doctrine/Hydrators/EventHydrator.php

@@ -60,6 +60,7 @@ protected function hydrateRowData(array $row, array &$result)
         if ($uuidOrganizer = $row['adherent_uuid'] ? Uuid::fromString($row['adherent_uuid']) : null) {
             $organizer = Adherent::create(
                 $uuidOrganizer,
+                $row['adherent_public_id'],
                 $row['adherent_email_address'],
                 $uuidOrganizer,
                 $row['adherent_gender'],

src/Entity/Adherent.php

@@ -56,7 +56,6 @@
 use App\Scope\ScopeEnum;
 use App\Subscription\SubscriptionTypeEnum;
 use App\Utils\AreaUtils;
-use App\Utils\PublicIdGenerator;
 use App\Validator\UniqueMembership;
 use App\Validator\ZoneBasedRoles as AssertZoneBasedRoles;
 use App\ValueObject\Genders;
@@ -555,6 +554,7 @@ public function __construct()
     }
 
     public static function createBlank(
+        string $publicId,
         string $gender,
         string $firstName,
         string $lastName,
@@ -569,7 +569,7 @@ public static function createBlank(
         $adherent = new self();
 
         $adherent->uuid = Uuid::uuid4();
-        $adherent->publicId = PublicIdGenerator::generatePublicIdFromUuid($adherent->uuid);
+        $adherent->publicId = $publicId;
         $adherent->gender = $gender;
         $adherent->firstName = $firstName;
         $adherent->lastName = $lastName;
@@ -588,6 +588,7 @@ public static function createBlank(
 
     public static function create(
         UuidInterface $uuid,
+        string $publicId,
         string $emailAddress,
         ?string $password,
         ?string $gender,
@@ -609,7 +610,7 @@ public static function create(
         $adherent = new self();
 
         $adherent->uuid = $uuid;
-        $adherent->publicId = PublicIdGenerator::generatePublicIdFromUuid($uuid);
+        $adherent->publicId = $publicId;
         $adherent->password = $password;
         $adherent->gender = $gender;
         $adherent->firstName = $firstName;

src/Membership/AdherentFactory.php

@@ -3,6 +3,7 @@
 namespace App\Membership;
 
 use App\Address\PostAddressFactory;
+use App\Adherent\PublicIdGenerator;
 use App\Adherent\Tag\TagEnum;
 use App\Adhesion\AdhesionStepEnum;
 use App\Adhesion\Request\MembershipRequest;
@@ -21,11 +22,13 @@
 class AdherentFactory
 {
     private PasswordHasherInterface $hasher;
+    private PublicIdGenerator $publicIdGenerator;
     private PostAddressFactory $addressFactory;
 
-    public function __construct(PasswordHasherFactoryInterface $hasherFactory, ?PostAddressFactory $addressFactory = null)
+    public function __construct(PasswordHasherFactoryInterface $hasherFactory, PublicIdGenerator $publicIdGenerator, ?PostAddressFactory $addressFactory = null)
     {
         $this->hasher = $hasherFactory->getPasswordHasher(Adherent::class);
+        $this->publicIdGenerator = $publicIdGenerator;
         $this->addressFactory = $addressFactory ?: new PostAddressFactory();
     }
 
@@ -42,6 +45,7 @@ private function createFromAvecVousMembershipRequest(AvecVousMembershipRequest $
     {
         $adherent = Adherent::create(
             Adherent::createUuid($request->getEmailAddress()),
+            $this->generatePublicId(),
             $request->getEmailAddress(),
             $this->hashPassword(Uuid::uuid4()),
             null,
@@ -62,6 +66,7 @@ private function createFromJeMengageMembershipRequest(JeMengageMembershipRequest
     {
         $adherent = Adherent::create(
             Adherent::createUuid($request->getEmailAddress()),
+            $this->generatePublicId(),
             $request->getEmailAddress(),
             $this->hashPassword(Uuid::uuid4()),
             $request->gender,
@@ -83,6 +88,7 @@ public function createFromRenaissanceMembershipRequest(MembershipRequest $member
     {
         $adherent = Adherent::create(
             uuid: Uuid::uuid4(),
+            publicId: $this->generatePublicId(),
             emailAddress: $membershipRequest->email,
             password: null,
             gender: $membershipRequest->civility,
@@ -102,6 +108,7 @@ public function createFromBesoinDEuropeMembershipRequest(InscriptionRequest $ins
     {
         $adherent = Adherent::create(
             uuid: Uuid::uuid4(),
+            publicId: $this->generatePublicId(),
             emailAddress: $inscriptionRequest->email,
             password: null,
             gender: $inscriptionRequest->civility,
@@ -128,6 +135,7 @@ public function createFromAdminAdherentCreateCommand(
         Administrator $administrator,
     ): Adherent {
         $adherent = Adherent::createBlank(
+            $this->generatePublicId(),
             $command->gender,
             $command->firstName,
             $command->lastName,
@@ -155,6 +163,7 @@ public function createFromArray(array $data): Adherent
 
         return Adherent::create(
             isset($data['uuid']) ? Uuid::fromString($data['uuid']) : Adherent::createUuid($data['email']),
+            $data['public_id'] ?? $this->generatePublicId(),
             $data['email'],
             $this->hashPassword($data['password']),
             $data['gender'] ?? null,
@@ -191,4 +200,9 @@ private function hashPassword(string $password): string
     {
         return $this->hasher->hash($password);
     }
+
+    private function generatePublicId(): string
+    {
+        return $this->publicIdGenerator->generate();
+    }
 }

src/Repository/EventRepository.php

@@ -197,7 +197,9 @@ public function searchAllEvents(SearchParametersFilter $search): array
             committees.address_address AS committee_address_address, committees.address_country AS committee_address_country,
             committees.address_city_name AS committee_address_city_name, committees.address_city_insee AS committee_address_city_insee,
             committees.address_postal_code AS committee_address_postal_code, committees.address_latitude AS committee_address_latitude,
-            committees.address_longitude AS committee_address_longitude, adherents.uuid AS adherent_uuid,
+            committees.address_longitude AS committee_address_longitude,
+            adherents.uuid AS adherent_uuid,
+            adherents.public_id AS adherent_public_id,
             adherents.email_address AS adherent_email_address,
             adherents.gender AS adherent_gender, adherents.first_name AS adherent_first_name,
             adherents.last_name AS adherent_last_name, adherents.birthdate AS adherent_birthdate,

tests/Committee/CommitteeAdherentMandateManagerTest.php

@@ -381,6 +381,7 @@ private function createNewAdherent(string $gender = Genders::MALE, ?string $birt
     {
         return Adherent::create(
             Uuid::fromString('c0d66d5f-e124-4641-8fd1-1dd72ffda563'),
+            'ABC-234',
             '[email protected]',
             'password',
             $gender,

tests/Committee/CommitteeFactoryTest.php

@@ -27,6 +27,7 @@ public function testCreateCommitteeFromCommitteeCreationCommand()
 
         $adherent = Adherent::create(
             $uuid,
+            'ABC-234',
             $email,
             'password',
             'male',

tests/Donation/DonationRequestTest.php

@@ -19,6 +19,7 @@ public function testCreateDonationRequestFromAdherent()
 
         $adherent = Adherent::create(
             $uuid,
+            'ABC-234',
             $email,
             'password',
             'male',

tests/Entity/AdherentTest.php

@@ -136,6 +136,7 @@ private function createNewAdherent(
 
         return Adherent::create(
             Adherent::createUuid($email),
+            'ABC-234',
             $email,
             'super-password',
             'male',

tests/Entity/CommitteeMembershipTest.php

@@ -65,6 +65,7 @@ private function createNewAdherent(): Adherent
     {
         return Adherent::create(
             Uuid::fromString(self::ADHERENT_UUID),
+            'ABC-234',
             '[email protected]',
             'password',
             'male',

tests/Entity/OAuth/UserAuthorizationTest.php

@@ -58,6 +58,7 @@ public function createUser(): Adherent
     {
         return Adherent::create(
             Uuid::uuid4(),
+            'ABC-234',
             '[email protected]',
             '',
             'male',

tests/Geocoder/Subscriber/EntityAddressGeocodingSubscriberTest.php

@@ -130,6 +130,7 @@ private function createNewAdherent(string $address): Adherent
     {
         return Adherent::create(
             Uuid::fromString('d3522426-1bac-4da4-ade8-5204c9e2caae'),
+            'ABC-234',
             '[email protected]',
             'super-password',
             'male',

tests/Security/AdherentLoginTimestampRecorderTest.php

@@ -40,6 +40,7 @@ private function createAdherent(): Adherent
     {
         return Adherent::create(
             Adherent::createUuid('[email protected]'),
+            'ABC-234',
             '[email protected]',
             'super-password',
             'male',

tests/TestHelperTrait.php

@@ -363,6 +363,7 @@ protected function createAdherent(?string $email = null): Adherent
 
         return Adherent::create(
             Adherent::createUuid($email),
+            'ABC-234',
             $email,
             'super-password',
             'male',