chore: improve error handling

fonoster · Dec 28, 2024 · ec5f6b1 · ec5f6b1
1 parent f01e634
commit ec5f6b1
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 73 deletions.
diff --git a/mods/apiserver/src/utils/createCheckNumberPreconditions.ts b/mods/apiserver/src/utils/createCheckNumberPreconditions.ts
@@ -22,8 +22,8 @@ import { Prisma } from "../core/db";
 
 function createCheckNumberPreconditions(prisma: Prisma) {
   return async function checkNumberPreconditions({ appRef, accessKeyId }) {
+    // You can have a Number without an Application but it must exist
     if (!appRef) {
-      // Not needed to check for the precondition
       return;
     }
 
@@ -33,7 +33,7 @@ function createCheckNumberPreconditions(prisma: Prisma) {
 
     if (!app) {
       throw new GrpcError(
-        status.NOT_FOUND,
+        status.INVALID_ARGUMENT,
         "Application not found for ref: " + appRef
       );
     }

diff --git a/mods/common/src/errors/PrismaErrorEnum.ts b/mods/common/src/errors/PrismaErrorEnum.ts
@@ -18,8 +18,7 @@
  */
 enum PrismaErrorEnum {
   RECORD_ALREADY_EXISTS = "P2002",
-  RECORD_NOT_FOUND = "P2025",
-  FAILED_PRECONDITION = "P2003"
+  RECORD_NOT_FOUND = "P2025"
 }
 
 export { PrismaErrorEnum };
diff --git a/mods/common/src/errors/handleError.ts b/mods/common/src/errors/handleError.ts
@@ -71,14 +71,6 @@ function handleError(
         "not found error"
       );
       break;
-    case PrismaErrorEnum.FAILED_PRECONDITION:
-    case grpc.status.FAILED_PRECONDITION:
-      logAndCallback(
-        status.FAILED_PRECONDITION,
-        "Failed precondition error (e.g., missing dependency)",
-        "failed precondition error"
-      );
-      break;
     case grpc.status.PERMISSION_DENIED:
       logAndCallback(
         status.PERMISSION_DENIED,
@@ -96,7 +88,7 @@ function handleError(
     case grpc.status.INVALID_ARGUMENT:
       logAndCallback(
         status.INVALID_ARGUMENT,
-        message ?? "Your request has invalid arguments",
+        message ?? "Your request has one or more invalid arguments",
         "invalid argument error"
       );
       break;