Refactor position move logic

backend/helpers/positionMove.js

@@ -0,0 +1,63 @@
+const isMissingPositionColumn = (error) =>
+  error &&
+  error.code === "ER_BAD_FIELD_ERROR" &&
+  String(error.sqlMessage || "").includes("position");
+
+const moveByPosition = async ({
+  db,
+  table,
+  id,
+  direction,
+  selectQuery,
+  missingColumnMessage,
+  notFoundMessage,
+}) => {
+  if (direction !== "up" && direction !== "down") {
+    return { status: 400, body: { error: "Ungueltige Richtung" } };
+  }
+
+  let rows;
+
+  try {
+    await db.query(
+      `UPDATE ${table} SET position = id WHERE position IS NULL`
+    );
+
+    ;[rows] = await db.query(selectQuery);
+  } catch (error) {
+    if (isMissingPositionColumn(error)) {
+      return { status: 400, body: { error: missingColumnMessage } };
+    }
+
+    throw error;
+  }
+
+  const index = rows.findIndex((row) => row.id == id);
+
+  if (index === -1) {
+    return { status: 404, body: { error: notFoundMessage } };
+  }
+
+  const swapIndex = direction === "up" ? index - 1 : index + 1;
+
+  if (swapIndex < 0 || swapIndex >= rows.length) {
+    return { status: 200, body: { success: true } };
+  }
+
+  const moved = rows.splice(index, 1)[0];
+  rows.splice(swapIndex, 0, moved);
+
+  for (let i = 0; i < rows.length; i++) {
+    await db.query(
+      `UPDATE ${table} SET position = ? WHERE id = ?`,
+      [i + 1, rows[i].id]
+    );
+  }
+
+  return { status: 200, body: { success: true } };
+};
+
+module.exports = {
+  moveByPosition,
+  isMissingPositionColumn,
+};

backend/routes/domains.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const pool = require('../db');
+const { moveByPosition, isMissingPositionColumn } = require("../helpers/positionMove");
 
 const clean = (value) => value === "" ? null : value;
 
@@ -26,10 +27,6 @@ const mapDomainError = (err, fallbackMessage) => {
   return { status, message };
 };
 
-const isMissingPositionColumn = (error) =>
-  error && error.code === "ER_BAD_FIELD_ERROR" && String(error.sqlMessage || "").includes("position");
-
-
 // GET ALL DOMAINS
 router.get('/', async (req, res) => {
   try {
@@ -209,50 +206,17 @@ router.post('/:id/move', async (req, res) => {
   try {
     const { direction } = req.body
 
-    if (direction !== "up" && direction !== "down") {
+    const result = await moveByPosition({
-      return res.status(400).json({ error: "Ungueltige Richtung" })
+      db: pool,
-    }
+      table: "domains",
+      id: req.params.id,
+      direction,
+      selectQuery: "SELECT id FROM domains ORDER BY position, domain_name, id",
+      missingColumnMessage: "Position-Spalte in domains fehlt noch",
+      notFoundMessage: "Domain nicht gefunden",
+    });
 
-    let rows
+    res.status(result.status).json(result.body);
-
-    try {
-      await pool.query(
-        "UPDATE domains SET position = id WHERE position IS NULL"
-      )
-
-      ;[rows] = await pool.query(
-        "SELECT id, domain_name FROM domains ORDER BY position, domain_name, id"
-      )
-    } catch (err) {
-      if (isMissingPositionColumn(err)) {
-        return res.status(400).json({ error: "Position-Spalte in domains fehlt noch" })
-      }
-      throw err
-    }
-
-    const index = rows.findIndex(row => row.id == req.params.id)
-
-    if (index === -1) {
-      return res.status(404).json({ error: "Domain nicht gefunden" })
-    }
-
-    const swapIndex = direction === "up" ? index - 1 : index + 1
-
-    if (swapIndex < 0 || swapIndex >= rows.length) {
-      return res.json({ success: true })
-    }
-
-    const moved = rows.splice(index, 1)[0]
-    rows.splice(swapIndex, 0, moved)
-
-    for(let i = 0; i < rows.length; i++){
-      await pool.query(
-        "UPDATE domains SET position = ? WHERE id = ?",
-        [i + 1, rows[i].id]
-      )
-    }
-
-    res.json({ success: true })
 
   } catch (err) {
     console.error("MOVE domain error:", err);

backend/routes/resources.js

@@ -2,63 +2,26 @@ const express = require("express");
 const router = express.Router();
 const db = require("../db");
 const controller = require("../controllers/resourceController");
-
+const { moveByPosition } = require("../helpers/positionMove");
-const isMissingPositionColumn = (error) =>
-  error && error.code === "ER_BAD_FIELD_ERROR" && String(error.sqlMessage || "").includes("position");
 
 router.get("/active", controller.getActive);
 router.get("/cancelled", controller.getCancelled);
 
 router.post("/:id/move", async (req, res) => {
-
-  const { direction } = req.body
-
-  if (direction !== "up" && direction !== "down") {
-    return res.status(400).json({ error: "Ungueltige Richtung" })
-  }
-
   try {
+    const { direction } = req.body;
 
-    let rows
+    const result = await moveByPosition({
+      db,
+      table: "resources",
+      id: req.params.id,
+      direction,
+      selectQuery: "SELECT id FROM resources WHERE status != 'gekündigt' ORDER BY position, id",
+      missingColumnMessage: "Position-Spalte in resources fehlt noch",
+      notFoundMessage: "Ressource nicht gefunden",
+    });
 
-    try {
+    res.status(result.status).json(result.body);
-      await db.query(
-        "UPDATE resources SET position = id WHERE position IS NULL"
-      )
-
-      ;[rows] = await db.query(
-        "SELECT id FROM resources WHERE status != 'gekündigt' ORDER BY position, id"
-      )
-    } catch (e) {
-      if (isMissingPositionColumn(e)) {
-        return res.status(400).json({ error: "Position-Spalte in resources fehlt noch" })
-      }
-      throw e
-    }
-
-    const index = rows.findIndex(r => r.id == req.params.id)
-
-    if (index === -1) {
-      return res.status(404).json({ error: "Ressource nicht gefunden" })
-    }
-
-    const swapIndex = direction === "up" ? index - 1 : index + 1
-
-    if (swapIndex < 0 || swapIndex >= rows.length) {
-      return res.json({ success: true })
-    }
-
-    const moved = rows.splice(index, 1)[0]
-    rows.splice(swapIndex, 0, moved)
-
-    for(let i = 0; i < rows.length; i++){
-      await db.query(
-        "UPDATE resources SET position=? WHERE id=?",
-        [i + 1, rows[i].id]
-      )
-    }
-
-    res.json({ success: true })
 
   } catch (e) {
     console.error("MOVE resource error:", e)