From 744c3fd21130b6ee3c722df3fab096b169fd0ff8 Mon Sep 17 00:00:00 2001
From: Val <68596159+valya@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:12:29 +0100
Subject: [PATCH] fix(core): Waiting workflows not stopping (#5811)

fix: Waiting workflows not stopping
---
 packages/cli/src/Interfaces.ts                         | 4 ++--
 packages/cli/src/WaitTracker.ts                        | 2 +-
 packages/cli/src/databases/entities/ExecutionEntity.ts | 2 +-
 packages/workflow/src/Interfaces.ts                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 02f15ea51..1c16ba539 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -165,7 +165,7 @@ export interface IExecutionBase {
 // Data in regular format with references
 export interface IExecutionDb extends IExecutionBase {
 	data: IRunExecutionData;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	workflowData?: IWorkflowBase;
 }
 
@@ -179,7 +179,7 @@ export interface IExecutionResponse extends IExecutionBase {
 	data: IRunExecutionData;
 	retryOf?: string;
 	retrySuccessId?: string;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	workflowData: IWorkflowBase;
 }
 
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 4441cb8e3..1a58e135d 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -124,7 +124,7 @@ export class WaitTracker {
 		};
 
 		fullExecutionData.stoppedAt = new Date();
-		fullExecutionData.waitTill = undefined;
+		fullExecutionData.waitTill = null;
 		fullExecutionData.status = 'canceled';
 
 		await Db.collections.Execution.update(
diff --git a/packages/cli/src/databases/entities/ExecutionEntity.ts b/packages/cli/src/databases/entities/ExecutionEntity.ts
index a29ef9da0..c16365bbc 100644
--- a/packages/cli/src/databases/entities/ExecutionEntity.ts
+++ b/packages/cli/src/databases/entities/ExecutionEntity.ts
@@ -49,7 +49,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	workflowId: string;
 
 	@Column({ type: datetimeColumnType, nullable: true })
-	waitTill: Date;
+	waitTill: Date | null;
 
 	@OneToMany('ExecutionMetadata', 'execution')
 	metadata: ExecutionMetadata[];
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 0a598b1b2..e34457d8a 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1547,7 +1547,7 @@ export interface IRun {
 	data: IRunExecutionData;
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
-	waitTill?: Date;
+	waitTill?: Date | null;
 	startedAt: Date;
 	stoppedAt?: Date;
 	status: ExecutionStatus;