simplify route reads

Author: carderne

apps/webapp/app/presenters/v3/ApiBulkActionPresenter.server.ts

@@ -37,23 +37,6 @@ type BulkActionRow = Pick<
 >;
 
 export class ApiBulkActionPresenter extends BasePresenter {
-  public async retrieve(environmentId: string, bulkActionId: string) {
-    // Read from primary so create -> retrieve/poll doesn't 404 on replica lag.
-    const bulkAction = await this._prisma.bulkActionGroup.findFirst({
-      select: bulkActionSelect,
-      where: {
-        environmentId,
-        friendlyId: bulkActionId,
-      },
-    });
-
-    if (!bulkAction) {
-      return undefined;
-    }
-
-    return apiBulkActionObject(bulkAction);
-  }
-
   public async list(environmentId: string, searchParams: ApiBulkActionListSearchParams) {
     const pageSize = searchParams["page[size]"] ?? DEFAULT_PAGE_SIZE;
     const after = searchParams["page[after]"];
@@ -116,7 +99,7 @@ export class ApiBulkActionPresenter extends BasePresenter {
   }
 }
 
-const bulkActionSelect = {
+export const bulkActionSelect = {
   id: true,
   friendlyId: true,
   name: true,

apps/webapp/app/routes/api.v1.bulk-actions.$bulkActionId.abort.ts

@@ -18,8 +18,9 @@ const { action } = createActionApiRoute(
       action: "write",
       resource: () => ({ type: "runs" }),
     },
+    // Existence/auth gate. Reads from primary so create -> abort doesn't 404 on
+    // replica lag; the abort write path re-reads and mutates on primary.
     findResource: async (params, auth) => {
-      // Read from primary so create -> abort doesn't 404 on replica lag.
       return prisma.bulkActionGroup.findFirst({
         select: { id: true },
         where: {

apps/webapp/app/routes/api.v1.bulk-actions.$bulkActionId.ts

@@ -1,7 +1,10 @@
 import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
-import { ApiBulkActionPresenter } from "~/presenters/v3/ApiBulkActionPresenter.server";
+import {
+  apiBulkActionObject,
+  bulkActionSelect,
+} from "~/presenters/v3/ApiBulkActionPresenter.server";
 import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
 const ParamsSchema = z.object({
@@ -16,25 +19,18 @@ export const loader = createLoaderApiRoute(
       action: "read",
       resource: () => ({ type: "runs" }),
     },
+    // Read from primary so create -> retrieve/poll doesn't 404 on replica lag.
     findResource: async (params, auth) => {
-      // Read from primary so create -> retrieve/poll doesn't 404 on replica lag.
       return prisma.bulkActionGroup.findFirst({
-        select: { id: true },
+        select: bulkActionSelect,
         where: {
           friendlyId: params.bulkActionId,
           environmentId: auth.environment.id,
         },
       });
     },
   },
-  async ({ params, authentication }) => {
-    const presenter = new ApiBulkActionPresenter();
-    const bulkAction = await presenter.retrieve(authentication.environment.id, params.bulkActionId);
-
-    if (!bulkAction) {
-      return json({ error: "Bulk action not found" }, { status: 404 });
-    }
-
-    return json(bulkAction);
+  async ({ resource }) => {
+    return json(apiBulkActionObject(resource));
   }
 );