WIP

parti-renaissance · Jan 31, 2025 · eb3b29c · eb3b29c
1 parent 96fb6d8
commit eb3b29c
Show file tree

Hide file tree

Showing 34 changed files with 130 additions and 78 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -230,8 +230,8 @@ services:
         tags: [{ name: 'serializer.normalizer', priority: 1 }]
 
     App\Normalizer\ConstraintViolationListNormalizer:
-        decorates: 'serializer.normalizer.constraint_violation_list'
-        tags: [{ name: 'serializer.normalizer', priority: -1024 }]
+        decorates: 'api_platform.problem.normalizer.validation_exception'
+        tags: [{ name: 'serializer.normalizer', priority: -800 }]
         arguments:
             - '@serializer.name_converter.metadata_aware'
 

diff --git a/src/Adhesion/Request/MembershipRequest.php b/src/Adhesion/Request/MembershipRequest.php
@@ -41,7 +41,6 @@ class MembershipRequest implements DonationRequestInterface
     #[Assert\NotBlank]
     public ?string $nationality = null;
 
-    #[Assert\Type('bool')]
     public ?bool $exclusiveMembership = null;
 
     #[Assert\AtLeastOneOf([

diff --git a/src/Api/Filter/AbstractScopeFilter.php b/src/Api/Filter/AbstractScopeFilter.php
@@ -87,7 +87,7 @@ public function setSecurity(Security $security): void
 
     protected function getAllowedOperationNames(string $resourceClass): array
     {
-        return ['{uuid}_get', '{uuid}.{_format}_get', '_get_collection'];
+        return ['{uuid}_get', '{uuid}{._format}_get', '_get_collection'];
     }
 
     private function isValidOperation(?Operation $operation): bool

diff --git a/src/Api/Filter/ScopeVisibilityFilter.php b/src/Api/Filter/ScopeVisibilityFilter.php
@@ -96,6 +96,6 @@ protected function getAllowedOperationNames(string $resourceClass): array
             return ['_api_/v3/jecoute/news/{uuid}_get', '_api_/v3/jecoute/news_get_collection'];
         }
 
-        return ['{uuid}_get', '{uuid}.{_format}_get', '_get_collection'];
+        return ['{uuid}_get', '{uuid}{._format}_get', '_get_collection'];
     }
 }
diff --git a/src/Api/IriConverterDecorator.php b/src/Api/IriConverterDecorator.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Api;
+
+use ApiPlatform\Metadata\IriConverterInterface;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
+use App\Entity\Event\BaseEventCategory;
+use Ramsey\Uuid\Uuid;
+
+class IriConverterDecorator implements IriConverterInterface
+{
+    public function __construct(private readonly IriConverterInterface $decorated)
+    {
+    }
+
+    public function getResourceFromIri(string $iri, array $context = [], ?Operation $operation = null): object
+    {
+        if (Uuid::isValid($iri)) {
+            $iri = $this->decorated->getIriFromResource(resource: $context['resource_class'], context: ['uri_variables' => ['uuid' => $iri]]);
+        } elseif (is_a($context['resource_class'], BaseEventCategory::class, true)) {
+            $iri = $this->decorated->getIriFromResource(resource: $context['resource_class'], context: ['uri_variables' => ['slug' => $iri]]);
+        }
+
+        return $this->decorated->getResourceFromIri($iri, $context, $operation);
+    }
+
+    public function getIriFromResource(
+        object|string $resource,
+        int $referenceType = UrlGeneratorInterface::ABS_PATH,
+        ?Operation $operation = null,
+        array $context = [],
+    ): ?string {
+        return $this->decorated->getIriFromResource($resource, $referenceType, $operation, $context);
+    }
+}
diff --git a/src/Api/Listener/AdherentListener.php b/src/Api/Listener/AdherentListener.php
@@ -34,7 +34,7 @@ public function onPostWrite(ViewEvent $viewEvent): void
 
         if (
             !\in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT])
