Merge pull request #46 from fluentci-io/fix/duplicated-runs

fix: resolve issue with duplicated run entries

.gitignore

@@ -1,2 +1,3 @@
 result
-demo*
+demo*
+kview

README.md

@@ -110,7 +110,7 @@ fluentci studio
 fluentci --help
 
 Usage:   fluentci [pipeline] [jobs...]
-Version: 0.14.5                      
+Version: 0.14.6                      
 
 Description:
 

src/consts.ts

@@ -1,6 +1,6 @@
 import { dir } from "../deps.ts";
 
-export const VERSION = "0.14.5";
+export const VERSION = "0.14.6";
 
 export const BASE_URL = "https://api.fluentci.io/v1";
 

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!,

src/server/kv/runs.ts

@@ -11,15 +11,21 @@ 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
-  );
+
+  const { value: runDate } = await kv.get<number>([
+    FLUENTCI_KV_PREFIX,
+    "run_date",
+    data.id,
+  ]);
+
+  if (runDate) {
+    await kv
+      .atomic()
+      .delete([FLUENTCI_KV_PREFIX, "runs_by_date", project, runDate])
+      .delete([FLUENTCI_KV_PREFIX, "run_date", data.id])
+      .commit();
+  }
+
   await kv
     .atomic()
     .set([FLUENTCI_KV_PREFIX, "runs", project, data.id], data)
@@ -34,6 +40,19 @@ export async function save(project: string, data: Run) {
       ],
       data
     )
+    .set(
+      [FLUENTCI_KV_PREFIX, "run_date", data.id],
+      dayjs(_.get(run, "date", data.date)).unix()
+    )
+    .set(
+      [
+        FLUENTCI_KV_PREFIX,
+        "runs_by_date",
+        project,
+        dayjs(_.get(run, "date", data.date)).unix(),
+      ],
+      data
+    )
     .commit();
 }