fix minor

kuaukutsu · Dec 13, 2023 · e39ba19 · e39ba19
1 parent 0518bae
commit e39ba19
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/src/processing/TaskProcessReady.php b/src/processing/TaskProcessReady.php
@@ -4,11 +4,11 @@
 
 namespace kuaukutsu\poc\task\processing;
 
-use kuaukutsu\poc\task\state\TaskCommand;
 use RuntimeException;
 use SplQueue;
 use kuaukutsu\poc\task\dto\StageModel;
 use kuaukutsu\poc\task\dto\StageModelState;
+use kuaukutsu\poc\task\state\TaskCommand;
 use kuaukutsu\poc\task\state\TaskStateMessage;
 use kuaukutsu\poc\task\state\TaskStateReady;
 use kuaukutsu\poc\task\state\TaskStateRunning;
@@ -61,15 +61,17 @@ public function pushStageOnPause(EntityTask $task): bool
             ?? $this->query->findReadyByTask($uuid);
 
         if ($stage === null) {
-            $this->enqueue($task, TaskCommand::stop()->toValue());
+            $this->enqueueCommand($task, TaskCommand::stop());
             return false;
         }
 
-        return $this->enqueue(
+        $this->enqueue(
             $task,
             $this->processRun($stage->uuid)->uuid,
             $this->query->findPreviousCompletedByTask($uuid, $stage->order)?->uuid,
         );
+
+        return true;
     }
 
     /**
@@ -80,14 +82,16 @@ public function pushStageOnReady(EntityTask $task): bool
         $uuid = new EntityUuid($task->getUuid());
         $stage = $this->query->findReadyByTask($uuid);
         if ($stage === null) {
-            $this->enqueue($task, TaskCommand::stop()->toValue());
+            $this->enqueueCommand($task, TaskCommand::stop());
             return false;
         }
 
-        return $this->enqueue(
+        $this->enqueue(
             $task,
             $this->processRun($stage->uuid)->uuid,
         );
+
+        return true;
     }
 
     /**
@@ -98,15 +102,17 @@ public function pushStageOnForgotten(EntityTask $task): bool
         $uuid = new EntityUuid($task->getUuid());
         $stage = $this->query->findForgottenByTask($uuid);
         if ($stage === null) {
-            $this->enqueue($task, TaskCommand::stop()->toValue());
+            $this->enqueueCommand($task, TaskCommand::stop());
             return false;
         }
 
-        return $this->enqueue(
+        $this->enqueue(
             $task,
             $this->processRun($stage->uuid)->uuid,
             $this->query->findPreviousCompletedByTask($uuid, $stage->order)?->uuid,
         );
+
+        return true;
     }
 
     /**
@@ -120,29 +126,28 @@ public function pushStageNext(EntityTask $task, string $previous): bool
             ?? $this->query->findReadyByTask($uuid);
 
         if ($stage === null) {
-            $this->enqueue($task, TaskCommand::stop()->toValue());
+            $this->enqueueCommand($task, TaskCommand::stop());
             return false;
         }
 
-        return $this->enqueue(
+        $this->enqueue(
             $task,
             $this->processRun($stage->uuid)->uuid,
             $previous,
         );
+
+        return true;
     }
 
     /**
      * @throws RuntimeException Ошибка выполнения комманды
      */
     public function pushStagePromise(EntityTask $task, int $limit): bool
     {
-        $index = $this->query->indexReadyByTask(
-            new EntityUuid($task->getUuid()),
-            $limit,
-        );
-
+        $uuid = new EntityUuid($task->getUuid());
+        $index = $this->query->indexReadyByTask($uuid, $limit);
         if ($index === []) {
-            $this->enqueue($task, TaskCommand::stop()->toValue());
+            $this->enqueueCommand($task, TaskCommand::stop());
             return false;
         }
 
@@ -173,7 +178,7 @@ public function terminate(): array
      * @param non-empty-string $stage
      * @param non-empty-string|null $previous
      */
-    private function enqueue(EntityTask $task, string $stage, ?string $previous = null): bool
+    private function enqueue(EntityTask $task, string $stage, ?string $previous = null): void
     {
         $this->queue->enqueue(
             new TaskProcessContext(
@@ -183,8 +188,17 @@ private function enqueue(EntityTask $task, string $stage, ?string $previous = nu
                 previous: $previous,
             )
         );
+    }
 
-        return true;
+    private function enqueueCommand(EntityTask $task, TaskCommand $command): void
+    {
+        $this->queue->enqueue(
+            new TaskProcessContext(
+                task: $task->getUuid(),
+                stage: $command->toValue(),
+                options: $task->getOptions(),
+            )
+        );
     }
 
     /**

diff --git a/src/state/TaskCommand.php b/src/state/TaskCommand.php
@@ -12,7 +12,7 @@ final class TaskCommand
     /**
      * @param non-empty-string $command
      */
-    public function __construct(private readonly string $command = '00000000-0000-0000-0000-000000000000')
+    public function __construct(private readonly string $command = self::COMMAND_NULL)
     {
     }