Update: remove ids from update dtos

Author: tatevikg1

src/Common/Validator/RequestValidator.php

@@ -29,12 +29,6 @@ public function validate(Request $request, string $dtoClass): RequestInterface
         }
         $routeParams = $request->attributes->get('_route_params') ?? [];
 
-        if (isset($routeParams['subscriberId'])) {
-            $routeParams['subscriberId'] = (int) $routeParams['subscriberId'];
-        }
-        if (isset($routeParams['messageId'])) {
-            $routeParams['messageId'] = (int) $routeParams['messageId'];
-        }
         if (isset($routeParams['listId'])) {
             $routeParams['listId'] = (int) $routeParams['listId'];
         }

src/Messaging/Controller/CampaignController.php

@@ -144,13 +144,21 @@ public function getMessages(Request $request): JsonResponse
                 response: 403,
                 description: 'Failure',
                 content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse')
+            ),
+            new OA\Response(
+                response: 404,
+                description: 'Failure',
+                content: new OA\JsonContent(ref: '#/components/schemas/NotFoundErrorResponse')
             )
         ]
     )]
     public function getMessage(
         Request $request,
         #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null
     ): JsonResponse {
+        if ($message === null) {
+            throw $this->createNotFoundException('Campaign not found.');
+        }
         $this->requireAuthentication($request);
 
         return $this->json($this->campaignService->getMessage($message), Response::HTTP_OK);
@@ -271,6 +279,11 @@ public function createMessage(Request $request): JsonResponse
                 description: 'Failure',
                 content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse')
             ),
+            new OA\Response(
+                response: 404,
+                description: 'Failure',
+                content: new OA\JsonContent(ref: '#/components/schemas/NotFoundErrorResponse')
+            ),
             new OA\Response(
                 response: 422,
                 description: 'Failure',
@@ -282,6 +295,9 @@ public function updateMessage(
         Request $request,
         #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null,
     ): JsonResponse {
+        if ($message === null) {
+            throw $this->createNotFoundException('Campaign not found.');
+        }
         $authUser = $this->requireAuthentication($request);
 
         /** @var UpdateMessageRequest $updateMessageRequest */

src/Messaging/Request/UpdateMessageRequest.php

@@ -9,12 +9,9 @@
 
 class UpdateMessageRequest extends CreateMessageRequest
 {
-    public int $messageId;
-
     public function getDto(): MessageDtoInterface
     {
         return new UpdateMessageDto(
-            messageId: $this->messageId,
             content: $this->content->getDto(),
             format: $this->format->getDto(),
             metadata: $this->metadata->getDto(),

src/Subscription/Controller/SubscriberController.php

@@ -169,7 +169,7 @@ public function updateSubscriber(
         }
         /** @var UpdateSubscriberRequest $updateSubscriberRequest */
         $updateSubscriberRequest = $this->validator->validate($request, UpdateSubscriberRequest::class);
-        $subscriber = $this->subscriberManager->updateSubscriber($updateSubscriberRequest->getDto(), $admin);
+        $subscriber = $this->subscriberManager->updateSubscriber($subscriber, $updateSubscriberRequest->getDto(), $admin);
         $this->entityManager->flush();
         $subscriberData = $this->subscriberNormalizer->normalize($subscriber, 'json');