set the jobkey as event:event.id

Chigala · Chigala · commit 18a02829e341 · 2023-08-18T15:21:09.000+01:00
diff --git a/apps/webapp/app/routes/api.v1.events.$eventId.cancel.ts b/apps/webapp/app/routes/api.v1.events.$eventId.cancel.ts
@@ -44,7 +44,6 @@ export async function action({ request, params }: ActionArgs) {
 
     return json(updatedEvent);
   } catch (err) {
-    //send the error
     logger.error("CancelEventService.call() error", {
       error: err,
     });
diff --git a/apps/webapp/app/services/events/cancelEvent.server.ts b/apps/webapp/app/services/events/cancelEvent.server.ts
@@ -1,8 +1,5 @@
-import type { EventDispatcher, EventRecord } from "@trigger.dev/database";
-import type { EventFilter } from "@trigger.dev/core";
-import { EventFilterSchema, eventFilterMatches } from "@trigger.dev/core";
+import type { EventRecord } from "@trigger.dev/database";
 import { $transaction, PrismaClientOrTransaction, prisma } from "~/db.server";
-import { logger } from "~/services/logger.server";
 import { workerQueue } from "../worker.server";
 import { AuthenticatedEnvironment } from "../apiAuth.server";
 
@@ -13,17 +10,21 @@ export class CancelEventService {
     this.#prismaClient = prismaClient;
   }
 
-  public async call(environment: AuthenticatedEnvironment, eventId: string): Promise<EventRecord | undefined> {
+  public async call(
+    environment: AuthenticatedEnvironment,
+    eventId: string
+  ): Promise<EventRecord | undefined> {
     return await $transaction(
       this.#prismaClient,
       async (tx) => {
-        const event = await tx.eventRecord.findFirst({
+        const event = await tx.eventRecord.findUnique({
           select: {
             id: true,
             name: true,
             createdAt: true,
             updatedAt: true,
             environmentId: true,
+            cancelledAt: true,
             runs: {
               select: {
                 id: true,
@@ -34,23 +35,29 @@ export class CancelEventService {
             },
           },
           where: {
-            id: eventId,
-            environmentId: environment.id,
+            eventId_environmentId: {
+              eventId: eventId,
+              environmentId: environment.id,
+            },
           },
         });
 
         if (!event) {
           return;
         }
 
+        if (event.cancelledAt) {
+          return event;
+        }
+
         //update the cancelledAt column in the eventRecord table
         const updatedEvent = await prisma.eventRecord.update({
           where: { id: event.id },
           data: { cancelledAt: new Date() },
         });
 
         // Dequeue the event after the db has been updated
-        await workerQueue.dequeue(event.id, { tx: prisma });
+        await workerQueue.dequeue(`event:${event.id}`, { tx: prisma });
 
         return updatedEvent;
       },
diff --git a/apps/webapp/app/services/events/ingestSendEvent.server.ts b/apps/webapp/app/services/events/ingestSendEvent.server.ts
@@ -88,7 +88,7 @@ export class IngestSendEvent {
             {
               id: eventLog.id,
             },
-            { runAt: eventLog.deliverAt, tx, jobKey: eventLog.id }
+            { runAt: eventLog.deliverAt, tx, jobKey: `event:${eventLog.id}` }
           );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class IngestSendEvent {`
`88`	`88`	`{`
`89`	`89`	`id: eventLog.id,`
`90`	`90`	`},`
`91`		`- { runAt: eventLog.deliverAt, tx, jobKey: eventLog.id }`
	`91`	+ { runAt: eventLog.deliverAt, tx, jobKey: `event:${eventLog.id}` }
`92`	`92`	`);`
`93`	`93`	`}`
`94`	`94`