Fix task dependency parameter mapping

SudoPub · Nov 6, 2023 · 02f53d2 · 02f53d2
1 parent b07d46e
commit 02f53d2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 16 deletions.
diff --git a/src/orchestration/initialize/recursive-create-task.ts b/src/orchestration/initialize/recursive-create-task.ts
@@ -32,7 +32,7 @@ export const initializeLoadRecursiveCreateTask = (
 
             previousTask.addDependency(
                 currentTask.getOrThrow().taskIdentifier,
-                nextOperation.connection.parametersMapping,
+                [nextOperation.connection.parametersMapping],
             );
             continue operation;
         }
@@ -44,7 +44,7 @@ export const initializeLoadRecursiveCreateTask = (
         if (currentTask.exists) {
             nextTask.addDependency(
                 currentTask.getOrThrow().taskIdentifier,
-                nextOperation.connection.parametersMapping,
+                [nextOperation.connection.parametersMapping],
             );
         }
 

diff --git a/src/orchestration/map-espial-insert/recursive-create-task.ts b/src/orchestration/map-espial-insert/recursive-create-task.ts
@@ -28,7 +28,7 @@ export const mapEspialInsertRecursiveCreateTask = (
     if (nextOperations.length === 0) {
         mapFinalizeTask.addDependency(
             currentTask.getOrThrow().taskIdentifier,
-            {},
+            [],
         );
         return;
     }
@@ -42,7 +42,7 @@ export const mapEspialInsertRecursiveCreateTask = (
 
             previousTask.addDependency(
                 currentTask.getOrThrow().taskIdentifier,
-                nextOperation.connection.parametersMapping,
+                [nextOperation.connection.parametersMapping],
             );
             continue operation;
         }
@@ -54,7 +54,7 @@ export const mapEspialInsertRecursiveCreateTask = (
         if (currentTask.exists) {
             nextTask.addDependency(
                 currentTask.getOrThrow().taskIdentifier,
-                nextOperation.connection.parametersMapping,
+                [nextOperation.connection.parametersMapping],
             );
         }
 

diff --git a/src/task/apply/map-espial-succeed.ts b/src/task/apply/map-espial-succeed.ts
@@ -6,6 +6,7 @@
 
 import { PUB_ACTION_TYPE, PubAction } from "../../action/definition/action";
 import { mapEspialInsertCreateTasks } from "../../orchestration/map-espial-insert/create-task";
+import { PUB_TASK_STATUS } from "../definition/task";
 import { PubMapEspialTask } from "../implementation/map-espial";
 import { PubMapFinalizeTask } from "../implementation/map-finalize";
 import { PubTaskBase } from "../task-base";
@@ -34,5 +35,17 @@ export const applyMapEspialSucceedOnTaskManager = (
     }
 
     taskManager.insertTasks([mapFinalizeTask]);
+
+    mapEspialTask.setTaskStatus(PUB_TASK_STATUS.RESOLVED);
+
+    const dependents: PubTaskBase[] = taskManager.getTasksByDependency(mapEspialTask.taskIdentifier);
+
+    for (const dependent of dependents) {
+
+        dependent.reconnectDependency(
+            mapEspialTask.taskIdentifier,
+            [mapFinalizeTask.taskIdentifier],
+        );
+    }
     return true;
 };
diff --git a/src/task/task-base.ts b/src/task/task-base.ts
@@ -87,7 +87,7 @@ export abstract class PubTaskBase {
 
     public addDependency(
         dependency: string,
-        parametersMapping: PubConnectionParameterMapping,
+        parametersMappings: PubConnectionParameterMapping[],
     ): this {
 
         if (this._dependencies.has(dependency)) {
@@ -97,18 +97,18 @@ export abstract class PubTaskBase {
 
             this._dependencies.set(dependency, [
                 ...dependencies,
-                parametersMapping,
+                ...parametersMappings,
             ]);
             return this;
         }
 
-        this._dependencies.set(dependency, [parametersMapping]);
+        this._dependencies.set(dependency, parametersMappings);
         return this;
     }
 
     public resolveDependency(
         dependency: string,
-        output: TaskExecuteOutput,
+        output?: TaskExecuteOutput,
     ): this {
 
         if (!this._dependencies.has(dependency)) {
@@ -118,10 +118,32 @@ export abstract class PubTaskBase {
         const mappings: PubConnectionParameterMapping[] =
             this._dependencies.get(dependency) as PubConnectionParameterMapping[];
 
-        for (const mapping of mappings) {
-            this.combineExecuteInput(
-                mapTaskDependencyOutput(mapping, output),
-            );
+        if (typeof output !== 'undefined') {
+            for (const mapping of mappings) {
+                this.combineExecuteInput(
+                    mapTaskDependencyOutput(mapping, output),
+                );
+            }
+        }
+
+        this._dependencies.delete(dependency);
+        return this;
+    }
+
+    public reconnectDependency(
+        dependency: string,
+        newDependencies: string[],
+    ): this {
+
+        if (!this._dependencies.has(dependency)) {
+            return this;
+        }
+
+        const mappings: PubConnectionParameterMapping[] =
+            this._dependencies.get(dependency) as PubConnectionParameterMapping[];
+
+        for (const newDependency of newDependencies) {
+            this.addDependency(newDependency, mappings);
         }
 
         this._dependencies.delete(dependency);

diff --git a/test/e2e/two-action-map/resolve-map.test.ts b/test/e2e/two-action-map/resolve-map.test.ts
@@ -42,9 +42,7 @@ describe('Given (Two-Action-Map Resolve Map) Use Case', (): void => {
 
         expect(applyResult).to.be.true;
 
-        console.log(taskManager.createSnapshot());
-
         ExpectTaskManager.with(taskManager)
-            .forTasksWithProcedureIdentifier("MAP");
+            .hasExecutableTaskLength(1);
     });
 });