[WIP] endpoint Event/Withdraw , ApiResponse, Event/SubmissionWithdrawnEvent refactored

Author: dwenzel

Classes/Api/Event/Withdraw.php

@@ -16,15 +16,16 @@
 
 use Cpsit\EventSubmission\Domain\Model\ApiResponseInterface;
 use Cpsit\EventSubmission\Domain\Model\Job;
+use Cpsit\EventSubmission\Domain\Repository\JobRepository;
 use Cpsit\EventSubmission\Event\SubmissionWithdrawnEvent;
+use Cpsit\EventSubmission\Exceptions\InvalidArgumentException;
 use Cpsit\EventSubmission\Factory\ApiResponse\ApiResponseFactoryFactory;
 use Cpsit\EventSubmission\Factory\ApiResponse\ApiResponseFactoryInterface;
-use Cpsit\EventSubmission\Factory\Job\JobFactory;
 use Cpsit\EventSubmission\Type\SubmissionStatus;
-use Nng\Nnhelpers\Utilities\Db;
 use Nng\Nnrestapi\Annotations as Api;
 use Nng\Nnrestapi\Api\AbstractApi;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 /**
  * Event API end point for PUT method
@@ -35,10 +36,12 @@ final class Withdraw extends AbstractApi implements EventApiInterface
 {
     public const RESPONSE_NAME = 'EventWithdrawApiResponse';
     protected ApiResponseFactoryInterface $responseFactory;
+    public const MESSAGE_INVALID_ARGUMENT = 'Invalid or missing argument %s.';
 
     public function __construct(
-        ApiResponseFactoryFactory $apiResponseFactoryFactory,
-        private readonly Db $db,
+        ApiResponseFactoryFactory                 $apiResponseFactoryFactory,
+        private readonly JobRepository            $jobRepository,
+        private readonly PersistenceManager       $persistenceManager,
         private readonly EventDispatcherInterface $eventDispatcher,
     )
     {
@@ -83,35 +86,27 @@ public function __construct(
     public function withdraw(): array
     {
         $arguments = $this->request->getArguments();
-        $responseCode = ApiResponseInterface::EVENT_WITHDRAW_ERROR;
-        $id = $arguments[self::PARAMETER_ID];
-        $responseData = [
-            'id' => $id,
-        ];
+            $responseCode = ApiResponseInterface::EVENT_WITHDRAW_ERROR;
 
-        // find job by identifier
-        // Note: job could be approved and imported already
-        $job = $this->db->findOneByValues(
-            Job::TABLE_NAME,
-            [
-                Job::FIELD_UUID => $id,
-            ]
-        );
-
-        // update job status
-        if (!empty($job)) {
-            $data = [
-                Job::FIELD_APPROVED => 0,
-                Job::FIELD_STATUS => SubmissionStatus::WITHDRAWN,
-            ];
-
-            $where = [
-                Job::FIELD_UID => $job[Job::FIELD_UID],
+        try {
+            if(!is_array($arguments) || empty($arguments[self::PARAMETER_ID])) {
+                $message = sprintf(self::MESSAGE_INVALID_ARGUMENT, self::PARAMETER_ID);
+                throw new InvalidArgumentException($message, $responseCode);
+            }
+            $id = $arguments[self::PARAMETER_ID];
+            $responseData = [
+                'id' => $id,
             ];
-            $result = $this->db->update(Job::TABLE_NAME, $data, $where);
 
+            $job = $this->jobRepository->findOneByUuid($id);
 
-            if ($result === 1) {
+            // update job status
+            // Note: job could be approved and imported already
+            if ($job instanceof Job) {
+                $job->setStatus(SubmissionStatus::WITHDRAWN)
+                    ->setApproved(false);
+                $this->jobRepository->update($job);
+                $this->persistenceManager->persistAll();
                 $responseCode = ApiResponseInterface::EVENT_WITHDRAW_SUCCESS;
                 $this->eventDispatcher->dispatch(
                     new SubmissionWithdrawnEvent(
@@ -120,6 +115,13 @@ public function withdraw(): array
                     )
                 );
             }
+
+        } catch (\Exception $exception) {
+            return $this->responseFactory
+                ->errorResponse()
+                ->setMessage($exception->getMessage())
+                ->setCode($exception->getCode())
+                ->toArray();
         }
 
         return $this->responseFactory

Classes/Domain/Model/ApiResponse.php

@@ -28,27 +28,30 @@ public function getCode(): int
         return $this->code;
     }
 
-    public function setCode(int $code): void
+    public function setCode(int $code): self
     {
         $this->code = $code;
+        return $this;
     }
 
     public function getData(): array
     {
         return $this->data;
     }
 
-    public function setData(array $data): void
+    public function setData(array $data): self
     {
         $this->data = $data;
+        return $this;
     }
 
     /**
      * @param string $message
      */
-    public function setMessage(string $message): void
+    public function setMessage(string $message): self
     {
         $this->message = $message;
+        return $this;
     }
 
     public function getMessage(): string

Classes/Event/SubmissionWithdrawnEvent.php

@@ -3,7 +3,7 @@
 namespace Cpsit\EventSubmission\Event;
 
 /*
- * This file is part of the iki_event_approval project.
+ * This file is part of the event_submission project.
  *
  * It is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, either version 2
@@ -15,11 +15,11 @@
 final readonly class SubmissionWithdrawnEvent
 {
     public function __construct(
-        private array $job,
+        private Job $job,
         private array $settings
     ) {}
 
-    public function getJob(): array
+    public function getJob(): Job
     {
         return $this->job;
     }

Classes/Exceptions/InvalidArgumentException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Cpsit\EventSubmission\Exceptions;
+
+/*
+ * This file is part of the iki_event_approval project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ */
+
+class InvalidArgumentException extends \Exception
+{
+
+}