fix: tests with new wrapping error from drizzle (#2141)

Author: spaenleh

package.json

@@ -77,7 +77,7 @@
     "bullmq": "5.46.1",
     "date-fns": "4.1.0",
     "dotenv": "16.4.7",
-    "drizzle-orm": "0.41.0",
+    "drizzle-orm": "0.45.2",
     "extract-zip": "2.0.1",
     "fast-json-stringify": "6.0.1",
     "fastify": "5.8.5",

pnpm-lock.yaml

@@ -1,4 +1,5 @@
-import { and, asc, count, eq } from 'drizzle-orm';
+import { DrizzleQueryError, and, asc, count, eq } from 'drizzle-orm';
+import { DatabaseError } from 'pg';
 
 import {
   type ShortLink as CreateShortLink,
@@ -48,9 +49,9 @@ export class ShortLinkRepository {
       // can throw on alias conflict
       if (
         err !== null &&
-        typeof err === 'object' &&
-        'code' in err &&
-        err.code === DUPLICATE_ERROR_CODE
+        err instanceof DrizzleQueryError &&
+        err.cause instanceof DatabaseError &&
+        err.cause.code === DUPLICATE_ERROR_CODE
       ) {
         throw new ShortLinkDuplication(alias);
       }
@@ -122,9 +123,9 @@ export class ShortLinkRepository {
     } catch (error: unknown) {
       if (
         error !== null &&
-        typeof error === 'object' &&
-        'code' in error &&
-        error.code === DUPLICATE_ERROR_CODE
+        error instanceof DrizzleQueryError &&
+        error.cause instanceof DatabaseError &&
+        error.cause.code === DUPLICATE_ERROR_CODE
       ) {
         throw new ShortLinkDuplication(entity.alias);
       }

src/services/item/plugins/shortLink/shortlink.repository.ts

@@ -436,33 +436,17 @@ export class InvalidJWTItem extends CoreError {
   }
 }
 
-export class ShortLinkNotFound extends CoreError {
-  constructor(shortLink: string) {
-    super(
-      {
-        code: 'GERR1009',
-        statusCode: StatusCodes.NOT_FOUND,
-        message: FAILURE_MESSAGES.SHORT_LINK_NOT_FOUND,
-      },
-      shortLink,
-    );
-    this.origin = 'shortLink';
-  }
-}
+export const ShortLinkNotFound = createError(
+  'GERR1009',
+  FAILURE_MESSAGES.SHORT_LINK_NOT_FOUND,
+  StatusCodes.NOT_FOUND,
+);
 
-export class ShortLinkDuplication extends CoreError {
-  constructor(shortLink: string) {
-    super(
-      {
-        code: 'GERR1010',
-        statusCode: StatusCodes.CONFLICT,
-        message: FAILURE_MESSAGES.SHORT_LINK_ALREADY_EXISTS,
-      },
-      shortLink,
-    );
-    this.origin = 'shortLink';
-  }
-}
+export const ShortLinkDuplication = createError(
+  'GERR1010',
+  FAILURE_MESSAGES.SHORT_LINK_ALREADY_EXISTS,
+  StatusCodes.CONFLICT,
+);
 
 export class ShortLinkLimitExceed extends CoreError {
   constructor(itemId: string, platform: string) {