Provide additional data for events

mitwork · Oct 19, 2023 · 1b25f08 · 1b25f08
1 parent 2c77e38
commit 1b25f08
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/src/Events/DocumentRejected.php b/src/Events/DocumentRejected.php
@@ -15,10 +15,13 @@ class DocumentRejected
 
     public array $result = [];
 
-    public function __construct($id, $message, $result = [])
+    public int|string|null $requestId;
+
+    public function __construct($id, $message, $result = [], $requestId = null)
     {
         $this->id = $id;
         $this->message = $message;
         $this->result = $result;
+        $this->requestId = $requestId;
     }
 }
diff --git a/src/Events/DocumentSigned.php b/src/Events/DocumentSigned.php
@@ -17,11 +17,14 @@ class DocumentSigned
 
     public array $result;
 
-    public function __construct($id, $content, $signature, $result)
+    public int|string|null $requestId;
+
+    public function __construct($id, $content, $signature, $result, $requestId = null)
     {
         $this->id = $id;
         $this->content = $content;
         $this->signature = $signature;
         $this->result = $result;
+        $this->requestId = $requestId;
     }
 }
diff --git a/src/Events/RequestRejected.php b/src/Events/RequestRejected.php
@@ -15,10 +15,13 @@ class RequestRejected
 
     public array $result = [];
 
-    public function __construct($id, $message, $result = [])
+    public int|string|null $documentId;
+
+    public function __construct($id, $message, $result = [], $documentId = null)
     {
         $this->id = $id;
         $this->message = $message;
         $this->result = $result;
+        $this->documentId = $documentId;
     }
 }
diff --git a/src/Http/Actions/ProcessContent.php b/src/Http/Actions/ProcessContent.php
@@ -92,13 +92,12 @@ public function process(ProcessDocumentRequest $request): JsonResponse
                     $message = __('kalkan::messages.unable_to_process_document');
                 }
 
-                RequestRejected::dispatch($id, $message, $result);
-                DocumentRejected::dispatch($signedDocument['id'], $message, $result);
-
-                $this->requestService->reject($id, $message);
-
                 if ($this->documentService->reject($signedDocument['id'], $message)) {
-                    return response()->json(['error' => $message, 'result' => $result], 422);
+                    DocumentRejected::dispatch($signedDocument['id'], $message, $result, $id);
+                }
+
+                if ($this->requestService->reject($id, $message)) {
+                    RequestRejected::dispatch($id, $message, $result, $signedDocument['id']);
                 }
 
                 return response()->json(['error' => $message, 'result' => $result], 500);
@@ -108,18 +107,20 @@ public function process(ProcessDocumentRequest $request): JsonResponse
 
                 $message = __('kalkan::messages.unable_to_process_document');
 
-                RequestRejected::dispatch($id, $message, $result);
-                DocumentRejected::dispatch($signedDocument['id'], $message, $result);
+                if ($this->documentService->reject($signedDocument['id'], $message)) {
+                    DocumentRejected::dispatch($signedDocument['id'], $message, $result, $id);
+                }
 
-                $this->documentService->reject($signedDocument['id'], $message);
-                $this->requestService->reject($id, $message);
+                if ($this->requestService->reject($id, $message)) {
+                    RequestRejected::dispatch($id, $message, $result, $signedDocument['id']);
+                }
 
                 return response()->json(['error' => $message], 500);
             }
 
             $this->documentService->update($signedDocument['id'], DocumentStatus::SIGNED);
 
-            DocumentSigned::dispatch($signedDocument['id'], $original['data'], $signature, $result);
+            DocumentSigned::dispatch($signedDocument['id'], $original['data'], $signature, $result, $id);
         }
 
         $this->requestService->update($id, RequestStatus::PROCESSED);