fixed code rabbit review

Author: mpcgrid

apps/webapp/app/routes/api.v1.idempotencyKeys.$key.reset.ts

@@ -3,6 +3,7 @@ import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { z } from "zod";
 import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { ResetIdempotencyKeyService } from "~/v3/services/resetIdempotencyKey.server";
+import { logger } from "~/services/logger.server";
 
 const ParamsSchema = z.object({
   key: z.string(),
@@ -39,6 +40,10 @@ export const { action } = createActionApiRoute(
         return json({ error: error.message }, { status: error.status ?? 400 });
       }
 
+      logger.error("Failed to reset idempotency key via API", {
+        error: error instanceof Error ? { name: error.name, message: error.message, stack: error.stack } : String(error),
+      });
+
       return json({ error: "Internal Server Error" }, { status: 500 });
     }
 

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.idempotencyKey.reset.tsx

@@ -2,7 +2,7 @@ import { parse } from "@conform-to/zod";
 import { type ActionFunction, json } from "@remix-run/node";
 import { z } from "zod";
 import { prisma } from "~/db.server";
-import { jsonWithErrorMessage, jsonWithSuccessMessage } from "~/models/message.server";
+import { jsonWithErrorMessage } from "~/models/message.server";
 import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
 import { ResetIdempotencyKeyService } from "~/v3/services/resetIdempotencyKey.server";
@@ -100,11 +100,7 @@ export const action: ActionFunction = async ({ request, params }) => {
       organization: environment.project.organization,
     });
 
-    return jsonWithSuccessMessage(
-      { success: true },
-      request,
-      "Idempotency key reset successfully"
-    );
+    return json({ success: true });
   } catch (error) {
     if (error instanceof Error) {
       logger.error("Failed to reset idempotency key", {

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

@@ -7,38 +7,25 @@ export class ResetIdempotencyKeyService extends BaseService {
     taskIdentifier: string,
     authenticatedEnv: AuthenticatedEnvironment
   ): Promise<{ id: string }> {
-    // Find all runs with this idempotency key and task identifier in the authenticated environment
-    const runs = await this._prisma.taskRun.findMany({
+    const { count } = await this._prisma.taskRun.updateMany({
       where: {
         idempotencyKey,
         taskIdentifier,
         runtimeEnvironmentId: authenticatedEnv.id,
       },
-      select: {
-        id: true,
+      data: {
+        idempotencyKey: null,
+        idempotencyKeyExpiresAt: null,
       },
     });
 
-    if (runs.length === 0) {
+    if (count === 0) {
       throw new ServiceValidationError(
         `No runs found with idempotency key: ${idempotencyKey} and task: ${taskIdentifier}`,
         404
       );
     }
 
-    // Update all runs to clear the idempotency key
-    await this._prisma.taskRun.updateMany({
-      where: {
-        idempotencyKey,
-        taskIdentifier,
-        runtimeEnvironmentId: authenticatedEnv.id,
-      },
-      data: {
-        idempotencyKey: null,
-        idempotencyKeyExpiresAt: null,
-      },
-    });
-
     return { id: idempotencyKey };
   }
 }

packages/core/src/v3/idempotencyKeys.ts

@@ -2,6 +2,7 @@ import { apiClientManager } from "./apiClientManager-api.js";
 import { taskContext } from "./task-context-api.js";
 import { IdempotencyKey } from "./types/idempotencyKeys.js";
 import { digestSHA256 } from "./utils/crypto.js";
+import type { ZodFetchOptions } from "./apiClient/core.js";
 
 export function isIdempotencyKey(
   value: string | string[] | IdempotencyKey
@@ -137,9 +138,14 @@ export function attemptKey(ctx: AttemptKeyMaterial): string {
 /** Resets an idempotency key, effectively deleting it from the associated task.*/
 export async function resetIdempotencyKey(
   taskIdentifier: string,
-  idempotencyKey: string
+  idempotencyKey: string,
+  requestOptions?: ZodFetchOptions
 ): Promise<{ id: string }> {
   const client = apiClientManager.clientOrThrow();
 
-  return client.resetIdempotencyKey(taskIdentifier, idempotencyKey);
+  return client.resetIdempotencyKey(
+    taskIdentifier,
+    idempotencyKey,
+    requestOptions
+  );
 }