corrections après mr

config/opentalent/products.yaml

@@ -3,7 +3,7 @@ parameters:
       Core:
         entities:
           - AccessProfile
-          - AccessPreference
+          - Preferences
           - Tips
           - Notification
           - NotificationUser

config/packages/nelmio_cors.yaml

@@ -1,7 +1,7 @@
 nelmio_cors:
     defaults:
         origin_regex: true
-        allow_origin: ['*']
+        allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
         allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
         allow_headers: ['Content-Type', 'Authorization', 'x-accessid', 'x-switch-user', 'profileHash']
         expose_headers: ['Link']

src/ApiResources/Profile/AccessProfile.php

@@ -84,7 +84,7 @@ class AccessProfile implements ApiResourcesInterface
     private ?AccessProfile $originalAccess = null;
 
     #[Groups('access_profile_read')]
-    private ?int $accessPreferenceId = null;
+    private ?int $preferencesId = null;
 
     #[Pure]
     public function __construct()
@@ -313,14 +313,14 @@ class AccessProfile implements ApiResourcesInterface
         return $this;
     }
 
-    public function getAccessPreferenceId(): ?int
+    public function getPreferencesId(): ?int
     {
-        return $this->accessPreferenceId;
+        return $this->preferencesId;
     }
 
-    public function setAccessPreferenceId(?int $accessPreferenceId): self
+    public function setPreferencesId(?int $preferencesId): self
     {
-        $this->accessPreferenceId = $accessPreferenceId;
+        $this->preferencesId = $preferencesId;
 
         return $this;
     }

src/Entity/Access/Access.php

@@ -54,7 +54,6 @@ use App\Filter\ApiPlatform\Person\FullNameFilter;
 use App\Filter\ApiPlatform\Utils\InFilter;
 use App\Repository\Access\AccessRepository;
 // use DH\Auditor\Provider\Doctrine\Auditing\Annotation\Auditable;
-use App\Entity\Access\AccessPreference;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -302,7 +301,7 @@ class Access implements UserInterface, PasswordAuthenticatedUserInterface
     private Collection $tags;
 
     #[ORM\OneToOne(mappedBy: 'access', cascade: ['persist'], fetch: 'EAGER', orphanRemoval: true)]
-    private ?AccessPreference $preferences;
+    private ?Preferences $preferences;
 
     #[Pure]
     public function __construct()
@@ -2143,7 +2142,7 @@ class Access implements UserInterface, PasswordAuthenticatedUserInterface
         return $this;
     }
 
-    public function setPreferences(AccessPreference $preferences = null)
+    public function setPreferences(Preferences $preferences = null)
     {
         if(!is_null($preferences)){
             $preferences->setAccess($this);

src/Entity/Access/AccessPreference.php → src/Entity/Access/Preferences.php

@@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
         )
     ]
 )]
-class AccessPreference
+class Preferences
 {
     #[ORM\Id]
     #[ORM\Column]

src/Service/Access/AccessProfileCreator.php

@@ -6,7 +6,7 @@ namespace App\Service\Access;
 
 use App\ApiResources\Profile\AccessProfile;
 use App\Entity\Access\Access;
-use App\Entity\Access\AccessPreference;
+use App\Entity\Access\Preferences;
 use App\Repository\Access\AccessRepository;
 use App\Service\Organization\OrganizationProfileCreator;
 use Doctrine\ORM\EntityManagerInterface;
@@ -40,7 +40,7 @@ class AccessProfileCreator
         }
 
         if(is_null($access->getPreferences())){
-            $this->createAccessPrefence($access);
+            $this->createPreferences($access);
         }
 
         // L'Access en paramètre est celui de la connexion
@@ -109,17 +109,17 @@ class AccessProfileCreator
             ->setOrganization(
                 $this->organizationProfileCreator->createLightOrganizationProfile($access->getOrganization())
             )
-            ->setAccessPreferenceId($access->getPreferences()->getId());
+            ->setPreferencesId($access->getPreferences()->getId());
     }
 
     /**
-     * Créer l'entrée des AccessPreference en base
-     * @see AccessProfileCreatorTest::testCreateAccessPreference()
+     * Créer l'entrée des Preferences en base
+     * @see AccessProfileCreatorTest::testCreatePreferences()
      * @param Access $access
      * @return void
      */
-    public function createAccessPrefence(Access $access){
-        $access->setPreferences(new AccessPreference());
+    public function createPreferences(Access $access){
+        $access->setPreferences(new Preferences());
         $this->entityManager->flush($access);
     }
 }

