fix: resolve issue with duplicated runs entries

fluentci-io · May 30, 2024 · 16dd3ae · 16dd3ae
1 parent 01c50a7
commit 16dd3ae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/server/executor.ts b/src/server/executor.ts
@@ -30,6 +30,7 @@ export default async function run(ctx: Context, actions: Action[], data: Run) {
     ...data,
     date: new Date().toISOString(),
   });
+  let run = await ctx.kv.runs.get(data.id);
 
   for (const action of actions) {
     if (!action.enabled) {
@@ -61,7 +62,7 @@ export default async function run(ctx: Context, actions: Action[], data: Run) {
     );
 
     await ctx.kv.runs.save(data.projectId, {
-      ...data,
+      ...run!,
       jobs,
     });
 
@@ -107,7 +108,7 @@ export default async function run(ctx: Context, actions: Action[], data: Run) {
         }));
         const duration = dayjs().diff(runStart, "milliseconds");
         await ctx.kv.runs.save(data.projectId, {
-          ...data,
+          ...run!,
           jobs,
           status: "FAILURE",
           duration,
@@ -129,15 +130,14 @@ export default async function run(ctx: Context, actions: Action[], data: Run) {
     }));
 
     await ctx.kv.runs.save(data.projectId, {
-      ...data,
+      ...run!,
       jobs,
-      status: "SUCCESS",
     });
 
     currentActionIndex += 1;
   }
 
-  const run = await ctx.kv.runs.get(data.id);
+  run = await ctx.kv.runs.get(data.id);
   const duration = dayjs().diff(runStart, "milliseconds");
   await ctx.kv.runs.save(data.projectId, {
     ...run!,

diff --git a/src/server/kv/runs.ts b/src/server/kv/runs.ts
@@ -11,15 +11,14 @@ export async function save(project: string, data: Run) {
   }
 
   const run = await get(data.id);
-  await kv.set(
-    [
-      FLUENTCI_KV_PREFIX,
-      "runs_by_date",
-      project,
-      dayjs(_.get(run, "date", data.date)).unix(),
-    ],
-    data
-  );
+
+  await kv.delete([
+    FLUENTCI_KV_PREFIX,
+    "runs_by_date",
+    project,
+    dayjs(_.get(run, "date", data.date)).unix(),
+  ]);
+
   await kv
     .atomic()
     .set([FLUENTCI_KV_PREFIX, "runs", project, data.id], data)
@@ -34,6 +33,15 @@ export async function save(project: string, data: Run) {
       ],
       data
     )
+    .set(
+      [
+        FLUENTCI_KV_PREFIX,
+        "runs_by_date",
+        project,
+        dayjs(_.get(run, "date", data.date)).unix(),
+      ],
+      data
+    )
     .commit();
 }