Selaa lähdekoodia

Merge branch 'release/2.5' of gitlab.2iopenservice.com:opentalent/ap2i into release/2.5

Vincent 7 kuukautta sitten
vanhempi
commit
cd545053a8

+ 1 - 1
src/Entity/Organization/Organization.php

@@ -563,7 +563,7 @@ class Organization
 
     public function getNetworkOrganizations(): Collection
     {
-        return new ArrayCollection([]);
+        return $this->networkOrganizations;
     }
 
     public function addNetworkOrganization(NetworkOrganization $networkOrganization): self

+ 3 - 1
src/Service/Access/AccessProfileCreator.php

@@ -49,7 +49,9 @@ class AccessProfileCreator
         // On remplit les accesses multi-compte
         $multiAccesses = $this->accessUtils->filterAccesses($validAccesses, $access);
         foreach ($multiAccesses as $multiAccess) {
-            $mainAccessProfile->addMultiAccess($this->organizationProfileCreator->createLightOrganizationProfile($multiAccess->getOrganization()));
+            $mainAccessProfile->addMultiAccess(
+                $this->organizationProfileCreator->createLightOrganizationProfile($multiAccess->getOrganization())
+            );
         }
 
         // On remplit les accesses famille

+ 8 - 1
src/State/Processor/Access/AdminAccessProcessor.php

@@ -7,7 +7,9 @@ namespace App\State\Processor\Access;
 use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
+use App\ApiResources\Access\AdminAccess;
 use App\Entity\Access\Access;
+use App\Service\Access\AdminAccessUtils;
 use App\Service\Access\Utils as AccessUtils;
 use App\Service\Core\ContactPointUtils;
 use Doctrine\ORM\EntityManagerInterface;
@@ -24,14 +26,17 @@ class AdminAccessProcessor implements ProcessorInterface
         private EntityManagerInterface $entityManager,
         private AccessUtils $accessUtils,
         private ContactPointUtils $contactPointUtils,
+        private AdminAccessUtils $adminAccessUtils,
     ) {
     }
 
     /**
      * @param mixed[] $uriVariables
      * @param mixed[] $context
+     *
+     * @throws \Exception
      */
-    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): void
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): ?AdminAccess
     {
         if ($operation instanceof Delete) {
             throw new \RuntimeException('not supported', Response::HTTP_METHOD_NOT_ALLOWED);
@@ -53,5 +58,7 @@ class AdminAccessProcessor implements ProcessorInterface
         $contactPoint->setEmail($data->getEmail());
         $this->entityManager->persist($contactPoint);
         $this->entityManager->flush();
+
+        return $this->adminAccessUtils->getAdminAccess($access->getOrganization());
     }
 }