From 60fcfe7f6b9cb0c55c61ce33464e1700bbf6f90d Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 8 Jul 2021 22:34:36 +0100 Subject: [PATCH] started converting presets to new system --- backend/api/controllers/preset.js | 21 +++++++++++--------- backend/api/routes/{presets.js => preset.js} | 0 backend/server.js | 2 ++ 3 files changed, 14 insertions(+), 9 deletions(-) rename backend/api/routes/{presets.js => preset.js} (100%) diff --git a/backend/api/controllers/preset.js b/backend/api/controllers/preset.js index d4899ec14..99cb4b034 100644 --- a/backend/api/controllers/preset.js +++ b/backend/api/controllers/preset.js @@ -1,18 +1,20 @@ -import PresetDAO from "../../dao/presetDAO"; -import { +const PresetDAO = require("../../dao/presetDAO"); +const { isTagPresetNameValid, validateConfig, -} from "../../handlers/validation"; +} = require("../../handlers/validation"); +const MonkeyError = require("../../handlers/error"); class PresetController { static async addPreset(req, res, next) { try { const { name, config } = req.body; const { uid } = req.decodedToken; - if (!isTagPresetNameValid(name)) next("Invalid preset name."); + if (!isTagPresetNameValid(name)) + throw new MonkeyError(400, "Invalid preset name."); validateConfig(config); - const createdInfo = await PresetsDAO.addPreset(uid, name, config); - return res.sendStatus(200).json(createdInfo); + await PresetDAO.addPreset(uid, name, config); + return res.sendStatus(200); } catch (e) { return next(e); } @@ -22,9 +24,10 @@ class PresetController { try { const { id, name, config } = req.body; const { uid } = req.decodedToken; - if (!isTagPresetNameValid(name)) next("Invalid preset name."); + if (!isTagPresetNameValid(name)) + throw new MonkeyError(400, "Invalid preset name."); validateConfig(config); - await PresetsDAO.editPreset(uid, id, name, config); + await PresetDAO.editPreset(uid, id, name, config); return res.sendStatus(200); } catch (e) { return next(e); @@ -35,7 +38,7 @@ class PresetController { try { const { id } = req.body; const { uid } = req.decodedToken; - await PresetsDAO.removePreset(uid, id); + await PresetDAO.removePreset(uid, id); return res.sendStatus(200); } catch (e) { return next(e); diff --git a/backend/api/routes/presets.js b/backend/api/routes/preset.js similarity index 100% rename from backend/api/routes/presets.js rename to backend/api/routes/preset.js diff --git a/backend/server.js b/backend/server.js index 259597f70..337a9bfc1 100644 --- a/backend/server.js +++ b/backend/server.js @@ -24,6 +24,8 @@ const configRouter = require("./api/routes/config"); app.use("/config", configRouter); const resultRouter = require("./api/routes/result"); app.use("/results", resultRouter); +const presetRouter = require("./api/routes/preset"); +app.use("/presets", presetRouter); app.use(function (e, req, res, next) { console.log("Error", e);