Set orderDate to orderDateInput

Move item to another order
Russian describtion of errors
2026-01-04 23:31:13 +03:00 · 2026-01-04 22:14:28 +03:00 · 2026-01-04 21:53:47 +03:00 · 2026-01-03 22:58:14 +03:00 · 2026-01-03 18:46:21 +01:00 · 2026-01-03 20:41:15 +03:00
15 changed files with 2754 additions and 1342 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+node_modules
+.git
+.gitignore
+.gitattributes
+README.md
--- a/DELIVER_MAN.slnx
+++ b/DELIVER_MAN.slnx
@@ -1,6 +0,0 @@
-<Solution>
-  <Project Path="DELIVER_MAN.esproj">
-    <Build />
-    <Deploy />
-  </Project>
-</Solution>
--- a/README.md
+++ b/README.md
@@ -1 +1,24 @@
 # DELIVER_MAN
+
+## 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:
+
+```bash
+docker compose up --build
+```
+
+Open the client at `http://localhost:8080`.
+
+Notes:
+- The API is proxied through the client container to the server at `/api`.
+- The MariaDB schema/data is auto-initialized from `docker/init.sql` on first run.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,60 @@
+services:
+  db:
+    image: mariadb:11.4
+    environment:
+      MARIADB_DATABASE: delivery
+      MARIADB_USER: app
+      MARIADB_PASSWORD: app
+      MARIADB_ROOT_PASSWORD: root
+    volumes:
+      - db_data:/var/lib/mysql
+      - ./docker/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    networks:
+      - backend
+    healthcheck:
+      test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-u", "root", "-proot"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  server:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.server
+    environment:
+      HOST: db
+      PORT: 3306
+      DATABASE: delivery
+      USER: app
+      PASSWORD: app
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - backend
+      - frontend
+    healthcheck:
+      test: ["CMD", "node", "-e", "fetch('http://localhost:3000/api/current-date').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  client:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.client
+    depends_on:
+      server:
+        condition: service_healthy
+    ports:
+      - "8080:80"
+    networks:
+      - frontend
+
+volumes:
+  db_data:
+
+networks:
+  backend:
+    internal: true
+  frontend:
--- a/docker/Dockerfile.client
+++ b/docker/Dockerfile.client
@@ -0,0 +1,4 @@
+FROM nginx:1.27-alpine
+
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY public /usr/share/nginx/html
--- a/docker/Dockerfile.server
+++ b/docker/Dockerfile.server
@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci --omit=dev
+
+COPY server ./server
+
+ENV NODE_ENV=production
+EXPOSE 3000
+
+CMD ["npm", "start"]
--- a/docker/init.sql
+++ b/docker/init.sql
@@ -0,0 +1,105 @@
+/*M!999999\- enable the sandbox mode */
+-- MariaDB dump 10.19-11.7.2-MariaDB, for Win64 (AMD64)
+--
+-- Host: localhost    Database: delivery
+-- ------------------------------------------------------
+-- Server version	12.1.2-MariaDB
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
+
+--
+-- Table structure for table `order_items`
+--
+
+DROP TABLE IF EXISTS `order_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `order_items` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `order_id` varchar(256) DEFAULT NULL,
+  `product_id` varchar(256) DEFAULT NULL,
+  `quantity` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `order_items_orders_FK` (`order_id`),
+  KEY `order_items_products_FK` (`product_id`),
+  CONSTRAINT `order_items_orders_FK` FOREIGN KEY (`order_id`) REFERENCES `orders` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `order_items_products_FK` FOREIGN KEY (`product_id`) REFERENCES `products` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `order_items`
+--
+
+LOCK TABLES `order_items` WRITE;
+/*!40000 ALTER TABLE `order_items` DISABLE KEYS */;
+/*!40000 ALTER TABLE `order_items` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `orders`
+--
+
+DROP TABLE IF EXISTS `orders`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `orders` (
+  `id` varchar(256) NOT NULL,
+  `customer_name` varchar(256) DEFAULT NULL,
+  `order_date` date DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `products`
+--
+
+DROP TABLE IF EXISTS `products`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `products` (
+  `id` varchar(256) NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `quantity` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `products`
+--
+
+LOCK TABLES `products` WRITE;
+/*!40000 ALTER TABLE `products` DISABLE KEYS */;
+INSERT INTO `products` VALUES
+('QH-1','Отвёртки',30),
+('QH-3','Гайки',13),
+('QW-1','Молоток',32),
+('QW-2','Гвозди',65);
+/*!40000 ALTER TABLE `products` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Dumping routines for database 'delivery'
+--
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
+
+-- Dump completed on 2026-01-03 18:57:33
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -0,0 +1,19 @@
+server {
+    listen 80;
+    server_name _;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    location /api/ {
+        proxy_pass http://server:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,28 +1,44 @@
 {
-  "name": "deliver_man",
+    "name": "deliver-man-server",
    "version": "1.0.0",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
-      "name": "deliver_man",
+            "name": "deliver-man-server",
            "version": "1.0.0",
-      "license": "ISC",
            "dependencies": {
-        "express": "^5.2.1"
+                "dotenv": "^17.2.3",
+                "express": "^4.22.1",
+                "mariadb": "^3.4.5"
            },
            "devDependencies": {
-        "nodemon": "^3.1.11"
+                "nodemon": "^3.0.1"
+            }
+        },
+        "node_modules/@types/geojson": {
+            "version": "7946.0.16",
+            "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+            "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "24.10.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.4.tgz",
+            "integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~7.16.0"
            }
        },
        "node_modules/accepts": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
-      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
+            "version": "1.3.8",
+            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
            "license": "MIT",
            "dependencies": {
-        "mime-types": "^3.0.0",
-        "negotiator": "^1.0.0"
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
            },
            "engines": {
                "node": ">= 0.6"
@@ -42,6 +58,12 @@
                "node": ">= 8"
            }
        },
+        "node_modules/array-flatten": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+            "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+            "license": "MIT"
+        },
        "node_modules/balanced-match": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -63,29 +85,44 @@
            }
        },
        "node_modules/body-parser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz",
-      "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==",
+            "version": "1.20.4",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
+            "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
            "license": "MIT",
            "dependencies": {
-        "bytes": "^3.1.2",
-        "content-type": "^1.0.5",
-        "debug": "^4.4.3",
-        "http-errors": "^2.0.0",
-        "iconv-lite": "^0.7.0",
-        "on-finished": "^2.4.1",
-        "qs": "^6.14.0",
-        "raw-body": "^3.0.1",
-        "type-is": "^2.0.1"
+                "bytes": "~3.1.2",
+                "content-type": "~1.0.5",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "~1.2.0",
+                "http-errors": "~2.0.1",
+                "iconv-lite": "~0.4.24",
+                "on-finished": "~2.4.1",
+                "qs": "~6.14.0",
+                "raw-body": "~2.5.3",
+                "type-is": "~1.6.18",
+                "unpipe": "~1.0.0"
            },
            "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
            }
        },
+        "node_modules/body-parser/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/body-parser/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
        "node_modules/brace-expansion": {
            "version": "1.1.12",
            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -181,16 +218,15 @@
            "license": "MIT"
        },
        "node_modules/content-disposition": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
-      "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
+            "version": "0.5.4",
+            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
            "license": "MIT",
-      "engines": {
-        "node": ">=18"
+            "dependencies": {
+                "safe-buffer": "5.2.1"
            },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+            "engines": {
+                "node": ">= 0.6"
            }
        },
        "node_modules/content-type": {
@@ -212,18 +248,16 @@
            }
        },
        "node_modules/cookie-signature": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.6.0"
-      }
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+            "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+            "license": "MIT"
        },
        "node_modules/debug": {
            "version": "4.4.3",
            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+            "dev": true,
            "license": "MIT",
            "dependencies": {
                "ms": "^2.1.3"
@@ -237,6 +271,15 @@
                }
            }
        },
+        "node_modules/denque": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+            "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
        "node_modules/depd": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -246,6 +289,28 @@
                "node": ">= 0.8"
            }
        },
+        "node_modules/destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/dotenv": {
+            "version": "17.2.3",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+            "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
+        },
        "node_modules/dunder-proto": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -321,48 +386,66 @@
            }
        },
        "node_modules/express": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
-      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
+            "version": "4.22.1",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
+            "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
            "license": "MIT",
            "dependencies": {
-        "accepts": "^2.0.0",
-        "body-parser": "^2.2.1",
-        "content-disposition": "^1.0.0",
-        "content-type": "^1.0.5",
-        "cookie": "^0.7.1",
-        "cookie-signature": "^1.2.1",
-        "debug": "^4.4.0",
-        "depd": "^2.0.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "finalhandler": "^2.1.0",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.0",
-        "merge-descriptors": "^2.0.0",
-        "mime-types": "^3.0.0",
-        "on-finished": "^2.4.1",
-        "once": "^1.4.0",
-        "parseurl": "^1.3.3",
-        "proxy-addr": "^2.0.7",
-        "qs": "^6.14.0",
-        "range-parser": "^1.2.1",
-        "router": "^2.2.0",
-        "send": "^1.1.0",
-        "serve-static": "^2.2.0",
-        "statuses": "^2.0.1",
-        "type-is": "^2.0.1",
-        "vary": "^1.1.2"
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "~1.20.3",
+                "content-disposition": "~0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "~0.7.1",
+                "cookie-signature": "~1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "~1.3.1",
+                "fresh": "~0.5.2",
+                "http-errors": "~2.0.0",
+                "merge-descriptors": "1.0.3",
+                "methods": "~1.1.2",
+                "on-finished": "~2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "~0.1.12",
+                "proxy-addr": "~2.0.7",
+                "qs": "~6.14.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "~0.19.0",
+                "serve-static": "~1.16.2",
+                "setprototypeof": "1.2.0",
+                "statuses": "~2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
            },
            "engines": {
-        "node": ">= 18"
+                "node": ">= 0.10.0"
            },
            "funding": {
                "type": "opencollective",
                "url": "https://opencollective.com/express"
            }
        },
+        "node_modules/express/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/express/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
        "node_modules/fill-range": {
            "version": "7.1.1",
            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -377,26 +460,38 @@
            }
        },
        "node_modules/finalhandler": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz",
-      "integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==",
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
+            "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
            "license": "MIT",
            "dependencies": {
-        "debug": "^4.4.0",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "on-finished": "^2.4.1",
-        "parseurl": "^1.3.3",
-        "statuses": "^2.0.1"
+                "debug": "2.6.9",
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "on-finished": "~2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "~2.0.2",
+                "unpipe": "~1.0.0"
            },
            "engines": {
-        "node": ">= 18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+                "node": ">= 0.8"
            }
        },
+        "node_modules/finalhandler/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/finalhandler/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
        "node_modules/forwarded": {
            "version": "0.2.0",
            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -407,12 +502,12 @@
            }
        },
        "node_modules/fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
-      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
            "license": "MIT",
            "engines": {
-        "node": ">= 0.8"
+                "node": ">= 0.6"
            }
        },
        "node_modules/fsevents": {
@@ -556,19 +651,15 @@
            }
        },
        "node_modules/iconv-lite": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz",
-      "integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==",
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
            "license": "MIT",
            "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+                "safer-buffer": ">= 2.1.2 < 3"
            },
            "engines": {
                "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
            }
        },
        "node_modules/ignore-by-default": {
@@ -639,11 +730,39 @@
                "node": ">=0.12.0"
            }
        },
-    "node_modules/is-promise": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
-      "license": "MIT"
+        "node_modules/lru-cache": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "license": "ISC"
+        },
+        "node_modules/mariadb": {
+            "version": "3.4.5",
+            "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.5.tgz",
+            "integrity": "sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==",
+            "license": "LGPL-2.1-or-later",
+            "dependencies": {
+                "@types/geojson": "^7946.0.16",
+                "@types/node": "^24.0.13",
+                "denque": "^2.1.0",
+                "iconv-lite": "^0.6.3",
+                "lru-cache": "^10.4.3"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/mariadb/node_modules/iconv-lite": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
        },
        "node_modules/math-intrinsics": {
            "version": "1.1.0",
@@ -655,49 +774,63 @@
            }
        },
        "node_modules/media-typer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
-      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
            "license": "MIT",
            "engines": {
-        "node": ">= 0.8"
+                "node": ">= 0.6"
            }
        },
        "node_modules/merge-descriptors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
-      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+            "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
            "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
            "funding": {
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
+        "node_modules/methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "license": "MIT",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
        "node_modules/mime-db": {
-      "version": "1.54.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
            }
        },
        "node_modules/mime-types": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz",
-      "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==",
+            "version": "2.1.35",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
            "license": "MIT",
            "dependencies": {
-        "mime-db": "^1.54.0"
+                "mime-db": "1.52.0"
            },
            "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+                "node": ">= 0.6"
            }
        },
        "node_modules/minimatch": {
@@ -720,9 +853,9 @@
            "license": "MIT"
        },
        "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
            "license": "MIT",
            "engines": {
                "node": ">= 0.6"
@@ -791,15 +924,6 @@
                "node": ">= 0.8"
            }
        },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
        "node_modules/parseurl": {
            "version": "1.3.3",
            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -810,14 +934,10 @@
            }
        },
        "node_modules/path-to-regexp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+            "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+            "license": "MIT"
        },
        "node_modules/picomatch": {
            "version": "2.3.1",
@@ -853,9 +973,9 @@
            "license": "MIT"
        },
        "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+            "version": "6.14.1",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
+            "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
            "license": "BSD-3-Clause",
            "dependencies": {
                "side-channel": "^1.1.0"
@@ -877,18 +997,18 @@
            }
        },
        "node_modules/raw-body": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz",
-      "integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==",
+            "version": "2.5.3",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
+            "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
            "license": "MIT",
            "dependencies": {
                "bytes": "~3.1.2",
                "http-errors": "~2.0.1",
-        "iconv-lite": "~0.7.0",
+                "iconv-lite": "~0.4.24",
                "unpipe": "~1.0.0"
            },
            "engines": {
-        "node": ">= 0.10"
+                "node": ">= 0.8"
            }
        },
        "node_modules/readdirp": {
@@ -904,21 +1024,25 @@
                "node": ">=8.10.0"
            }
        },
-    "node_modules/router": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
-      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.4.0",
-        "depd": "^2.0.0",
-        "is-promise": "^4.0.0",
-        "parseurl": "^1.3.3",
-        "path-to-regexp": "^8.0.0"
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
                },
-      "engines": {
-        "node": ">= 18"
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
                }
+            ],
+            "license": "MIT"
        },
        "node_modules/safer-buffer": {
            "version": "2.1.2",
@@ -940,48 +1064,57 @@
            }
        },
        "node_modules/send": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz",
-      "integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==",
+            "version": "0.19.2",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+            "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
            "license": "MIT",
            "dependencies": {
-        "debug": "^4.4.3",
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "etag": "^1.8.1",
-        "fresh": "^2.0.0",
-        "http-errors": "^2.0.1",
-        "mime-types": "^3.0.2",
-        "ms": "^2.1.3",
-        "on-finished": "^2.4.1",
-        "range-parser": "^1.2.1",
-        "statuses": "^2.0.2"
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "~0.5.2",
+                "http-errors": "~2.0.1",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "~2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "~2.0.2"
            },
            "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+                "node": ">= 0.8.0"
            }
        },
-    "node_modules/serve-static": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz",
-      "integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==",
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
            "license": "MIT",
            "dependencies": {
-        "encodeurl": "^2.0.0",
-        "escape-html": "^1.0.3",
-        "parseurl": "^1.3.3",
-        "send": "^1.2.0"
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "license": "MIT"
+        },
+        "node_modules/serve-static": {
+            "version": "1.16.3",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+            "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
+            "license": "MIT",
+            "dependencies": {
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "~0.19.1"
            },
            "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+                "node": ">= 0.8.0"
            }
        },
        "node_modules/setprototypeof": {
@@ -1130,14 +1263,13 @@
            }
        },
        "node_modules/type-is": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
-      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+            "version": "1.6.18",
+            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
            "license": "MIT",
            "dependencies": {
-        "content-type": "^1.0.5",
-        "media-typer": "^1.1.0",
-        "mime-types": "^3.0.0"
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
            },
            "engines": {
                "node": ">= 0.6"
@@ -1150,6 +1282,12 @@
            "dev": true,
            "license": "MIT"
        },
+        "node_modules/undici-types": {
+            "version": "7.16.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+            "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+            "license": "MIT"
+        },
        "node_modules/unpipe": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1159,6 +1297,15 @@
                "node": ">= 0.8"
            }
        },
+        "node_modules/utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
        "node_modules/vary": {
            "version": "1.1.2",
            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -1167,12 +1314,6 @@
            "engines": {
                "node": ">= 0.8"
            }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "license": "ISC"
        }
    }
 }
--- a/public/app.js
+++ b/public/app.js
@@ -0,0 +1,625 @@
+const notification = document.getElementById('notification');
+const currentDateEl = document.getElementById('current-date');
+const orderDateInput = document.getElementById('order-date');
+const customerNameInput = document.getElementById('customer-name');
+const orderForm = document.getElementById('order-form');
+const ordersContainer = document.getElementById('orders');
+const inventoryList = document.getElementById('inventory');
+const advanceButton = document.getElementById('advance-date');
+
+const API_BASE =
+    window.location.protocol === 'file:' ? 'http://localhost:3000' : window.location.origin;
+
+let products = [];
+let orders = [];
+let currentDate = '';
+
+function getLocalISODate() {
+    const now = new Date();
+    const offsetMs = now.getTimezoneOffset() * 60 * 1000;
+    return new Date(now.getTime() - offsetMs).toISOString().slice(0, 10);
+}
+
+class OrderCard {
+    constructor(order, allOrders, allProducts) {
+        this.order = order;
+        this.orders = allOrders;
+        this.products = allProducts;
+    }
+
+    build() {
+        const card = document.createElement('div');
+        card.className = 'card shadow-sm order-card';
+
+        const body = document.createElement('div');
+        body.className = 'card-body';
+
+        body.appendChild(this.buildHeader());
+        body.appendChild(this.buildItemsSection());
+
+        card.appendChild(body);
+        return card;
+    }
+
+    buildHeader() {
+        const header = document.createElement('div');
+        header.className = 'd-flex justify-content-between flex-wrap gap-2';
+
+        const info = document.createElement('div');
+        const name = document.createElement('h3');
+        name.className = 'h5 mb-1';
+        name.textContent = this.order.customer_name;
+
+        const idMeta = document.createElement('div');
+        idMeta.className = 'text-muted order-meta';
+        idMeta.textContent = `ID: ${this.order.id}`;
+
+        const dateMeta = document.createElement('div');
+        dateMeta.className = 'text-muted order-meta';
+        dateMeta.textContent = `Дата: ${this.order.order_date}`;
+
+        info.appendChild(name);
+        info.appendChild(idMeta);
+        info.appendChild(dateMeta);
+
+        const actions = document.createElement('div');
+        actions.className = 'd-flex gap-2 align-items-start';
+        actions.appendChild(this.buildButton('Изменить', 'btn-outline-secondary', {
+            action: 'edit-order',
+            id: this.order.id
+        }));
+        actions.appendChild(this.buildButton('Удалить', 'btn-outline-danger', {
+            action: 'delete-order',
+            id: this.order.id
+        }));
+
+        header.appendChild(info);
+        header.appendChild(actions);
+
+        return header;
+    }
+
+    buildItemsSection() {
+        const wrapper = document.createElement('div');
+        wrapper.className = 'mt-3';
+
+        wrapper.appendChild(this.buildItemsTable());
+        wrapper.appendChild(this.buildAddItemForm());
+
+        return wrapper;
+    }
+
+    buildItemsTable() {
+        const table = document.createElement('table');
+        table.className = 'table table-sm align-middle';
+
+        table.innerHTML = `
+      <thead>
+        <tr>
+          <th>ID</th>
+          <th>Товар</th>
+          <th>Количество</th>
+          <th class="text-end">Действия</th>
+        </tr>
+      </thead>
+    `;
+
+        const body = document.createElement('tbody');
+        this.order.items.forEach((item) => {
+            body.appendChild(this.buildItemRow(item));
+        });
+
+        table.appendChild(body);
+        return table;
+    }
+
+    buildItemRow(item) {
+        const row = document.createElement('tr');
+
+        const idCell = document.createElement('td');
+        idCell.className = 'text-muted small';
+        idCell.textContent = item.product_id ?? item.id;
+
+        const productCell = document.createElement('td');
+        const productSelect = this.buildProductSelect(item.product_id);
+        productSelect.classList.add('form-select-sm');
+        productSelect.dataset.action = 'item-product';
+        productSelect.dataset.itemId = item.id;
+        productSelect.setAttribute('aria-label', 'Товар');
+        productCell.appendChild(productSelect);
+
+        const quantityCell = document.createElement('td');
+        const quantityInput = document.createElement('input');
+        quantityInput.type = 'number';
+        quantityInput.min = '1';
+        quantityInput.className = 'form-control form-control-sm';
+        quantityInput.value = item.quantity;
+        quantityInput.dataset.action = 'item-quantity';
+        quantityInput.dataset.itemId = item.id;
+        quantityInput.setAttribute('aria-label', 'Количество');
+        quantityCell.appendChild(quantityInput);
+
+        const actionsCell = document.createElement('td');
+        actionsCell.className = 'text-end item-actions';
+        actionsCell.appendChild(this.buildItemActionButtons(item));
+        actionsCell.appendChild(this.buildMoveControls(item));
+
+        row.appendChild(idCell);
+        row.appendChild(productCell);
+        row.appendChild(quantityCell);
+        row.appendChild(actionsCell);
+
+        return row;
+    }
+
+    buildItemActionButtons(item) {
+        const wrapper = document.createElement('div');
+        wrapper.className = 'd-flex gap-2 justify-content-end';
+
+        wrapper.appendChild(
+            this.buildButton('Сохранить', 'btn-outline-primary', {
+                action: 'save-item',
+                orderId: this.order.id,
+                itemId: item.id
+            })
+        );
+        wrapper.appendChild(
+            this.buildButton('Удалить', 'btn-outline-danger', {
+                action: 'delete-item',
+                orderId: this.order.id,
+                itemId: item.id
+            })
+        );
+
+        return wrapper;
+    }
+
+    buildMoveControls(item) {
+        const wrapper = document.createElement('div');
+        wrapper.className = 'd-flex gap-2 justify-content-end mt-2';
+
+        const select = document.createElement('select');
+        select.className = 'form-select form-select-sm';
+        select.dataset.action = 'move-target';
+        select.dataset.itemId = item.id;
+        select.setAttribute('aria-label', 'Выбор заказа для перемещения');
+
+        const placeholder = document.createElement('option');
+        placeholder.value = '';
+        placeholder.textContent = 'Переместить в...';
+        select.appendChild(placeholder);
+
+        this.orders
+            .filter((otherOrder) => otherOrder.id !== this.order.id)
+            .forEach((otherOrder) => {
+                const option = document.createElement('option');
+                option.value = otherOrder.id;
+                option.textContent = otherOrder.customer_name;
+                select.appendChild(option);
+            });
+
+        wrapper.appendChild(select);
+        wrapper.appendChild(
+            this.buildButton('Перенести', 'btn-outline-secondary', {
+                action: 'move-item',
+                itemId: item.id
+            })
+        );
+
+        return wrapper;
+    }
+
+    buildAddItemForm() {
+        const form = document.createElement('form');
+        form.className = 'row g-2 align-items-end';
+        form.dataset.action = 'add-item';
+        form.dataset.orderId = this.order.id;
+
+        const productCol = document.createElement('div');
+        productCol.className = 'col-md-6';
+        const productLabel = document.createElement('label');
+        productLabel.className = 'form-label';
+        productLabel.textContent = 'Товар';
+        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;
+        productLabel.htmlFor = productSelectId;
+        productCol.appendChild(productLabel);
+        productCol.appendChild(productSelect);
+
+        const quantityCol = document.createElement('div');
+        quantityCol.className = 'col-md-3';
+        const quantityLabel = document.createElement('label');
+        quantityLabel.className = 'form-label';
+        quantityLabel.textContent = 'Кол-во';
+        const quantityInput = document.createElement('input');
+        const quantityInputId = `add-item-quantity-${this.order.id}`;
+        quantityInput.type = 'number';
+        quantityInput.min = '1';
+        quantityInput.className = 'form-control';
+        quantityInput.name = 'quantity';
+        quantityInput.id = quantityInputId;
+        quantityLabel.htmlFor = quantityInputId;
+        quantityInput.required = true;
+        quantityCol.appendChild(quantityLabel);
+        quantityCol.appendChild(quantityInput);
+
+        const actionCol = document.createElement('div');
+        actionCol.className = 'col-md-3';
+        const addButton = document.createElement('button');
+        addButton.type = 'submit';
+        addButton.className = 'btn btn-success w-100';
+        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);
+
+        return form;
+    }
+
+    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;
+            if (selectedId && product.id === selectedId) {
+                option.selected = true;
+            }
+            select.appendChild(option);
+        });
+        return select;
+    }
+
+    buildButton(label, style, data = {}) {
+        const button = document.createElement('button');
+        button.type = 'button';
+        button.className = `btn ${style} btn-sm`;
+        button.textContent = label;
+        Object.entries(data).forEach(([key, value]) => {
+            button.dataset[key] = value;
+        });
+        return button;
+    }
+}
+
+function showNotification(message, type = 'warning') {
+    notification.textContent = message;
+    notification.className = `alert alert-${type}`;
+    notification.classList.remove('d-none');
+
+    setTimeout(() => {
+        notification.classList.add('d-none');
+    }, 4000);
+}
+
+function resolveApiUrl(url) {
+    if (url.startsWith('http://') || url.startsWith('https://')) {
+        return url;
+    }
+    if (url.startsWith('/')) {
+        return `${API_BASE}${url}`;
+    }
+    return `${API_BASE}/${url}`;
+}
+
+async function fetchJson(url, options) {
+    const response = await fetch(resolveApiUrl(url), options);
+    if (!response.ok) {
+        const payload = await response.json().catch(() => ({
+            message: 'Ошибка запроса.'
+        }));
+        throw new Error(payload.error || payload.message || 'Error');
+    }
+    if (response.status === 204) {
+        return null;
+    }
+    return response.json();
+}
+
+function renderInventory() {
+    inventoryList.innerHTML = '';
+    products.forEach((product) => {
+        const item = document.createElement('li');
+        item.className = 'list-group-item d-flex justify-content-between align-items-center';
+        item.innerHTML = `
+      <span>${product.name}</span>
+      <span class="badge bg-secondary rounded-pill">${product.quantity}</span>
+    `;
+        inventoryList.appendChild(item);
+    });
+}
+
+function renderOrders() {
+    ordersContainer.innerHTML = '';
+    if (orders.length === 0) {
+        ordersContainer.innerHTML = '<p class="text-muted">Заказы отсутствуют.</p>';
+        return;
+    }
+
+    orders.forEach((order) => {
+        const card = new OrderCard(order, orders, products).build();
+        ordersContainer.appendChild(card);
+    });
+}
+
+function normalizeProducts(data) {
+    if (!Array.isArray(data)) {
+        return [];
+    }
+    return data.map((product) => ({
+        id: product.id ?? product.ID,
+        name: product.name ?? product.pr_name,
+        quantity: product.quantity ?? product.count
+    }));
+}
+
+function normalizeOrderItems(items) {
+    if (!Array.isArray(items)) {
+        return [];
+    }
+    return items.map((item, index) => ({
+        id: item.id ?? item.item_id ?? `${item.product_id ?? item.productId ?? 'item'}-${index}`,
+        product_id: item.product_id ?? item.productId ?? item.product,
+        product_name: item.product_name ?? item.name,
+        quantity: item.quantity,
+        price: item.price
+    }));
+}
+
+function normalizeOrders(data) {
+    if (!Array.isArray(data)) {
+        return [];
+    }
+    return data.map((order) => ({
+        id: order.id ?? order.ID,
+        customer_name: order.customer_name ?? order.customer,
+        order_date: order.order_date ?? order.date,
+        status: order.status,
+        total_amount: order.total_amount ?? order.total,
+        items: normalizeOrderItems(order.items)
+    }));
+}
+
+async function refreshData() {
+    const [currentDateData, productsData, ordersData] = await Promise.all([
+        fetchJson('/api/current-date'),
+        fetchJson('/api/products'),
+        fetchJson('/api/orders')
+    ]);
+    currentDate = currentDateData.currentDate;
+    products = normalizeProducts(productsData);
+    orders = normalizeOrders(ordersData);
+
+    currentDateEl.textContent = currentDate;
+    orderDateInput.min = currentDate;
+    orderDateInput.value = currentDate
+
+    renderInventory();
+    renderOrders();
+}
+
+function initializeApp() {
+    const requiredElements = [
+        notification,
+        currentDateEl,
+        orderDateInput,
+        customerNameInput,
+        orderForm,
+        ordersContainer,
+        inventoryList,
+        advanceButton
+    ];
+
+    if (requiredElements.some((element) => !element)) {
+        console.error('Missing required elements.');
+        return;
+    }
+
+    const initialDate = getLocalISODate();
+    currentDate = initialDate;
+    currentDateEl.textContent = initialDate;
+    orderDateInput.min = initialDate;
+    orderDateInput.value = initialDate;
+
+    orderForm.addEventListener('submit', async (event) => {
+        event.preventDefault();
+        try {
+            await fetchJson('/api/orders', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({
+                    customerName: customerNameInput.value.trim(),
+                    orderDate: orderDateInput.value
+                })
+            });
+            customerNameInput.value = '';
+            orderDateInput.value = currentDate;
+            await refreshData();
+        } catch (error) {
+            showNotification(error.message, 'warning');
+        }
+    });
+
+    advanceButton.addEventListener('click', async () => {
+        try {
+            await fetchJson('/api/current-date/advance', {
+                method: 'POST'
+            });
+            await refreshData();
+            showNotification('Дата переведена. Заказы за сегодня отправлены.', 'success');
+        } catch (error) {
+            showNotification(error.message, 'warning');
+        }
+    });
+
+    ordersContainer.addEventListener('submit', async (event) => {
+        if (event.target.matches('form[data-action="add-item"]')) {
+            event.preventDefault();
+            const orderId = event.target.dataset.orderId;
+            const productId = event.target.productId.value;
+            const quantity = Number.parseInt(event.target.quantity.value, 10);
+
+            try {
+                const response = await fetchJson(`/api/orders/${orderId}/items`, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify({
+                        productId,
+                        quantity
+                    })
+                });
+                const order = orders.find((entry) => entry.id === orderId);
+                const product = products.find((entry) => entry.id === productId);
+                if (order) {
+                    const newItem = normalizeOrderItems([{
+                        id: response?.itemId,
+                        product_id: productId,
+                        product_name: product?.name,
+                        quantity
+                    }])[0];
+                    order.items = [...order.items, newItem];
+                    renderOrders();
+                }
+                event.target.reset();
+                await refreshData();
+            } catch (error) {
+                showNotification(error.message, 'warning');
+            }
+        }
+    });
+
+    ordersContainer.addEventListener('click', async (event) => {
+        const {
+            action,
+            id,
+            itemId,
+            orderId
+        } = event.target.dataset;
+
+        try {
+            switch (action) {
+                case 'delete-order': {
+                    await fetchJson(`/api/orders/${id}`, {
+                        method: 'DELETE'
+                    });
+                    await refreshData();
+                    return;
+                }
+                case 'edit-order': {
+                    const newName = prompt('Введите новое ФИО заказчика', '');
+                    if (newName === null) {
+                        return;
+                    }
+                    const newDate = prompt('Введите дату заказа (YYYY-MM-DD)', currentDate);
+                    if (!newDate) {
+                        return;
+                    }
+                    Date
+                    await fetchJson(`/api/orders/${id}`, {
+                        method: 'PUT',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify({
+                            customerName: newName,
+                            orderDate: newDate
+                        })
+                    });
+                    await refreshData();
+                    return;
+                }
+                case 'save-item': {
+                    const quantityInput = ordersContainer.querySelector(
+                        `[data-action="item-quantity"][data-item-id="${itemId}"]`
+                    );
+                    const productSelect = ordersContainer.querySelector(
+                        `[data-action="item-product"][data-item-id="${itemId}"]`
+                    );
+
+                    try {
+                        await fetchJson(`/api/orders/${orderId}/items/${itemId}`, {
+                            method: 'PUT',
+                            headers: {
+                                'Content-Type': 'application/json'
+                            },
+                            body: JSON.stringify({
+                                productId: productSelect.value,
+                                quantity: Number.parseInt(quantityInput.value, 10)
+                            })
+                        });
+                        await refreshData();
+                        return;
+                    } catch (error) {
+                        showNotification(error.message, 'warning');
+                        await refreshData();
+                        return;
+                    }
+                }
+                case 'delete-item': {
+                    await fetchJson(`/api/orders/${orderId}/items/${itemId}`, {
+                        method: 'DELETE'
+                    });
+                    await refreshData();
+                    return;
+                }
+                case 'move-item': {
+                    const targetSelect = ordersContainer.querySelector(
+                        `[data-action="move-target"][data-item-id="${itemId}"]`
+                    );
+                    if (!targetSelect.value) {
+                        showNotification('Выберите заказ для перемещения.', 'warning');
+                        return;
+                    }
+                    await fetchJson(`/api/order-items/${itemId}/move`, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify({
+                            targetOrderId: targetSelect.value
+                        })
+                    });
+                    await refreshData();
+                    return;
+                }
+                default:
+                    return;
+            }
+        } catch (error) {
+            showNotification(error.message, 'warning');
+        }
+    });
+
+    refreshData().catch((error) => {
+        showNotification(error.message, 'warning');
+    });
+}
+
+initializeApp();
--- a/public/index.html
+++ b/public/index.html
@@ -1,24 +1,59 @@
 <!DOCTYPE html>
-
 <html lang="ru">
+
 <head>
-    <meta charset="utf-8" />
-    <title>Личный кабинет</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" 
-          rel="stylesheet" 
-          integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" 
-          crossorigin="anonymous"
-    />
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Личный кабинет склада — Заказы</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/styles.css" rel="stylesheet" />
+    <script src="./app.js" defer></script>
 </head>
+
 <body class="bg-light">
    <div class="container py-4">
        <div class="d-flex flex-wrap gap-3 align-items-center justify-content-between mb-4">
            <div>
                <h1 class="h3 mb-1">Заказы склада</h1>
-                <p class="text-muted mb-0">Текущая дата: <span id="current-date">{ empty }</span></p>
+                <p class="text-muted mb-0">Текущая дата: <span id="current-date">—</span></p>
+            </div>
+            <button id="advance-date" class="btn btn-outline-primary">Переключить дату +1</button>
+        </div>
+
+        <div id="notification" class="alert d-none" role="alert"></div>
+
+        <div class="row g-4">
+            <div class="col-lg-4">
+                <div class="card shadow-sm">
+                    <div class="card-body">
+                        <h2 class="h5">Создать заказ</h2>
+                        <form id="order-form" class="d-grid gap-2">
+                            <div>
+                                <label class="form-label" for="customer-name">ФИО заказчика</label>
+                                <input type="text" class="form-control" id="customer-name" required />
+                            </div>
+                            <div>
+                                <label class="form-label" for="order-date">Дата заказа</label>
+                                <input type="date" class="form-control" id="order-date" required />
+                            </div>
+                            <button type="submit" class="btn btn-primary">Добавить</button>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="card shadow-sm mt-4">
+                    <div class="card-body">
+                        <h2 class="h5">Остатки склада</h2>
+                        <ul id="inventory" class="list-group list-group-flush"></ul>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-lg-8">
+                <div id="orders" class="d-grid gap-3"></div>
            </div>
-            <button id="advance-date" class="btn btn-outline-primary">Следующий день</button>
        </div>
    </div>
 </body>
+
 </html>
--- a/public/styles.css
+++ b/public/styles.css
@@ -0,0 +1,15 @@
+body {
+  font-family: "Inter", "Segoe UI", sans-serif;
+}
+
+.order-card {
+  border-left: 4px solid #0d6efd;
+}
+
+.order-meta {
+  font-size: 0.9rem;
+}
+
+.item-actions {
+  min-width: 220px;
+}
--- a/server/db/database.js
+++ b/server/db/database.js
@@ -24,7 +24,7 @@ export default class DBAdapter {
    #dbName = 'N';
    #dbUserLogin = 'u';
    #dbUserPassword = 'p';
-    #dbClient = null;
+    #pool = null;

    constructor({
        dbHost,
@@ -38,40 +38,43 @@ export default class DBAdapter {
        this.#dbName = dbName;
        this.#dbUserLogin = dbUserLogin;
        this.#dbUserPassword = dbUserPassword;
-        this.#dbClient = new mdb.createPool({
+        this.#pool = mdb.createPool({
            host: this.#dbhost,
            port: this.#dbPort,
            database: this.#dbName,
            user: this.#dbUserLogin,
            password: this.#dbUserPassword,
-            dateStrings: true
+            dateStrings: true,
+            acquireTimeout: 10000,
        });
    }

+    async #getConnection() {
+        return await this.#pool.getConnection();
+    }
+    
    async connect() {
        try {
-            // Проверяем подключение, выполняя простой запрос
-            const conn = await this.#dbClient.getConnection();
+            const conn = await this.#pool.getConnection();
            console.log("✅ Database connection test successful");
            conn.release();
        } catch (err) {
            console.error("❌ Database connection failed:", err.message);
-            // Пробрасываем ошибку дальше
            return Promise.reject();
        }
    }

    async disconnect() {
-        await this.#dbClient.end();
+        await this.#pool.end();
        console.log("DISCONNECT");
    }

    async stock(){
        try {
-            const products = await this.#dbClient.query('SELECT id FROM products');
+            const products = await this.#pool.query('SELECT id FROM products');
            for (const product of products) {
                const increment = Random_Increase();
-                await this.#dbClient.query('UPDATE products SET quantity = quantity + ? WHERE id = ?', [
+                await this.#pool.query('UPDATE products SET quantity = quantity + ? WHERE id = ?', [
                    increment,
                    product.id
                ]);
@@ -86,8 +89,7 @@ export default class DBAdapter {

    async getProducts() {
        try {
-            const products = await this.#dbClient.query('SELECT * FROM products ORDER BY name');
-            console.log("All products:", products);
+            const products = await this.#pool.query('SELECT * FROM products ORDER BY name');
            return products;
        } catch(err){
            console.log(`WHOOPS`);
@@ -97,14 +99,12 @@ export default class DBAdapter {

    async getOrders() {
        try {
-            const raw_orders = await this.#dbClient.query('SELECT * FROM orders ORDER BY order_date ASC');
-            console.log("All orders:", raw_orders);
+            const raw_orders = await this.#pool.query('SELECT * FROM orders ORDER BY order_date ASC');
            
-            const items = await this.#dbClient.query(
+            const items = await this.#pool.query(
                `SELECT order_items.*, products.name AS product_name FROM order_items
                JOIN products ON order_items.product_id = products.id`
            );
-            console.log("All order items:", items);
            
            const groupedItems = {};
            if (items && items.length > 0) {
@@ -132,34 +132,34 @@ export default class DBAdapter {
    }

    async addOrder({ id, customer_name, orderDate} ){
-        if (!customer_name || !orderDate){
+        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 {
-            await this.#dbClient.query('INSERT INTO orders (id, customer_name, order_date) VALUES (?, ?, ?)',
+            await this.#pool.query('INSERT INTO orders (id, customer_name, order_date) VALUES (?, ?, ?)',
                [id, customer_name, orderDate]
            );
        } catch(err){
            return Promise.reject({
                type: DB_INTERNAL_ERROR,
-                error: new Error("Server error")
+                error: new Error("Ошибка сервера")
            });
        }
    }

    async getOrdersByDate(date){
        try {
-            const order_ids = await this.#dbClient.query('SELECT id FROM orders WHERE order_date = ?', [date]);
+            const order_ids = await this.#pool.query('SELECT id FROM orders WHERE order_date = ?', [date]);
            return order_ids;
        } catch(err){
            return Promise.reject();
@@ -175,7 +175,7 @@ export default class DBAdapter {
        try {
            const placeholders = orderIds.map(() => '?').join(',');
            
-            const result = await this.#dbClient.query(
+            const result = await this.#pool.query(
                `DELETE FROM orders WHERE id IN (${placeholders})`,
                orderIds
            );
@@ -189,10 +189,11 @@ export default class DBAdapter {
    }

    async changeOrderInfo({ id, customer_name, orderDate }) {
-        if (!id) {
+        if (!id || !customer_name || !orderDate) {
            return Promise.reject({
                type: DB_USER_ERROR,
-                error: new Error("Order ID is required")
+                error: new Error("Нужен ID заказа, имя и дата"),
+                message: "Нужен ID заказа, имя и дата" // Добавляем message напрямую
            });
        }

@@ -200,202 +201,460 @@ 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")
+                error: new Error("Дата заказа не может быть раньше текущей"),
+                message: "Дата заказа не может быть раньше текущей"
            });
        }

        try {
-            const order = await this.#dbClient.query('SELECT * FROM orders WHERE id = ?', [id]);
+            const order = await this.#pool.query('SELECT * FROM orders WHERE id = ?', [id]);

-            if (!order){
+            if (!order || order.length === 0) { // Исправлено: проверяем length
                return Promise.reject({
                    type: DB_USER_ERROR,
-                    error: new Error("Order not found")
+                    error: new Error("Заказ не найден"),
+                    message: "Заказ не найден"
                });
            }
            
            const updatedName = customer_name;
            const updatedDate = orderDate;

-            await this.#dbClient.query('UPDATE orders SET customer_name = ?, order_date = ? WHERE id = ?',
+            await this.#pool.query('UPDATE orders SET customer_name = ?, order_date = ? WHERE id = ?',
                [updatedName, updatedDate, id]
            );

        } catch(err) {
+            console.error('Database error in changeOrderInfo:', err);
            return Promise.reject({
                type: DB_INTERNAL_ERROR,
-                error: new Error("Server error")
+                error: new Error("Ошибка сервера"),
+                message: err.message || "Ошибка операции с базой данных",
+                details: err.message
            });
        }
    }

    async deleteOrderById(order_id) {
+        let connection;
+        
        try {
-            const orderItems = await this.#dbClient.query(
+            connection = await this.#pool.getConnection();
+            await connection.beginTransaction();
+            
+            const orderItems = await connection.query(
                `SELECT product_id, quantity FROM order_items WHERE order_id = ?`,
                [order_id]
            );

            for (const item of orderItems) {
-                await this.#dbClient.query('UPDATE products SET quantity = quantity + ? WHERE id = ?', 
+                await connection.query(
+                    'UPDATE products SET quantity = quantity + ? WHERE id = ?', 
                    [item.quantity, item.product_id]
                );
            }
-            await this.#dbClient.query(
+            
+            await connection.query(
+                `DELETE FROM order_items WHERE order_id = ?`,
+                [order_id]
+            );
+            
+            await connection.query(
                `DELETE FROM orders WHERE id = ?`,
                [order_id]
            );
+
+            await connection.commit();
+            connection.release();
+            
        } catch (err) {
+            if (connection) {
+                try {
+                    await connection.rollback();
+                } catch (rollbackErr) {
+                    console.error('Rollback error:', rollbackErr.message);
+                }
+                connection.release();
+            }
+            
            return Promise.reject({
                type: DB_INTERNAL_ERROR,
-                error: new Error("Server error")
+                error: new Error("Не удалось удалить заказ"),
+                details: err.message
            });
        }
    }

    async addOrderItem({ orderId, productId, quantity }) {
-        await this.#dbClient.query('BEGIN');
+        let connection;
+        
        try {
-            const product = await this.#dbClient.query(
-                'SELECT quantity FROM products WHERE id = ?', [productId]
+            connection = await this.#pool.getConnection();
+            
+            await connection.beginTransaction();
+            
+            const orderCheck = await connection.query(
+                'SELECT id FROM orders WHERE id = ?', 
+                [orderId]
            );
            
-            const productRow = product?.[0];
-            if (!productRow || productRow.quantity < quantity){
+            if (!orderCheck || orderCheck.length === 0) {
+                await connection.rollback();
+                connection.release();
                return Promise.reject({
                    type: DB_USER_ERROR,
-                    error: new Error("Insufficient product quantity")
+                    error: new Error("Заказ не найден")
                });
            }
            
-            const result = await this.#dbClient.query(
-                'INSERT INTO order_items (order_id, product_id, quantity) VALUES (?, ?, ?)',
-                [orderId, productId, quantity]
+            const product = await connection.query(
+                'SELECT id, quantity FROM products WHERE id = ? FOR UPDATE', 
+                [productId]
            );

-            await this.#dbClient.query(
+            const productRow = product?.[0];
+            
+            if (!productRow) {
+                await connection.rollback();
+                connection.release();
+                return Promise.reject({
+                    type: DB_USER_ERROR,
+                    error: new Error("Товар не найден")
+                });
+            }
+            
+            if (productRow.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 = ?',
                [quantity, productId]
            );

-            await this.#dbClient.query('COMMIT');
+            const result = await connection.query(
+                'INSERT INTO order_items (order_id, product_id, quantity) VALUES (?, ?, ?)',
+                [orderId, productId, quantity]
+            );
+
+            await connection.commit();
+            
+            connection.release();
+            
+            return result.insertId;
+            
        } catch (err) {
-            await this.#dbClient.query('ROLLBACK');
-            return Promise.reject();
+            if (connection) {
+                try {
+                    await connection.rollback();
+                } catch (rollbackErr) {
+                    console.error('Rollback error:', rollbackErr.message);
+                }
+                connection.release();
+            }
+            
+            console.error('Transaction error:', err);
+            
+            let errorType = DB_INTERNAL_ERROR;
+            let userMessage = "Ошибка операции с базой данных";
+            let retryable = false;
+            
+            if (err.code === 'ER_LOCK_WAIT_TIMEOUT' || err.errno === 1205) {
+                errorType = 'DB_CONFLICT';
+                userMessage = "Система занята. Попробуйте позже.";
+                retryable = true;
+            } else if (err.code === 'ER_DUP_ENTRY') {
+                errorType = DB_USER_ERROR;
+                userMessage = "Позиция уже есть в заказе";
+            }
+            
+            return Promise.reject({
+                type: errorType,
+                error: new Error(userMessage),
+                details: err.message,
+                code: err.code,
+                retryable: retryable,
+                originalError: err
+            });
        }
    }

-    async updateOrderItem({ itemId, quantity }){
-        await this.#dbClient.query('BEGIN');
+    async updateOrderItem({ itemId, quantity, productId }) {
+        let connection;
+        
        try {
-            const item = await this.#dbClient.query(
-                'SELECT product_id, quantity FROM order_items WHERE id = ?', [itemId]
+            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();
+            
+            const item = await connection.query(
+                'SELECT product_id, quantity FROM order_items WHERE id = ? FOR UPDATE', 
+                [itemId]
            );

            const itemRow = item?.[0];
            if (!itemRow) {
+                await connection.rollback();
+                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) {
-                const product = await this.#dbClient.query(
-                    'SELECT quantity FROM products WHERE id = ?', [itemRow.product_id]
+                const product = await connection.query(
+                    'SELECT quantity FROM products WHERE id = ? FOR UPDATE', 
+                    [itemRow.product_id]
                );

                const productRow = product?.[0];
                if (!productRow || productRow.quantity < diff) {
+                    await connection.rollback();
+                    connection.release();
                    return Promise.reject({
                        type: DB_USER_ERROR,
-                        error: new Error("Insufficient product quantity")
+                        error: new Error("Недостаточно товара на складе")
                    });
                }
                
-                await this.#dbClient.query(
+                await connection.query(
                    'UPDATE products SET quantity = quantity - ? WHERE id = ?',
                    [diff, itemRow.product_id]
                );
            }

            if (diff < 0) {
-                await this.#dbClient.query(
+                await connection.query(
                    'UPDATE products SET quantity = quantity + ? WHERE id = ?',
                    [-diff, itemRow.product_id]
                );                
            }

-            await this.#dbClient.query(
+            await connection.query(
                'UPDATE order_items SET quantity = ? WHERE id = ?',
                [quantity, itemId]
            );

-            await this.#dbClient.query('COMMIT');
+            await connection.commit();
+            connection.release();
+            
        } catch (err) {
-            await this.#dbClient.query('ROLLBACK');
-            return Promise.reject();
+            if (connection) {
+                try {
+                    await connection.rollback();
+                } catch (rollbackErr) {
+                    console.error('Rollback error:', rollbackErr.message);
+                }
+                connection.release();
+            }
+            
+            return Promise.reject({
+                type: DB_INTERNAL_ERROR,
+                error: new Error("Не удалось обновить позицию заказа"),
+                details: err.message
+            });
        }
    }

    async deleteOrderItem(itemId) {
-        await this.#dbClient.query('BEGIN');
+        let connection;
+        
        try {
-            const item = await this.#dbClient.query(
-                'SELECT product_id, quantity FROM order_items WHERE id = ?', [itemId]
+            connection = await this.#pool.getConnection();
+            await connection.beginTransaction();
+            
+            const item = await connection.query(
+                'SELECT product_id, quantity FROM order_items WHERE id = ? FOR UPDATE', 
+                [itemId]
            );

            const itemRow = item?.[0];
            if (!itemRow) {
+                await connection.rollback();
+                connection.release();
                return Promise.reject({
                    type: DB_USER_ERROR,
-                    error: new Error("Order item not found")
+                    error: new Error("Позиция заказа не найдена")
                });
            }

-            await this.#dbClient.query(
+            await connection.query(
                'UPDATE products SET quantity = quantity + ? WHERE id = ?',
                [itemRow.quantity, itemRow.product_id]
            );

-            await this.#dbClient.query(
+            await connection.query(
                'DELETE FROM order_items WHERE id = ?',
                [itemId]
            );

-            await this.#dbClient.query('COMMIT');
+            await connection.commit();
+            connection.release();
+            
        } catch (err) {
-            await this.#dbClient.query('ROLLBACK');
-            return Promise.reject();
+            if (connection) {
+                try {
+                    await connection.rollback();
+                } catch (rollbackErr) {
+                    console.error('Rollback error:', rollbackErr.message);
+                }
+                connection.release();
+            }
+            
+            console.error('Delete order item error:', err);
+            
+            return Promise.reject({
+                type: DB_INTERNAL_ERROR,
+                error: new Error("Не удалось удалить позицию заказа"),
+                details: err.message,
+                itemId: itemId
+            });
        }
    }

    async moveOrderItem({ itemId, targetOrderId }) {
-        await this.#dbClient.query('BEGIN');
+        let connection;
+        
        try {
-            const item = await this.#dbClient.query(
-                'SELECT id, order_id FROM order_items WHERE id = ?', [itemId]
+            connection = await this.#pool.getConnection();
+            await connection.beginTransaction();
+            
+            // Проверяем существование целевого заказа
+            const targetOrderCheck = await connection.query(
+                'SELECT id FROM orders WHERE id = ?', 
+                [targetOrderId]
+            );
+            
+            if (!targetOrderCheck || targetOrderCheck.length === 0) {
+                await connection.rollback();
+                connection.release();
+                return Promise.reject({
+                    type: DB_USER_ERROR,
+                    error: new Error("Целевой заказ не найден")
+                });
+            }
+            
+            const item = await connection.query(
+                'SELECT id, order_id, product_id, quantity FROM order_items WHERE id = ? FOR UPDATE', 
+                [itemId]
            );

            const itemRow = item?.[0];
            if (!itemRow) {
+                await connection.rollback();
+                connection.release();
                return Promise.reject({
                    type: DB_USER_ERROR,
-                    error: new Error("Order item not found")
+                    error: new Error("Позиция заказа не найдена")
                });
            }

-            await this.#dbClient.query(
+            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();
            
-            await this.#dbClient.query('COMMIT');
        } catch (err) {
-            await this.#dbClient.query('ROLLBACK');
-            return Promise.reject();
+            if (connection) {
+                try {
+                    await connection.rollback();
+                } catch (rollbackErr) {
+                    console.error('Rollback error:', rollbackErr.message);
+                }
+                connection.release();
+            }
+            
+            return Promise.reject({
+                type: DB_INTERNAL_ERROR,
+                error: new Error("Не удалось перенести позицию заказа"),
+                details: err.message
+            });
        }
    }
 }
--- a/server/docker.env
+++ b/server/docker.env
@@ -0,0 +1,5 @@
+HOST="db"
+PORT=3306
+DATABASE="delivery"
+USER="app"
+PASSWORD="app"
--- a/server/server.js
+++ b/server/server.js
@@ -1,11 +1,12 @@
-import express from "express";
+import express from "express";
 import dotenv from "dotenv"
 import { randomUUID } from "crypto";
 import DBAdapter, { getCurrentDate, setCurrentDate } from "./db/database.js";
 import { DB_INTERNAL_ERROR, DB_USER_ERROR } from "./db/database.js";

+// Switch to .env for test in local machine
 dotenv.config({
-    path: './server/.env'
+    path: './server/docker.env'
 });

 const {
@@ -20,6 +21,16 @@ const appPort = 3000;

 const app = express();
 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,OPTIONS');
+    if (req.method === 'OPTIONS') {
+        res.sendStatus(204);
+        return;
+    }
+    next();
+});

 const adapter = new DBAdapter({
    dbHost: HOST,
@@ -40,6 +51,29 @@ app.get('/api/current-date', async (req, res) => {
    res.json({ currentDate });
 });

+app.post('/api/current-date/advance', async (req, res) => {
+    let currentDate = getCurrentDate();
+    try {
+        const raw_ids = await adapter.getOrdersByDate(currentDate);
+        if (raw_ids && raw_ids.length > 0) {
+            const ids = raw_ids.map(item => item.id);
+            await adapter.clearOrders(ids);
+        }
+        let nextDate = AddDays(currentDate, 1);
+        await adapter.stock();
+        await setCurrentDate(nextDate);
+        res.json({ currentDate: nextDate });
+    } catch (err){
+        res.statusCode = 500;
+        res.message = "WHOOPS";
+        res.json({
+            timeStamp: new Date().toISOString(),
+            statusCode: res.statusCode,
+            error : `${err}`
+        })
+    }
+});
+
 app.get('/api/products', async (req, res) => {
    try {
        const db_products = await adapter.getProducts();
@@ -65,29 +99,6 @@ app.get('/api/products', async(req, res) => {
    }
 });

-app.post('/api/current-date/advance', async (req, res) => {
-    let currentDate = getCurrentDate();
-    try {
-        const raw_ids = await adapter.getOrdersByDate(currentDate);
-        if (raw_ids && raw_ids.length > 0) {
-            const ids = raw_ids.map(item => item.id);
-            await adapter.clearOrders(ids);
-        }
-        let nextDate = AddDays(currentDate, 1);
-        await adapter.stock();
-        await setCurrentDate(nextDate);
-        res.json({ currentDate: nextDate });
-    } catch (err){
-        res.statusCode = 500;
-        res.message = "WHOOPS";
-        res.json({
-            timeStamp: new Date().toISOString(),
-            statusCode: res.statusCode,
-            error : `${err}`
-        })
-    }
-});
-
 app.get('/api/orders', async (req, res) => {
    try {
        const db_orders = await adapter.getOrders();
@@ -100,6 +111,7 @@ app.get('/api/orders', async(req, res) => {
                status: status,
                total: total_amount,
                items: items ? items.map(item => ({
+                    id: item.id,
                    product_id: item.product_id,
                    product_name: item.product_name || item.name,
                    quantity: item.quantity,
@@ -163,13 +175,71 @@ app.post('/api/orders', async (req, res) => {
                res.status(500).json({
                    timeStamp: new Date().toISOString(),
                    statusCode: 500,
-                    message: "Unknown error",
+                    message: "Неизвестная ошибка",
                    error: err.message
                });        
        }
    }
 });

+app.put('/api/orders/:id', async (req, res) => {
+    const { customerName, orderDate } = req.body;
+    const orderId = req.params.id;
+    
+    if (!customerName || !orderDate) {
+        return res.status(400).json({
+            timeStamp: new Date().toISOString(),
+            statusCode: 400,
+            error: "Имя клиента и дата заказа обязательны"
+        });
+    }
+    
+    try {
+        await adapter.changeOrderInfo({
+            id: orderId, 
+            customer_name: customerName,
+            orderDate
+        });
+        
+        return res.json({ 
+            id: orderId, 
+            customer_name: customerName, 
+            order_date: orderDate 
+        });
+        
+    } catch(err) {
+        console.error('Error updating order:', err);
+        
+        const errorMessage = err.message || 
+                           err.error?.message || 
+                           "Произошла неизвестная ошибка";
+        
+        switch(err.type) {
+            case DB_INTERNAL_ERROR:
+                return res.status(500).json({
+                    timeStamp: new Date().toISOString(),
+                    statusCode: 500,
+                    error: errorMessage,
+                    details: err.details || "Внутренняя ошибка сервера"
+                });
+                    
+            case DB_USER_ERROR:
+                return res.status(400).json({
+                    timeStamp: new Date().toISOString(),
+                    statusCode: 400,
+                    error: errorMessage
+                });
+                    
+            default:
+                return res.status(500).json({
+                    timeStamp: new Date().toISOString(),
+                    statusCode: 500,
+                    error: errorMessage
+                });        
+        }
+    }
+});
+
 app.delete('/api/orders/:id', async (req, res) => {
    try {
        await adapter.deleteOrderById(req.params.id);
@@ -191,48 +261,79 @@ app.post('/api/orders/:orderId/items', async (req, res) => {
    let orderId = req.params.orderId;
    let { productId, quantity } = req.body;
    
+    if (!productId || !quantity || quantity <= 0) {
+        return res.status(400).json({
+            timeStamp: new Date().toISOString(),
+            statusCode: 400,
+            error: "Некорректный товар или количество"
+        });
+    }
+    
    try {
-        await adapter.addOrderItem({
+        const itemId = await adapter.addOrderItem({
            orderId, 
            productId,
            quantity
        });
        
-        res.status(201).json({
+        return res.status(201).json({
+            itemId: itemId.toString(),
            orderId, 
            productId,
            quantity
        });
        
    } catch (err) {
-        // TODO
-        res.status(500).json({
+        console.error('Error adding order item:', err);
+        
+        if (err.type === DB_USER_ERROR) {
+            return res.status(400).json({
+                timeStamp: new Date().toISOString(),
+                statusCode: 400,
+                    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: "Внутренняя ошибка сервера",
+                details: err.error?.message
            });
+        } else {
+            return res.status(500).json({
+                timeStamp: new Date().toISOString(),
+                statusCode: 500,
+                error: "Внутренняя ошибка сервера"
+            });
+        }
    }
 });

 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) {
-        // TODO
-        res.status(500).json({
+        const statusCode = err.type === DB_USER_ERROR ? 400 : 500;
+        res.status(statusCode).json({
            timeStamp: new Date().toISOString(),
-            statusCode: 500,
+            statusCode,
+            error: err.error?.message || err.message
        });
    }
 });
@@ -240,17 +341,25 @@ app.put('/api/orders/:orderId/items/:itemId', async (req, res) => {
 app.delete('/api/orders/:orderId/items/:itemId', async (req, res) => {
    try {
        await adapter.deleteOrderItem(req.params.itemId);
-        res.status(204).end();
+        return res.status(204).end(); 
    } catch (err) {
-        res.statusCode = 500;
-        res.message = "WHOOPS";
-        res.json({
+        if (err.type === DB_INTERNAL_ERROR) {
+            return res.status(500).json({
                timeStamp: new Date().toISOString(),
                statusCode: 500,
-            error: `${err}`
+                error: "Ошибка сервера",
+                details: err.error.message
+            });
+        } else {
+            return res.status(500).json({
+                timeStamp: new Date().toISOString(),
+                statusCode: 500,
+                error: "Внутренняя ошибка сервера",
+                details: err.message
            });
        }
-})
+    }
+});

 app.post('/api/order-items/:itemId/move', async (req, res) => {
    let itemId = req.params.itemId;
@@ -278,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() => {
Author	SHA1	Message	Date
ParkSuMin	5d066c96c9	Set orderDate to orderDateInput	2026-01-04 23:31:13 +03:00
ParkSuMin	91f18a6a9a	Move item to another order	2026-01-04 22:14:28 +03:00
ParkSuMin	74e7dc8fd5	Russian describtion of errors	2026-01-04 21:53:47 +03:00
ParkSuMin	1f542c65ab	Update README.md	2026-01-03 22:58:14 +03:00
ParkSuMin	18999515b2	Merge pull request 'Docker' (#3 ) from Docker into master Reviewed-on: #3	2026-01-03 18:46:21 +01:00
ParkSuMin	23c67c9e6e	Fix button logic	2026-01-03 20:41:15 +03:00
ParkSuMin	75df8970fd	Move client and server dockerfile to special path	2026-01-03 19:54:48 +03:00
ParkSuMin	8b0fa219aa	Update README.md	2026-01-03 19:50:42 +03:00
ParkSuMin	22b592e3ef	Remove slnx from project	2026-01-03 19:50:34 +03:00
ParkSuMin	151c98e994	Server	2026-01-03 19:47:01 +03:00
ParkSuMin	8c9ea53964	Nginx	2026-01-03 19:46:45 +03:00
ParkSuMin	c6c3cf2227	env file for Docker	2026-01-03 19:44:35 +03:00
ParkSuMin	ec2531cacb	Initial sql for MariaDB	2026-01-03 19:44:22 +03:00
ParkSuMin	fab2dd6ac9	Merge pull request 'Client' (#2 ) from Client into master Reviewed-on: #2	2026-01-03 16:50:30 +01:00
ParkSuMin	7b0a6c9f37	Merge branch 'master' into Client	2026-01-03 16:50:19 +01:00
ParkSuMin	94b0216568	Merge branch 'master' of ssh://git.tjoyspotifylastfm.ru:10022/ParkSuMin/DELIVER_MAN	2026-01-03 18:36:43 +03:00
ParkSuMin	62ecf92ce7	Update package-lock.json	2026-01-03 18:36:37 +03:00
ParkSuMin	f3d834574b	Beautify HTML	2026-01-03 18:34:47 +03:00
ParkSuMin	08ddf65ec1	Switch-construction in click	2026-01-03 18:33:53 +03:00
ParkSuMin	cd1f3a1e87	Beautify	2026-01-03 18:22:36 +03:00
ParkSuMin	25a92e4b98	Switch ID	2026-01-03 18:21:09 +03:00
ParkSuMin	78ddbb4601	Merge pull request 'API' (#1 ) from API into master Reviewed-on: #1	2026-01-03 16:18:52 +01:00
ParkSuMin	13fe841e54	Database	2026-01-03 18:17:29 +03:00
ParkSuMin	58b88c05a7	CORS problem resolve	2026-01-03 18:16:18 +03:00
ParkSuMin	85d1a9f046	API check	2026-01-03 18:15:52 +03:00
ParkSuMin	363798ca44	Ready index.html	2026-01-03 18:11:02 +03:00