refactor: Machine.php

tarfin-labs · Nov 16, 2023 · 37b865e · 37b865e
1 parent b448600
commit 37b865e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/src/Actor/Machine.php b/src/Actor/Machine.php
@@ -165,34 +165,40 @@ public function send(
         bool $shouldPersist = true,
     ): State {
         if ($this->state !== null) {
-            $lock = Cache::lock($this->state->history->first()->root_event_id, 60);
+            $lock = Cache::lock('machine-id:'.$this->state->history->first()->root_event_id, 60);
         }
 
-        if (!($lock?->get() ?? true)) {
+        if (isset($lock) && !$lock->get()) {
             throw MachineAlreadyRunningException::build($this->state->history->first()->root_event_id);
         }
 
-        $lastPreviousEventNumber = $this->state !== null
-            ? $this->state->history->last()->sequence_number
-            : 0;
+        try {
+            $lastPreviousEventNumber = $this->state !== null
+                ? $this->state->history->last()->sequence_number
+                : 0;
 
-        // If the event is a string, we assume it's the event type.
-        if (is_string($event)) {
-            $event = ['type' => $event];
-        }
+            // If the event is a string, we assume it's the event type.
+            if (is_string($event)) {
+                $event = ['type' => $event];
+            }
 
-        $this->state = match (true) {
-            $event->isTransactional ?? false => DB::transaction(fn () => $this->definition->transition($event, $this->state)),
-            default                          => $this->definition->transition($event, $this->state)
-        };
+            $this->state = match (true) {
+                $event->isTransactional ?? false => DB::transaction(fn () => $this->definition->transition($event, $this->state)),
+                default                          => $this->definition->transition($event, $this->state)
+            };
 
-        if ($shouldPersist === true) {
-            $this->persist();
-        }
-
-        $this->handleValidationGuards($lastPreviousEventNumber);
+            if ($shouldPersist === true) {
+                $this->persist();
+            }
 
-        $lock?->release();
+            $this->handleValidationGuards($lastPreviousEventNumber);
+        } catch (Exception $exception) {
+            throw $exception;
+        } finally {
+            if (isset($lock)) {
+                $lock->release();
+            }
+        }
 
         return $this->state;
     }

diff --git a/tests/MachineTransitionTest.php b/tests/MachineTransitionTest.php
@@ -115,7 +115,7 @@
     $machine = AsdMachine::create();
     $machine->persist();
 
-    $rootEventId = $machine->state->history->first()->root_event_id;
+    $rootEventId = 'machine-id:'.$machine->state->history->first()->root_event_id;
 
     Cache::shouldReceive('lock')
         ->once()