pass hash to lifecycle

Author: chriskapp

src/Service/Action.php

@@ -69,11 +69,6 @@ public function create(ActionCreate $action, UserContext $context): int
         $parameters = new Parameters($config);
         $handler    = $this->newAction($class);
 
-        // call lifecycle
-        if ($handler instanceof LifecycleInterface) {
-            $handler->onCreate($name, $parameters);
-        }
-
         // create action
         try {
             $this->actionTable->beginTransaction();
@@ -93,7 +88,12 @@ public function create(ActionCreate $action, UserContext $context): int
             $actionId = $this->actionTable->getLastInsertId();
             $action->setId($actionId);
 
-            $this->actionCommitter->commit($actionId, $row->getConfig(), $context);
+            $hash = $this->actionCommitter->commit($actionId, $row->getConfig(), $context);
+
+            // call lifecycle
+            if ($handler instanceof LifecycleInterface) {
+                $handler->onCreate($name, $parameters, $hash);
+            }
 
             $this->actionTable->commit();
         } catch (Throwable $e) {
@@ -128,11 +128,6 @@ public function update(string $actionId, ActionUpdate $action, UserContext $cont
         $parameters = new Parameters($config ?? []);
         $handler    = $this->newAction($class);
 
-        // call lifecycle
-        if ($handler instanceof LifecycleInterface) {
-            $handler->onUpdate($name, $parameters);
-        }
-
         // update action
         try {
             $this->actionTable->beginTransaction();
@@ -145,7 +140,12 @@ public function update(string $actionId, ActionUpdate $action, UserContext $cont
             $existing->setDate(LocalDateTime::now());
             $this->actionTable->update($existing);
 
-            $this->actionCommitter->commit($existing->getId(), $existing->getConfig(), $context);
+            $hash = $this->actionCommitter->commit($existing->getId(), $existing->getConfig(), $context);
+
+            // call lifecycle
+            if ($handler instanceof LifecycleInterface) {
+                $handler->onUpdate($name, $parameters, $hash);
+            }
 
             $this->actionTable->commit();
         } catch (Throwable $e) {

src/Service/Action/Committer.php

@@ -38,10 +38,10 @@ public function __construct(
     ) {
     }
 
-    public function commit(int $actionId, ?string $config, UserContext $context): void
+    public function commit(int $actionId, ?string $config, UserContext $context): ?string
     {
         if (empty($config)) {
-            return;
+            return null;
         }
 
         $previousHash = $this->actionCommitTable->findCurrentHash($actionId);
@@ -50,7 +50,7 @@ public function commit(int $actionId, ?string $config, UserContext $context): vo
 
         $existing = $this->actionCommitTable->findOneByCommitHash($hash);
         if ($existing instanceof Table\Generated\ActionCommitRow) {
-            return;
+            return null;
         }
 
         $row = new Table\Generated\ActionCommitRow();
@@ -61,5 +61,7 @@ public function commit(int $actionId, ?string $config, UserContext $context): vo
         $row->setConfig($config);
         $row->setInsertDate(LocalDateTime::now());
         $this->actionCommitTable->create($row);
+
+        return $hash;
     }
 }

src/Service/Schema/Committer.php

@@ -38,15 +38,15 @@ public function __construct(
     ) {
     }
 
-    public function commit(int $schemaId, string $source, UserContext $context): void
+    public function commit(int $schemaId, string $source, UserContext $context): ?string
     {
         $previousHash = $this->schemaCommitTable->findCurrentHash($schemaId);
 
         $hash = sha1($context->getTenantId() . $context->getUserId() . $schemaId . $previousHash . $source);
 
         $existing = $this->schemaCommitTable->findOneByCommitHash($hash);
         if ($existing instanceof Table\Generated\SchemaCommitRow) {
-            return;
+            return null;
         }
 
         $row = new Table\Generated\SchemaCommitRow();
@@ -57,5 +57,7 @@ public function commit(int $schemaId, string $source, UserContext $context): voi
         $row->setSource($source);
         $row->setInsertDate(LocalDateTime::now());
         $this->schemaCommitTable->create($row);
+
+        return $hash;
     }
 }