Added custom error handling

uwblueprint · Jun 26, 2024 · 0227c79 · 0227c79
1 parent 45896ed
commit 0227c79
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/backend/typescript/rest/behaviourRoutes.ts b/backend/typescript/rest/behaviourRoutes.ts
@@ -5,7 +5,7 @@ import {
   BehaviourResponseDTO,
   IBehaviourService,
 } from "../services/interfaces/behaviourService";
-import { getErrorMessage } from "../utilities/errorUtils";
+import { getErrorMessage, NotFoundError } from "../utilities/errorUtils";
 import { sendResponseByMimeType } from "../utilities/responseUtil";
 
 const behaviourRouter: Router = Router();
@@ -52,7 +52,11 @@ behaviourRouter.get("/:id", async (req, res) => {
     const behaviour = await behaviourService.getBehaviour(id);
     res.status(200).json(behaviour);
   } catch (e: unknown) {
-    res.status(500).send(getErrorMessage(e));
+    if (e instanceof NotFoundError) {
+      res.status(404).send(getErrorMessage(e));
+    } else {
+      res.status(500).send(getErrorMessage(e));
+    }
   }
 });
 
@@ -66,7 +70,11 @@ behaviourRouter.put("/:id", behaviourRequestDtoValidators, async (req, res) => {
     });
     res.status(200).json(behaviour);
   } catch (e: unknown) {
-    res.status(500).send(getErrorMessage(e));
+    if (e instanceof NotFoundError) {
+      res.status(404).send(getErrorMessage(e));
+    } else {
+      res.status(500).send(getErrorMessage(e));
+    }
   }
 });
 
@@ -78,7 +86,11 @@ behaviourRouter.delete("/:id", async (req, res) => {
     const deletedId = await behaviourService.deleteBehaviour(id);
     res.status(200).json({ id: deletedId });
   } catch (e: unknown) {
-    res.status(500).send(getErrorMessage(e));
+    if (e instanceof NotFoundError) {
+      res.status(404).send(getErrorMessage(e));
+    } else {
+      res.status(500).send(getErrorMessage(e));
+    }
   }
 });
 

diff --git a/backend/typescript/services/implementations/behaviourService.ts b/backend/typescript/services/implementations/behaviourService.ts
@@ -4,7 +4,7 @@ import {
   BehaviourRequestDTO,
   BehaviourResponseDTO,
 } from "../interfaces/behaviourService";
-import { getErrorMessage } from "../../utilities/errorUtils";
+import { getErrorMessage, NotFoundError } from "../../utilities/errorUtils";
 import logger from "../../utilities/logger";
 
 const Logger = logger(__filename);
@@ -16,7 +16,7 @@ class BehaviourService implements IBehaviourService {
     try {
       behaviour = await PgBehaviour.findByPk(id, { raw: true });
       if (!behaviour) {
-        throw new Error(`Behaviour id ${id} not found`);
+        throw new NotFoundError(`Behaviour id ${id} not found`);
       }
     } catch (error: unknown) {
       Logger.error(
@@ -83,7 +83,7 @@ class BehaviourService implements IBehaviourService {
       );
 
       if (!updateResult[0]) {
-        throw new Error(`Behaviour id ${id} not found`);
+        throw new NotFoundError(`Behaviour id ${id} not found`);
       }
       [, [resultingBehaviour]] = updateResult;
     } catch (error: unknown) {
@@ -104,7 +104,7 @@ class BehaviourService implements IBehaviourService {
         where: { id },
       });
       if (!deleteResult) {
-        throw new Error(`Behaviour id ${id} not found`);
+        throw new NotFoundError(`Behaviour id ${id} not found`);
       }
       return id;
     } catch (error: unknown) {

diff --git a/backend/typescript/utilities/errorUtils.ts b/backend/typescript/utilities/errorUtils.ts
@@ -2,3 +2,11 @@
 export const getErrorMessage = (error: unknown): string => {
   return error instanceof Error ? error.message : "Unknown error occurred.";
 };
+
+// Thrown when resource is not found
+export class NotFoundError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "NotFoundError";
+  }
+}