@brandboostinggmbh/observable-workflows 0.15.0 → 0.15.1

package/dist/index.d.ts

@@ -562,7 +562,6 @@ declare const createCleanupManager: (context: {
       stepStatus: string;
       errorRef: string | null;
       resultRef: string | null;
-      workflowName: string;
     }[];
     externalStorageKeysCount: number;
   }>;
@@ -574,7 +573,6 @@ declare const createCleanupManager: (context: {
       stepStatus: string;
       errorRef: string | null;
       resultRef: string | null;
-      workflowName: string;
     }[];
     deletedExternalStorageKeysCount: number;
   }>;

package/dist/index.js

@@ -1348,30 +1348,37 @@ const createCleanupManager = (context) => {
 		const result = await context.D1.prepare(
 			/* sql */
 			`
-      SELECT instanceId, workflowName, inputRef
+      SELECT instanceId, inputRef
       FROM WorkflowTable
       WHERE tenantId = ? 
         AND startTime < (strftime('%s', 'now', '-' || ? || ' days') * 1000)
         AND workflowStatus IN (${statusPlaceholders})
-      ORDER BY workflowName, instanceId
+      ORDER BY instanceId
       LIMIT ?
     `
 ).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
 		return result.results;
 	};
-	const getAffectedSteps = async (workflows) => {
-		if (workflows.length === 0) return [];
-		const workflowIds = workflows.map(() => "?").join(", ");
+	const getAffectedSteps = async (config, limit) => {
+		const { statuses, statusPlaceholders } = buildStatusesAndPlaceholders(config);
+		if (statuses.length === 0) return [];
 		const result = await context.D1.prepare(
 			/* sql */
 			`
-      SELECT s.instanceId, s.stepName, s.stepStatus, s.errorRef, s.resultRef, w.workflowName
+      SELECT s.instanceId, s.stepName, s.stepStatus, s.errorRef, s.resultRef
       FROM StepTable s
-      JOIN WorkflowTable w ON s.instanceId = w.instanceId
-      WHERE s.instanceId IN (${workflowIds})
-      ORDER BY w.workflowName, s.instanceId, s.stepName
+      WHERE s.instanceId IN (
+        SELECT instanceId
+        FROM WorkflowTable
+        WHERE tenantId = ? 
+          AND startTime < (strftime('%s', 'now', '-' || ? || ' days') * 1000)
+          AND workflowStatus IN (${statusPlaceholders})
+        ORDER BY instanceId
+        LIMIT ?
+      )
+      ORDER BY s.instanceId, s.stepName
     `
-).bind(...workflows.map((w) => w.instanceId)).all();
+).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
 		return result.results;
 	};
 	const collectExternalStorageKeys = (workflows, steps) => {
@@ -1390,7 +1397,7 @@ const createCleanupManager = (context) => {
 			externalStorageKeysCount: 0
 		};
 		const affectedWorkflows = await getAffectedWorkflows(config, limit);
-		const affectedSteps = await getAffectedSteps(affectedWorkflows);
+		const affectedSteps = await getAffectedSteps(config, limit);
 		let externalStorageKeysCount = 0;
 		if (config.deleteRefsFromExternalStorage && context.externalBlobStorage) {
 			const externalKeys = collectExternalStorageKeys(affectedWorkflows, affectedSteps);
@@ -1409,7 +1416,7 @@ const createCleanupManager = (context) => {
 			deletedExternalStorageKeysCount: 0
 		};
 		const deletedWorkflows = await getAffectedWorkflows(config, limit);
-		const deletedSteps = await getAffectedSteps(deletedWorkflows);
+		const deletedSteps = await getAffectedSteps(config, limit);
 		let deletedExternalStorageKeysCount = 0;
 		if (config.deleteRefsFromExternalStorage && context.externalBlobStorage) {
 			const externalKeys = collectExternalStorageKeys(deletedWorkflows, deletedSteps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandboostinggmbh/observable-workflows",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "My awesome typescript library",
   "type": "module",
   "license": "MIT",