Set orderDate to orderDateInput

Reviewed-on: #3

README.md

@@ -1,6 +1,15 @@
 # DELIVER_MAN
 
-## Docker
+## Core Functionality
+
+- View product inventory with current stock levels.
+- Create orders with customer name and order date.
+- Edit order details (customer name, date) and delete orders.
+- Add items to orders, update item quantities or products, and remove items.
+- Move items between orders.
+- Prevent overselling by validating stock on add/update.
+
+## Run via Docker
 
 Run client + server + database:
 

docker-compose.yml

@@ -20,7 +20,7 @@ services:
   server:
     build:
       context: .
-      dockerfile: Dockerfile.server
+      dockerfile: docker/Dockerfile.server
     environment:
       HOST: db
       PORT: 3306
@@ -42,7 +42,7 @@ services:
   client:
     build:
       context: .
-      dockerfile: Dockerfile.client
+      dockerfile: docker/Dockerfile.client
     depends_on:
       server:
         condition: service_healthy

public/app.js

@@ -121,7 +121,7 @@ class OrderCard {
         idCell.textContent = item.product_id ?? item.id;
 
         const productCell = document.createElement('td');
-        const productSelect = this.buildProductSelect(item);
+        const productSelect = this.buildProductSelect(item.product_id);
         productSelect.classList.add('form-select-sm');
         productSelect.dataset.action = 'item-product';
         productSelect.dataset.itemId = item.id;
@@ -220,7 +220,12 @@ class OrderCard {
         const productLabel = document.createElement('label');
         productLabel.className = 'form-label';
         productLabel.textContent = 'Товар';
-        const productSelect = this.buildProductSelect();
+        const usedProductIds = new Set(
+            (this.order.items || [])
+                .map((item) => item.product_id)
+                .filter((value) => value !== null && value !== undefined)
+        );
+        const productSelect = this.buildProductSelect(undefined, usedProductIds);
         const productSelectId = `add-item-product-${this.order.id}`;
         productSelect.name = 'productId';
         productSelect.id = productSelectId;
@@ -253,6 +258,16 @@ class OrderCard {
         addButton.textContent = 'Добавить позицию';
         actionCol.appendChild(addButton);
 
+        if (productSelect.options.length === 0) {
+            const placeholder = document.createElement('option');
+            placeholder.value = '';
+            placeholder.textContent = 'Нет доступных позиций';
+            productSelect.appendChild(placeholder);
+            productSelect.disabled = true;
+            quantityInput.disabled = true;
+            addButton.disabled = true;
+        }
+
         form.appendChild(productCol);
         form.appendChild(quantityCol);
         form.appendChild(actionCol);
@@ -260,10 +275,13 @@ class OrderCard {
         return form;
     }
 
-    buildProductSelect(selectedId) {
+    buildProductSelect(selectedId, excludedIds) {
         const select = document.createElement('select');
         select.className = 'form-select';
         this.products.forEach((product) => {
+            if (excludedIds && excludedIds.has(product.id)) {
+                return;
+            }
             const option = document.createElement('option');
             option.value = product.id;
             option.textContent = product.name;
@@ -313,7 +331,7 @@ async function fetchJson(url, options) {
         const payload = await response.json().catch(() => ({
             message: 'Ошибка запроса.'
         }));
-        throw new Error(payload.message || 'Ошибка запроса.');
+        throw new Error(payload.error || payload.message || 'Error');
     }
     if (response.status === 204) {
         return null;
@@ -397,9 +415,7 @@ async function refreshData() {
 
     currentDateEl.textContent = currentDate;
     orderDateInput.min = currentDate;
-    if (!orderDateInput.value) {
-        orderDateInput.value = currentDate;
-    }
+    orderDateInput.value = currentDate
 
     renderInventory();
     renderOrders();
@@ -426,9 +442,7 @@ function initializeApp() {
     currentDate = initialDate;
     currentDateEl.textContent = initialDate;
     orderDateInput.min = initialDate;
-    if (!orderDateInput.value) {
     orderDateInput.value = initialDate;
-    }
 
     orderForm.addEventListener('submit', async (event) => {
         event.preventDefault();
@@ -549,6 +563,7 @@ function initializeApp() {
                         `[data-action="item-product"][data-item-id="${itemId}"]`
                     );
 
+                    try {
                         await fetchJson(`/api/orders/${orderId}/items/${itemId}`, {
                             method: 'PUT',
                             headers: {
@@ -561,6 +576,11 @@ function initializeApp() {
                         });
                         await refreshData();
                         return;
+                    } catch (error) {
+                        showNotification(error.message, 'warning');
+                        await refreshData();
+                        return;
+                    }
                 }
                 case 'delete-item': {
                     await fetchJson(`/api/orders/${orderId}/items/${itemId}`, {

server/db/database.js

@@ -135,14 +135,14 @@ export default class DBAdapter {
         if (!id || !customer_name || !orderDate){
             return Promise.reject({
                 type: DB_USER_ERROR,
-                error: new Error("Empty in customer name or order date")
+                error: new Error("Пустое имя клиента или дата заказа")
             });
         }
         const currentDate = await getCurrentDate();
         if (orderDate < currentDate){
             return Promise.reject({
                 type: DB_USER_ERROR,
-                error: new Error("Invalid order date")
+                error: new Error("Недопустимая дата заказа")
             });
         }
         try {
@@ -152,7 +152,7 @@ export default class DBAdapter {
         } catch(err){
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Server error")
+                error: new Error("Ошибка сервера")
             });
         }
     }
@@ -192,8 +192,8 @@ export default class DBAdapter {
         if (!id || !customer_name || !orderDate) {
             return Promise.reject({
                 type: DB_USER_ERROR,
-                error: new Error("Order ID, name or date is required!"),
-                message: "Order ID, name or date is required!" // Добавляем message напрямую
+                error: new Error("Нужен ID заказа, имя и дата"),
+                message: "Нужен ID заказа, имя и дата" // Добавляем message напрямую
             });
         }
 
@@ -201,8 +201,8 @@ export default class DBAdapter {
         if (orderDate < currentDate) {
             return Promise.reject({
                 type: DB_USER_ERROR,
-                error: new Error("Order date cannot be less than current date"),
-                message: "Order date cannot be less than current date"
+                error: new Error("Дата заказа не может быть раньше текущей"),
+                message: "Дата заказа не может быть раньше текущей"
             });
         }
 
@@ -212,8 +212,8 @@ export default class DBAdapter {
             if (!order || order.length === 0) { // Исправлено: проверяем length
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Order not found"),
-                    message: "Order not found"
+                    error: new Error("Заказ не найден"),
+                    message: "Заказ не найден"
                 });
             }
             
@@ -228,8 +228,8 @@ export default class DBAdapter {
             console.error('Database error in changeOrderInfo:', err);
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Server error"),
-                message: err.message || "Database operation failed",
+                error: new Error("Ошибка сервера"),
+                message: err.message || "Ошибка операции с базой данных",
                 details: err.message
             });
         }
@@ -279,7 +279,7 @@ export default class DBAdapter {
             
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Failed to delete order"),
+                error: new Error("Не удалось удалить заказ"),
                 details: err.message
             });
         }
@@ -303,7 +303,7 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Order not found")
+                    error: new Error("Заказ не найден")
                 });
             }
             
@@ -319,7 +319,7 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Product not found")
+                    error: new Error("Товар не найден")
                 });
             }
             
@@ -328,7 +328,7 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Insufficient product quantity")
+                    error: new Error("Недостаточно товара на складе")
                 });
             }
 
@@ -361,16 +361,16 @@ export default class DBAdapter {
             console.error('Transaction error:', err);
             
             let errorType = DB_INTERNAL_ERROR;
-            let userMessage = "Database operation failed";
+            let userMessage = "Ошибка операции с базой данных";
             let retryable = false;
             
             if (err.code === 'ER_LOCK_WAIT_TIMEOUT' || err.errno === 1205) {
                 errorType = 'DB_CONFLICT';
-                userMessage = "System is busy. Please try again in a moment.";
+                userMessage = "Система занята. Попробуйте позже.";
                 retryable = true;
             } else if (err.code === 'ER_DUP_ENTRY') {
                 errorType = DB_USER_ERROR;
-                userMessage = "Item already exists in the order";
+                userMessage = "Позиция уже есть в заказе";
             }
             
             return Promise.reject({
@@ -384,10 +384,17 @@ export default class DBAdapter {
         }
     }
 
-    async updateOrderItem({ itemId, quantity }) {
+    async updateOrderItem({ itemId, quantity, productId }) {
         let connection;
         
         try {
+            if (!itemId || !Number.isFinite(quantity) || quantity <= 0) {
+                return Promise.reject({
+                    type: DB_USER_ERROR,
+                    error: new Error("Неверная позиция или количество")
+                });
+            }
+
             connection = await this.#pool.getConnection();
             await connection.beginTransaction();
             
@@ -402,10 +409,55 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Order item not found")
+                    error: new Error("Позиция заказа не найдена")
                 });
             }
 
+            const targetProductId = productId ?? itemRow.product_id;
+
+            if (targetProductId !== itemRow.product_id) {
+                const newProduct = await connection.query(
+                    'SELECT quantity FROM products WHERE id = ? FOR UPDATE',
+                    [targetProductId]
+                );
+                const newProductRow = newProduct?.[0];
+                if (!newProductRow) {
+                    await connection.rollback();
+                    connection.release();
+                    return Promise.reject({
+                        type: DB_USER_ERROR,
+                        error: new Error("Товар не найден")
+                    });
+                }
+                if (newProductRow.quantity < quantity) {
+                    await connection.rollback();
+                    connection.release();
+                    return Promise.reject({
+                        type: DB_USER_ERROR,
+                        error: new Error("Недостаточно товара на складе")
+                    });
+                }
+
+                await connection.query(
+                    'UPDATE products SET quantity = quantity + ? WHERE id = ?',
+                    [itemRow.quantity, itemRow.product_id]
+                );
+
+                await connection.query(
+                    'UPDATE products SET quantity = quantity - ? WHERE id = ?',
+                    [quantity, targetProductId]
+                );
+
+                await connection.query(
+                    'UPDATE order_items SET product_id = ?, quantity = ? WHERE id = ?',
+                    [targetProductId, quantity, itemId]
+                );
+
+                await connection.commit();
+                connection.release();
+                return;
+            }
+
             const diff = quantity - itemRow.quantity;
 
             if (diff > 0) {
@@ -420,7 +472,7 @@ export default class DBAdapter {
                     connection.release();
                     return Promise.reject({
                         type: DB_USER_ERROR,
-                        error: new Error("Insufficient product quantity")
+                        error: new Error("Недостаточно товара на складе")
                     });
                 }
                 
@@ -457,7 +509,7 @@ export default class DBAdapter {
             
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Failed to update order item"),
+                error: new Error("Не удалось обновить позицию заказа"),
                 details: err.message
             });
         }
@@ -481,7 +533,7 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Order item not found")
+                    error: new Error("Позиция заказа не найдена")
                 });
             }
 
@@ -512,7 +564,7 @@ export default class DBAdapter {
             
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Failed to delete order item"),
+                error: new Error("Не удалось удалить позицию заказа"),
                 details: err.message,
                 itemId: itemId
             });
