ExpireEnqueuedRunService uses FinalizeTaskRunService

Author: matt-aitken

apps/webapp/app/v3/services/expireEnqueuedRun.server.ts

@@ -1,7 +1,7 @@
 import { logger } from "~/services/logger.server";
-import { marqs } from "~/v3/marqs/index.server";
 import { BaseService } from "./baseService.server";
 import { eventRepository } from "../eventRepository.server";
+import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
 
 export class ExpireEnqueuedRunService extends BaseService {
   public async call(runId: string) {
@@ -39,30 +39,13 @@ export class ExpireEnqueuedRunService extends BaseService {
       run,
     });
 
-    /*
-    "EXPIRED"
-
-    Steps:
-    1. Updates the run to expired, with dates
-    2. Completes the run span OTEL event
-    3. marqs ack
-
-    Inputs:
-    - taskRun: id, spanId, ttl
-
-    Questions:
-    - Why do we ack after the db update?
-    */
-
-    await this._prisma.taskRun.update({
-      where: {
-        id: run.id,
-      },
-      data: {
-        status: "EXPIRED",
-        expiredAt: new Date(),
-        completedAt: new Date(),
-      },
+    const finalizeService = new FinalizeTaskRunService();
+    await finalizeService.call({
+      tx: this._prisma,
+      id: run.id,
+      status: "EXPIRED",
+      expiredAt: new Date(),
+      completedAt: new Date(),
     });
 
     await eventRepository.completeEvent(run.spanId, {
@@ -82,7 +65,5 @@ export class ExpireEnqueuedRunService extends BaseService {
         },
       ],
     });
-
-    await marqs?.acknowledgeMessage(run.id);
   }
 }