tests/Unit/Service/Access/AccessProfileCreatorTest.php

@@ -5,7 +5,7 @@ namespace App\Tests\Unit\Service\Access;
 use App\ApiResources\Profile\AccessProfile;
 use App\ApiResources\Profile\OrganizationProfile;
 use App\Entity\Access\Access;
-use App\Entity\Access\AccessPreference;
+use App\Entity\Access\Preferences;
 use App\Entity\Core\File;
 use App\Entity\Organization\Organization;
 use App\Entity\Person\Person;
@@ -28,7 +28,6 @@ class AccessProfileCreatorTest extends TestCase
     private MockObject|AccessUtils $accessUtils;
     private MockObject|AccessProfileCreator $accessProfileCreator;
     private MockObject|AccessProfile $accessProfile;
-    private MockObject|AccessPreference $accessPreference;
     private MockObject|Collection $emptyCollection;
     private MockObject|Collection $nonEmptyCollection;
     private MockObject|Organization $organization;
@@ -53,7 +52,6 @@ class AccessProfileCreatorTest extends TestCase
         $this->access = $this->getMockBuilder(Access::class)->getMock();
         $this->organizationProfile = $this->getMockBuilder(OrganizationProfile::class)->getMock();
         $this->accessProfile = $this->getMockBuilder(AccessProfile::class)->getMock();
-        $this->accessPreference = $this->getMockBuilder(AccessPreference::class)->getMock();
     }
 
     /**
@@ -106,7 +104,7 @@ class AccessProfileCreatorTest extends TestCase
         // create the profile
         $accessProfileCreator
             ->expects(self::once())
-            ->method('createAccessPrefence')
+            ->method('createPreferences')
             ->with($this->access);
 
         // create the profile
@@ -382,13 +380,13 @@ class AccessProfileCreatorTest extends TestCase
         $person->expects(self::once())->method('getGender')->willReturn(GenderEnum::MISTER);
         $person->expects(self::once())->method('getImage')->willReturn($image);
 
-        $accessPreference = $this->getMockBuilder(AccessPreference::class)->getMock();
-        $accessPreference->expects(self::once())->method('getId')->willReturn(1);
+        $preferences = $this->getMockBuilder(Preferences::class)->getMock();
+        $preferences->expects(self::once())->method('getId')->willReturn(1);
 
         $this->access->expects(self::once())->method('getId')->willReturn(1);
         $this->access->method('getOrganization')->willReturn($this->organization);
         $this->access->method('getPerson')->willReturn($person);
-        $this->access->expects(self::once())->method('getPreferences')->willReturn($accessPreference);
+        $this->access->expects(self::once())->method('getPreferences')->willReturn($preferences);
         $this->access->expects(self::once())->method('getActivityYear')->willReturn(2020);
         $this->access->expects(self::once())->method('getSuperAdminAccess')->willReturn(false);
 
@@ -408,25 +406,23 @@ class AccessProfileCreatorTest extends TestCase
         $this->assertEquals(123, $accessProfile->getAvatarId());
         $this->assertFalse($accessProfile->getIsSuperAdminAccess());
         $this->assertEquals($this->organizationProfile, $accessProfile->getOrganization());
-        $this->assertEquals(1, $accessProfile->getAccessPreferenceId());
+        $this->assertEquals(1, $accessProfile->getPreferencesId());
     }
 
     /**
-     * If the access has no billingPayers, has AccessIntangible but also have children, isPayor shall be set to false.
-     *
-     * @see AccessProfileCreator::createAccessPrefence()
+     * @see AccessProfileCreator::createPreferences()
      */
-    public function testCreateAccessPreference(): void
+    public function testCreatePreferences(): void
     {
         $accessProfileCreator = $this
             ->getMockBuilder(AccessProfileCreator::class)
             ->setConstructorArgs([$this->organizationProfileCreator, $this->accessRepository, $this->accessUtils, $this->entityManager])
-            ->setMethodsExcept(['createAccessPrefence'])
+            ->setMethodsExcept(['createPreferences'])
             ->getMock();
 
         $this->access->expects(self::once())->method('setPreferences');
         $this->entityManager->expects(self::once())->method('flush')->with($this->access);
 
-        $accessProfileCreator->createAccessPrefence($this->access);
+        $accessProfileCreator->createPreferences($this->access);
     }
 }