From 29c55a1bf11dc4eea9fce389dafb245ef7d9d2f8 Mon Sep 17 00:00:00 2001 From: Dominic Ferrando Date: Fri, 17 Jul 2026 10:41:21 -0400 Subject: [PATCH] Rename event fulfill to resolve --- apps/api/src/services/event-queue.ts | 2 +- apps/api/src/services/events.ts | 8 ++++---- .../portal/src/routes/(app)/apparel/activity/+page.svelte | 4 ++-- .../portal/src/routes/(app)/apparel/products/+page.svelte | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/api/src/services/event-queue.ts b/apps/api/src/services/event-queue.ts index 88fe5e1..f90c287 100644 --- a/apps/api/src/services/event-queue.ts +++ b/apps/api/src/services/event-queue.ts @@ -179,7 +179,7 @@ export class EventQueue this.Events.setState(event.id, state), event.id); - await this.Events.fulfill(event.id); + await this.Events.resolve(event.id); } catch (err) { await this.Events.setLastError(event.id, err); diff --git a/apps/api/src/services/events.ts b/apps/api/src/services/events.ts index 80214ea..60f7cc5 100644 --- a/apps/api/src/services/events.ts +++ b/apps/api/src/services/events.ts @@ -11,7 +11,7 @@ export const EventStatusSchema = t.Union([ t.Literal("available"), t.Literal("processing"), t.Literal("failed"), - t.Literal("fulfilled"), + t.Literal("resolved"), ]); export type EventStatus = Static; @@ -37,7 +37,7 @@ export class EventsService { return "available"; }; if (!event.ended_at) return "processing"; - return event.has_failed ? "failed" : "fulfilled"; + return event.has_failed ? "failed" : "resolved"; } async get(id: string, trx?: Transaction) { @@ -76,7 +76,7 @@ export class EventsService { .where("ended_at", "is not", null) .where("has_failed", "is", true) ) - .$if(opt.filter?.status === "fulfilled", (qb) => qb + .$if(opt.filter?.status === "resolved", (qb) => qb .where("started_at", "is not", null) .where("ended_at", "is not", null) .where("has_failed", "is", false) @@ -115,7 +115,7 @@ export class EventsService { .execute(); } - async fulfill(id: string, trx?: Transaction): Promise { + async resolve(id: string, trx?: Transaction): Promise { await (trx ?? db).updateTable("events") .set({ state: null, ended_at: new Date(), last_error: null }) .where("id", "=", id) diff --git a/apps/portal/src/routes/(app)/apparel/activity/+page.svelte b/apps/portal/src/routes/(app)/apparel/activity/+page.svelte index aeada4a..ba4c9d9 100644 --- a/apps/portal/src/routes/(app)/apparel/activity/+page.svelte +++ b/apps/portal/src/routes/(app)/apparel/activity/+page.svelte @@ -14,7 +14,7 @@ available: "badge-info", processing: "badge-warning", failed: "badge-error", - fulfilled: "badge-success", + resolved: "badge-success", }; const groups = (await api.events.groups.get()).data ?? []; @@ -139,7 +139,7 @@ - +