Merge pull request #60 from daichitakahashi/listLostDispatches

List lost dispatches
daichitakahashi · Dec 2, 2024 · 3e2f9b0 · 3e2f9b0
2 parents 1045a6f + ecf8be6
commit 3e2f9b0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/cf-eventhub/CHANGELOG.md b/cf-eventhub/CHANGELOG.md
@@ -1,5 +1,11 @@
 # cf-eventhub
 
+## 0.0.14
+
+### Patch Changes
+
+- fb0d41a: Fix PgRepository.listDispatches to list lost dispatches
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/cf-eventhub/package.json b/cf-eventhub/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cf-eventhub",
   "type": "module",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "keywords": [
     "cloudflare"
   ],

diff --git a/cf-eventhub/src/postgres/repository.ts b/cf-eventhub/src/postgres/repository.ts
@@ -333,6 +333,8 @@ export class PgRepository implements Repository {
           db
             .select({
               id: d.id,
+              result: schema.dispatchResults.result,
+              resultedAt: schema.dispatchResults.resultedAt,
             })
             .from(d)
             .leftJoin(
@@ -410,6 +412,8 @@ export class PgRepository implements Repository {
               createdAt: d.createdAt,
             },
             executions: executions.data,
+            result: targetDispatches.result,
+            resultedAt: targetDispatches.resultedAt,
           })
           .from(d)
           .innerJoin(targetDispatches, eq(d.id, targetDispatches.id))
@@ -440,6 +444,13 @@ export class PgRepository implements Repository {
               }
             }
           }
+          if (
+            row.result === "lost" &&
+            row.resultedAt &&
+            dispatch.status === "ongoing"
+          ) {
+            dispatch = makeDispatchLost(dispatch, row.resultedAt);
+          }
           return dispatch;
         });
         const last = hasNextPage ? list[list.length - 1] : undefined;

diff --git a/iac/pulumi/CHANGELOG.md b/iac/pulumi/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @cf-eventhub/pulumi
 
+## 0.0.11
+
+### Patch Changes
+
+- Updated dependencies [fb0d41a]
+  - [email protected]
+
 ## 0.0.10
 
 ### Patch Changes

diff --git a/iac/pulumi/package.json b/iac/pulumi/package.json
@@ -2,7 +2,7 @@
   "name": "@cf-eventhub/pulumi",
   "main": "src/index.ts",
   "type": "commonjs",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "keywords": [
     "pulumi",
     "cloudflare"
@@ -17,7 +17,7 @@
   "dependencies": {
     "@pulumi/cloudflare": "^5.40.0",
     "@pulumi/pulumi": "^3.113.0",
-    "cf-eventhub": "^0.0.13"
+    "cf-eventhub": "^0.0.14"
   },
   "tsup": {
     "entry": [

diff --git a/web-console/package.json b/web-console/package.json
@@ -18,7 +18,7 @@
     "typed-htmx": "^0.3.1",
     "typescript": "^5.6.2",
     "wrangler": "^3.83.0",
-    "cf-eventhub": "^0.0.13"
+    "cf-eventhub": "^0.0.14"
   },
   "tsup": {
     "entry": [