@@ -537,12 +589,12 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Target order not found")
+                    error: new Error("Целевой заказ не найден")
                 });
             }
             
             const item = await connection.query(
-                'SELECT id, order_id FROM order_items WHERE id = ? FOR UPDATE', 
+                'SELECT id, order_id, product_id, quantity FROM order_items WHERE id = ? FOR UPDATE', 
                 [itemId]
             );
 
@@ -552,14 +604,38 @@ export default class DBAdapter {
                 connection.release();
                 return Promise.reject({
                     type: DB_USER_ERROR,
-                    error: new Error("Order item not found")
+                    error: new Error("Позиция заказа не найдена")
                 });
             }
 
+            if (itemRow.order_id === targetOrderId) {
+                await connection.rollback();
+                connection.release();
+                return;
+            }
+
+            const targetItem = await connection.query(
+                'SELECT id, quantity FROM order_items WHERE order_id = ? AND product_id = ? FOR UPDATE',
+                [targetOrderId, itemRow.product_id]
+            );
+
+            const targetItemRow = targetItem?.[0];
+
+            if (targetItemRow) {
+                await connection.query(
+                    'UPDATE order_items SET quantity = ? WHERE id = ?',
+                    [targetItemRow.quantity + itemRow.quantity, targetItemRow.id]
+                );
+                await connection.query(
+                    'DELETE FROM order_items WHERE id = ?',
+                    [itemId]
+                );
+            } else {
                 await connection.query(
                     'UPDATE order_items SET order_id = ? WHERE id = ?',
                     [targetOrderId, itemId]
                 );
+            }
 
             await connection.commit();
             connection.release();