-            || '_api_/adherents/{uuid}/elect_put' !== $request->attributes->get('_api_operation_name')
+            || '_api_/v3/adherents/{uuid}/elect_put' !== $request->attributes->get('_api_operation_name')
         ) {
             return;
         }

diff --git a/src/Api/Listener/PostEventInscriptionEditListener.php b/src/Api/Listener/PostEventInscriptionEditListener.php
@@ -26,7 +26,7 @@ public function onEventInscriptionChange(RequestEvent $requestEvent): void
     {
         $request = $requestEvent->getRequest();
 
-        if ('_api_/event_inscriptions/{uuid}.{_format}_put' !== $request->attributes->get('_api_operation_name')) {
+        if ('_api_/event_inscriptions/{uuid}{._format}_put' !== $request->attributes->get('_api_operation_name')) {
             return;
         }
 

diff --git a/src/Controller/Api/UserController.php b/src/Controller/Api/UserController.php
@@ -2,7 +2,6 @@
 
 namespace App\Controller\Api;
 
-use ApiPlatform\Problem\Serializer\ConstraintViolationListNormalizer;
 use App\AdherentProfile\Password;
 use App\Entity\Adherent;
 use App\Entity\AdherentResetPasswordToken;
@@ -86,10 +85,7 @@ public function createPassword(
         $errors = $validator->validate($password);
 
         if (0 !== $errors->count()) {
-            return JsonResponse::fromJsonString(
-                $serializer->serialize($errors, ConstraintViolationListNormalizer::FORMAT),
-                Response::HTTP_BAD_REQUEST
-            );
+            return $this->json($errors, Response::HTTP_BAD_REQUEST);
         }
 
         try {

diff --git a/src/Entity/Action/Action.php b/src/Entity/Action/Action.php
@@ -55,16 +55,17 @@
             uriTemplate: '/v3/actions/{uuid}',
             security: "object.getAuthor() == user or user.hasDelegatedFromUser(object.getAuthor(), 'actions')"
         ),
-        new Put(
+        new HttpOperation(
+            method: 'PUT',
             uriTemplate: '/v3/actions/{uuid}/cancel',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: CancelActionController::class
         ),
         new HttpOperation(
             method: 'POST|DELETE',
             uriTemplate: '/v3/actions/{uuid}/register',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: RegisterController::class
         ),

diff --git a/src/Entity/AdherentMessage/AbstractAdherentMessage.php b/src/Entity/AdherentMessage/AbstractAdherentMessage.php
@@ -9,6 +9,7 @@
 use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
 use App\AdherentMessage\AdherentMessageDataObject;
@@ -64,27 +65,31 @@
             normalizationContext: ['groups' => ['message_read']],
             security: "is_granted('REQUEST_SCOPE_GRANTED', 'messages') and (object.getAuthor() == user or user.hasDelegatedFromUser(object.getAuthor(), 'messages'))"
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/adherent_messages/{uuid}/send',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: SendAdherentMessageController::class
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/adherent_messages/{uuid}/send-test',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: SendTestAdherentMessageController::class
         ),
-        new Put(
+        new HttpOperation(
+            method: 'PUT',
             uriTemplate: '/v3/adherent_messages/{uuid}/filter',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: UpdateAdherentMessageFilterController::class
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/adherent_messages/{uuid}/duplicate',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: DuplicateMessageController::class
         ),

diff --git a/src/Entity/ElectedRepresentative/ElectedRepresentative.php b/src/Entity/ElectedRepresentative/ElectedRepresentative.php
@@ -131,7 +131,7 @@ class ElectedRepresentative implements EntityAdherentBlameableInterface, EntityA
      */
     #[Groups(['elected_representative_write', 'elected_representative_read'])]
     #[ORM\Column(type: 'boolean', options: ['default' => false])]
-    private $hasFollowedTraining = false;
+    public bool $hasFollowedTraining = false;
 
     /**
      * Mailchimp unsubscribed date

diff --git a/src/Entity/ElectedRepresentative/Mandate.php b/src/Entity/ElectedRepresentative/Mandate.php
@@ -63,7 +63,7 @@ class Mandate
      */
     #[Groups(['elected_mandate_write', 'elected_mandate_read', 'elected_representative_read'])]
     #[ORM\Column(type: 'boolean', options: ['default' => false])]
-    private $isElected;
+    public $isElected;
 
     /**
      * @var Zone|null

diff --git a/src/Entity/Event/BaseEvent.php b/src/Entity/Event/BaseEvent.php
@@ -98,16 +98,17 @@
         new HttpOperation(
             method: 'POST|DELETE',
             uriTemplate: '/v3/events/{uuid}/subscribe',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: SubscribeAsAdherentController::class,
-            security: 'is_granted(\'ROLE_USER\')'
+            security: 'is_granted(\'ROLE_USER\')',
+            deserialize: false
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/events/{uuid}/subscribe',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
-            controller: SubscribeAsAnonymousController::class
+            controller: SubscribeAsAnonymousController::class,
+            deserialize: false
         ),
         new HttpOperation(
             method: 'POST|DELETE',
@@ -117,11 +118,12 @@
             security: "is_granted('REQUEST_SCOPE_GRANTED', 'events') and is_granted('CAN_MANAGE_EVENT', request.attributes.get('data'))",
             deserialize: false
         ),
-        new Put(
+        new HttpOperation(
+            method: 'PUT',
             uriTemplate: '/v3/events/{uuid}/cancel',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
-            controller: CancelEventController::class
+            controller: CancelEventController::class,
+            deserialize: false
         ),
         new GetCollection(
             uriTemplate: '/v3/events',

diff --git a/src/Entity/Jecoute/JemarcheDataSurvey.php b/src/Entity/Jecoute/JemarcheDataSurvey.php
@@ -4,6 +4,7 @@
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Post;
 use App\Controller\Api\Jecoute\JemarcheDataSurveyKpiController;
 use App\Controller\Api\Jecoute\JemarcheDataSurveyReplyController;
@@ -22,9 +23,10 @@
 
 #[ApiResource(
     operations: [
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/jemarche_data_surveys/{uuid}/reply',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: JemarcheDataSurveyReplyController::class,
             normalizationContext: ['groups' => ['data_survey_read']],

diff --git a/src/Entity/Jecoute/Region.php b/src/Entity/Jecoute/Region.php
@@ -111,7 +111,6 @@ class Region
     /**
      * @var bool
      */
-    #[Assert\Type('bool')]
     #[ORM\Column(type: 'boolean', options: ['default' => true])]
     private $enabled;
 

diff --git a/src/Entity/Jecoute/Riposte.php b/src/Entity/Jecoute/Riposte.php
@@ -6,6 +6,7 @@
 use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
 use App\Controller\Api\Jecoute\IncrementRiposteStatsCounterController;
@@ -39,12 +40,13 @@
             uriTemplate: '/v3/ripostes/{uuid}',
             requirements: ['uuid' => '%pattern_uuid%']
         ),
-        new Put(
+        new HttpOperation(
+            method: 'PUT',
             uriTemplate: '/v3/ripostes/{uuid}/action/{action}',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: IncrementRiposteStatsCounterController::class,
-            security: "is_granted('REQUEST_SCOPE_GRANTED', 'ripostes') or (is_granted('ROLE_USER') and is_granted('ROLE_OAUTH_SCOPE_JEMARCHE_APP'))"
+            security: "is_granted('REQUEST_SCOPE_GRANTED', 'ripostes') or (is_granted('ROLE_USER') and is_granted('ROLE_OAUTH_SCOPE_JEMARCHE_APP'))",
+            deserialize: false,
         ),
         new GetCollection(
             uriTemplate: '/v3/ripostes',
@@ -103,15 +105,13 @@ class Riposte implements AuthorInterface, IndexableEntityInterface
     /**
      * @var bool
      */
-    #[Assert\Type('bool')]
     #[Groups(['riposte_list_read', 'riposte_read', 'riposte_write'])]
     #[ORM\Column(type: 'boolean', options: ['default' => true])]
     private $withNotification;
 
     /**
      * @var bool
      */
-    #[Assert\Type('bool')]
     #[Groups(['riposte_list_read', 'riposte_read', 'riposte_write'])]
     #[ORM\Column(type: 'boolean', options: ['default' => true])]
     private $enabled;

diff --git a/src/Entity/MyTeam/MyTeam.php b/src/Entity/MyTeam/MyTeam.php
@@ -4,7 +4,7 @@
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Post;
+use ApiPlatform\Metadata\HttpOperation;
 use App\Api\Filter\MyTeamScopeFilter;
 use App\Controller\Api\MyTeam\InitializeMyTeamController;
 use App\Entity\Adherent;
@@ -26,9 +26,10 @@
             uriTemplate: '/v3/my_teams',
             normalizationContext: ['groups' => ['my_team_read_list']]
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/my_teams',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             controller: InitializeMyTeamController::class
         ),
     ],

diff --git a/src/Entity/Pap/Campaign.php b/src/Entity/Pap/Campaign.php
@@ -60,7 +60,6 @@
         ),
         new Get(
             uriTemplate: '/v3/pap_campaigns/{uuid}/questioners',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: GetPapCampaignQuestionersStatsController::class,
             security: "is_granted('REQUEST_SCOPE_GRANTED', ['pap_v2', 'pap'])"

diff --git a/src/Entity/Pap/CampaignHistory.php b/src/Entity/Pap/CampaignHistory.php
@@ -8,6 +8,7 @@
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
 use App\Api\Filter\AdherentIdentityFilter;
@@ -42,9 +43,10 @@
             requirements: ['uuid' => '%pattern_uuid%'],
             security: 'is_granted(\'ROLE_OAUTH_SCOPE_JEMARCHE_APP\') and object.getQuestioner() == user'
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/pap_campaign_histories/{uuid}/reply',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: CampaignHistoryReplyController::class,
             normalizationContext: ['groups' => ['data_survey_read']]

diff --git a/src/Entity/Phoning/Campaign.php b/src/Entity/Phoning/Campaign.php
@@ -63,7 +63,6 @@
         ),
         new Get(
             uriTemplate: '/v3/phoning_campaigns/{uuid}/callers',
-            defaults: ['_api_receive' => false],
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: GetPhoningCampaignCallersStatsController::class,
             security: "is_granted('REQUEST_SCOPE_GRANTED', 'phoning_campaign')"

diff --git a/src/Entity/Phoning/CampaignHistory.php b/src/Entity/Phoning/CampaignHistory.php
@@ -7,7 +7,7 @@
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Post;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Put;
 use App\Api\Filter\AdherentIdentityFilter;
 use App\Controller\Api\Phoning\CampaignHistoryReplyController;
@@ -37,9 +37,10 @@
             requirements: ['uuid' => '%pattern_uuid%'],
             security: 'is_granted(\'IS_CAMPAIGN_HISTORY_CALLER\', object)'
         ),
-        new Post(
+        new HttpOperation(
+            method: 'POST',
             uriTemplate: '/v3/phoning_campaign_histories/{uuid}/reply',
-            defaults: ['_api_receive' => false],
+            deserialize: false,
             requirements: ['uuid' => '%pattern_uuid%'],
             controller: CampaignHistoryReplyController::class,
             normalizationContext: ['groups' => ['data_survey_read']]
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public function onPostWrite(ViewEvent $viewEvent): void @@
             if (
                 !\in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT])
-                || '_api_/adherents/{uuid}/elect_put' !== $request->attributes->get('_api_operation_name')
+                || '_api_/v3/adherents/{uuid}/elect_put' !== $request->attributes->get('_api_operation_name')
             ) {
                 return;
             }
@@ Expand Down @@