feat(application): add application query exceptions (#172)

* feat(application): add application query exceptions

add application query exceptions

* fix(core): cr fix remove query level exception

remove application query level exception handle logic

* fix(core): delete application query throw slonikError

delete application query throw slonikError

packages/core/src/middleware/koa-error-handler.ts

@@ -3,6 +3,7 @@ import { RequestErrorBody } from '@logto/schemas';
 import decamelize from 'decamelize';
 import { Middleware } from 'koa';
 import { errors } from 'oidc-provider';
+import { NotFoundError } from 'slonik';
 
 import RequestError from '@/errors/RequestError';
 
@@ -32,6 +33,13 @@ export default function koaErrorHandler<StateT, ContextT>(): Middleware<
         return;
       }
 
+      if (error instanceof NotFoundError) {
+        const error = new RequestError({ code: 'entity.not_found', status: 404 });
+        ctx.status = error.status;
+        ctx.body = error.body;
+        return;
+      }
+
       throw error;
     }
   };

packages/core/src/queries/application.ts

@@ -1,12 +1,11 @@
 import { Application, ApplicationUpdate, Applications } from '@logto/schemas';
-import { sql } from 'slonik';
+import { sql, SlonikError } from 'slonik';
 
 import { buildFindMany } from '@/database/find-many';
 import { buildInsertInto } from '@/database/insert-into';
 import pool from '@/database/pool';
 import { buildUpdateWhere } from '@/database/update-where';
 import { convertToIdentifiers, OmitAutoSetFields, getTotalRowCount } from '@/database/utils';
-import RequestError from '@/errors/RequestError';
 
 const { table, fields } = convertToIdentifiers(Applications);
 
@@ -49,11 +48,6 @@ export const deleteApplicationById = async (id: string) => {
     where id=${id}
   `);
   if (rowCount < 1) {
-    throw new RequestError({
-      code: 'entity.not_exists_with_id',
-      name: Applications.tableSingular,
-      id,
-      status: 404,
-    });
+    throw new SlonikError('Resource not found');
   }
 };

packages/core/src/routes/application.ts

@@ -101,6 +101,7 @@ export default function applicationRoutes<T extends AuthedRouter>(router: T) {
     async (ctx, next) => {
       const { id } = ctx.guard.params;
       // Note: will need delete cascade when application is joint with other tables
+      await findApplicationById(id);
       await deleteApplicationById(id);
       ctx.status = 204;
       return next();

packages/phrases/src/locales/en.ts

@@ -50,6 +50,7 @@ const errors = {
     create_failed: 'Failed to create {{name}}.',
     not_exists: 'The {{name}} does not exist.',
     not_exists_with_id: 'The {{name}} with ID `{{id}}` does not exist.',
+    not_found: 'The resource does not exist',
   },
 };
 

packages/phrases/src/locales/zh-cn.ts

@@ -52,6 +52,7 @@ const errors = {
     create_failed: '创建 {{name}} 失败。',
     not_exists: '该 {{name}} 不存在。',
     not_exists_with_id: 'ID 为 `{{id}}` 的 {{name}} 不存在。',
+    not_found: '该资源不存在',
   },
 };