@@ -576,7 +652,7 @@ export default class DBAdapter {
             
             return Promise.reject({
                 type: DB_INTERNAL_ERROR,
-                error: new Error("Failed to move order item"),
+                error: new Error("Не удалось перенести позицию заказа"),
                 details: err.message
             });
         }

server/server.js

@@ -1,4 +1,4 @@
-import express from "express";
+import express from "express";
 import dotenv from "dotenv"
 import { randomUUID } from "crypto";
 import DBAdapter, { getCurrentDate, setCurrentDate } from "./db/database.js";
@@ -24,7 +24,7 @@ app.use(express.json());
 app.use((req, res, next) => {
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
-    res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,DELETE');
+    res.setHeader('Access-Control-Allow-Methods', 'GET,POST,PUT,DELETE,OPTIONS');
     if (req.method === 'OPTIONS') {
         res.sendStatus(204);
         return;
@@ -175,7 +175,7 @@ app.post('/api/orders', async (req, res) => {
                 res.status(500).json({
                     timeStamp: new Date().toISOString(),
                     statusCode: 500,
-                    message: "Unknown error",
+                    message: "Неизвестная ошибка",
                     error: err.message
                 });        
         }
@@ -190,7 +190,7 @@ app.put('/api/orders/:id', async (req, res) => {
         return res.status(400).json({
             timeStamp: new Date().toISOString(),
             statusCode: 400,
-            error: "Customer name and order date are required"
+            error: "Имя клиента и дата заказа обязательны"
         });
     }
     
@@ -212,7 +212,7 @@ app.put('/api/orders/:id', async (req, res) => {
         
         const errorMessage = err.message || 
                            err.error?.message || 
-                           "Unknown error occurred";
+                           "Произошла неизвестная ошибка";
         
         switch(err.type) {
             case DB_INTERNAL_ERROR:
@@ -220,7 +220,7 @@ app.put('/api/orders/:id', async (req, res) => {
                     timeStamp: new Date().toISOString(),
                     statusCode: 500,
                     error: errorMessage,
-                    details: err.details || "Internal server error"
+                    details: err.details || "Внутренняя ошибка сервера"
                 });
                     
             case DB_USER_ERROR:
@@ -265,7 +265,7 @@ app.post('/api/orders/:orderId/items', async (req, res) => {
         return res.status(400).json({
             timeStamp: new Date().toISOString(),
             statusCode: 400,
-            error: "Invalid productId or quantity"
+            error: "Некорректный товар или количество"
         });
     }
     
@@ -290,21 +290,21 @@ app.post('/api/orders/:orderId/items', async (req, res) => {
             return res.status(400).json({
                 timeStamp: new Date().toISOString(),
                 statusCode: 400,
-                error: err.error?.message || "Invalid request",
+                    error: err.error?.message || "Некорректный запрос",
                 details: err.details
             });
         } else if (err.type === DB_INTERNAL_ERROR) {
             return res.status(500).json({
                 timeStamp: new Date().toISOString(),
                 statusCode: 500,
-                error: "Internal server error",
+                error: "Внутренняя ошибка сервера",
                 details: err.error?.message
             });
         } else {
             return res.status(500).json({
                 timeStamp: new Date().toISOString(),
                 statusCode: 500,
-                error: "Internal server error"
+                error: "Внутренняя ошибка сервера"
             });
         }
     }
@@ -312,24 +312,28 @@ app.post('/api/orders/:orderId/items', async (req, res) => {
 
 app.put('/api/orders/:orderId/items/:itemId', async (req, res) => {
     let itemId = req.params.itemId;
-    let quantity = req.body.quantity;
+    let { quantity, productId } = req.body;
+    quantity = Number.parseInt(quantity, 10);
     
     try {
         await adapter.updateOrderItem({
             itemId, 
+            productId,
             quantity
         });
         
         res.status(201).json({
             itemId, 
+            productId,
             quantity
         });
         
     } catch (err) {
-        res.json({
+        const statusCode = err.type === DB_USER_ERROR ? 400 : 500;
+        res.status(statusCode).json({
             timeStamp: new Date().toISOString(),
-            statusCode: 500,
-            error: err.message
+            statusCode,
+            error: err.error?.message || err.message
         });
     }
 });
@@ -343,14 +347,14 @@ app.delete('/api/orders/:orderId/items/:itemId', async (req, res) => {
             return res.status(500).json({
                 timeStamp: new Date().toISOString(),
                 statusCode: 500,
-                error: "Server error",
+                error: "Ошибка сервера",
                 details: err.error.message
             });
         } else {
             return res.status(500).json({
                 timeStamp: new Date().toISOString(),
                 statusCode: 500,
-                error: "Internal server error",
+                error: "Внутренняя ошибка сервера",
                 details: err.message
             });
         }
@@ -383,7 +387,7 @@ app.post('/api/order-items/:itemId/move', async (req, res) => {
 
 
 app.use((req, res) => {
-    res.status(404).json({ error: 'Invalid route' });
+res.status(404).json({ error: 'Неверный маршрут' });
 });
 
 const server = app.listen(appPort, async() => {