From 4167bcffe669767d880cce4a122806d642030fc1 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Tue, 1 Feb 2022 18:00:33 +0100
Subject: [PATCH] using asynchandlerwrapper, removed try catches part of #2376

---
 backend/api/controllers/preset.js | 66 ++++++++++++-------------------
 backend/api/routes/preset.js      | 12 ++++--
 2 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/backend/api/controllers/preset.js b/backend/api/controllers/preset.js
index 824ce2f22..2d7d15c28 100644
--- a/backend/api/controllers/preset.js
+++ b/backend/api/controllers/preset.js
@@ -6,53 +6,37 @@ const {
 const MonkeyError = require("../../handlers/error");
 
 class PresetController {
-  static async getPresets(req, res, next) {
-    try {
-      const { uid } = req.decodedToken;
-      let presets = await PresetDAO.getPresets(uid);
-      return res.status(200).json(presets);
-    } catch (e) {
-      return next(e);
-    }
+  static async getPresets(req, res) {
+    const { uid } = req.decodedToken;
+    let presets = await PresetDAO.getPresets(uid);
+    return res.status(200).json(presets);
   }
 
-  static async addPreset(req, res, next) {
-    try {
-      const { name, config } = req.body;
-      const { uid } = req.decodedToken;
-      if (!isTagPresetNameValid(name))
-        throw new MonkeyError(400, "Invalid preset name.");
-      validateConfig(config);
-      let preset = await PresetDAO.addPreset(uid, name, config);
-      return res.status(200).json(preset);
-    } catch (e) {
-      return next(e);
-    }
+  static async addPreset(req, res) {
+    const { name, config } = req.body;
+    const { uid } = req.decodedToken;
+    if (!isTagPresetNameValid(name))
+      throw new MonkeyError(400, "Invalid preset name.");
+    validateConfig(config);
+    let preset = await PresetDAO.addPreset(uid, name, config);
+    return res.status(200).json(preset);
   }
 
-  static async editPreset(req, res, next) {
-    try {
-      const { _id, name, config } = req.body;
-      const { uid } = req.decodedToken;
-      if (!isTagPresetNameValid(name))
-        throw new MonkeyError(400, "Invalid preset name.");
-      if (config) validateConfig(config);
-      await PresetDAO.editPreset(uid, _id, name, config);
-      return res.sendStatus(200);
-    } catch (e) {
-      return next(e);
-    }
+  static async editPreset(req, res) {
+    const { _id, name, config } = req.body;
+    const { uid } = req.decodedToken;
+    if (!isTagPresetNameValid(name))
+      throw new MonkeyError(400, "Invalid preset name.");
+    if (config) validateConfig(config);
+    await PresetDAO.editPreset(uid, _id, name, config);
+    return res.sendStatus(200);
   }
 
-  static async removePreset(req, res, next) {
-    try {
-      const { _id } = req.body;
-      const { uid } = req.decodedToken;
-      await PresetDAO.removePreset(uid, _id);
-      return res.sendStatus(200);
-    } catch (e) {
-      return next(e);
-    }
+  static async removePreset(req, res) {
+    const { _id } = req.body;
+    const { uid } = req.decodedToken;
+    await PresetDAO.removePreset(uid, _id);
+    return res.sendStatus(200);
   }
 }
 
diff --git a/backend/api/routes/preset.js b/backend/api/routes/preset.js
index 2bc15fae8..c6c5cf12d 100644
--- a/backend/api/routes/preset.js
+++ b/backend/api/routes/preset.js
@@ -1,6 +1,10 @@
 const { authenticateRequest } = require("../../middlewares/auth");
 const PresetController = require("../controllers/preset");
 const RateLimit = require("../../middlewares/rate-limit");
+const {
+  asyncHandlerWrapper,
+  requestValidation,
+} = require("../../middlewares/api-utils");
 
 const { Router } = require("express");
 
@@ -10,28 +14,28 @@ router.get(
   "/",
   RateLimit.presetsGet,
   authenticateRequest,
-  PresetController.getPresets
+  asyncHandlerWrapper(PresetController.getPresets)
 );
 
 router.post(
   "/add",
   RateLimit.presetsAdd,
   authenticateRequest,
-  PresetController.addPreset
+  asyncHandlerWrapper(PresetController.addPreset)
 );
 
 router.post(
   "/edit",
   RateLimit.presetsEdit,
   authenticateRequest,
-  PresetController.editPreset
+  asyncHandlerWrapper(PresetController.editPreset)
 );
 
 router.post(
   "/remove",
   RateLimit.presetsRemove,
   authenticateRequest,
-  PresetController.removePreset
+  asyncHandlerWrapper(PresetController.removePreset)
 );
 
 module.exports = router;