Merge branch 'dev_v1-admin' into debian12_v1-admin

backend/routes/api.js

@@ -20,6 +20,8 @@ import {
   createItem,
   changeUserPassword,
   changeUserPasswordFRONTEND,
+  changeInSafeStateV2,
+  updateItemByID,
 } from "../services/database.js";
 import { authenticate, generateToken } from "../services/tokenService.js";
 const router = express.Router();
@@ -306,4 +308,26 @@ router.post("/changePWadmin", authenticate, async (req, res) => {
   return res.status(500).json({ message: "Failed to change password" });
 });
 
+router.post("/updateItemByID", authenticate, async (req, res) => {
+  const role = req.body.can_borrow_role;
+  const itemId = req.body.itemId;
+  const item_name = req.body.item_name;
+  const result = await updateItemByID(itemId, item_name, role);
+  if (result.success) {
+    return res.status(200).json({ message: "Item updated successfully" });
+  }
+  return res.status(500).json({ message: "Failed to update item" });
+});
+
+router.post("/setSafeState", authenticate, async (req, res) => {
+  const { itemId, state } = req.body || {};
+  const result = await changeInSafeStateV2(itemId, state);
+  if (result.success) {
+    return res
+      .status(200)
+      .json({ message: "Item safe state updated successfully" });
+  }
+  return res.status(500).json({ message: "Failed to update item safe state" });
+});
+
 export default router;

backend/services/database.js

@@ -230,7 +230,7 @@ export const createLoanInDatabase = async (
     // Generate unique loan_code (retry a few times)
     let loanCode = null;
     for (let i = 0; i < 6; i++) {
-      const candidate = Math.floor(1000 + Math.random() * 900000); // 4-6 digits
+      const candidate = Math.floor(100000 + Math.random() * 899999); // 6 digits
       const [exists] = await conn.query(
         "SELECT 1 FROM loans WHERE loan_code = ? LIMIT 1",
         [candidate]
@@ -439,3 +439,12 @@ export const changeUserPasswordFRONTEND = async (
   if (result.affectedRows > 0) return { success: true };
   return { success: false };
 };
+
+export const updateItemByID = async (itemId, item_name, can_borrow_role) => {
+  const [result] = await pool.query(
+    "UPDATE items SET item_name = ?, can_borrow_role = ? WHERE id = ?",
+    [item_name, can_borrow_role, itemId]
+  );
+  if (result.affectedRows > 0) return { success: true };
+  return { success: false };
+};