ParkSuMin/DELIVER_MAN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ParkSuMin:f3d834574b86bcaf638b88464a3dfbffefa8fb82
Branches Tags
ParkSuMin:master ParkSuMin:API
...
compare: ParkSuMin:7b0a6c9f379f1002332852bf6438dbb15db5f4f5
Branches Tags
ParkSuMin:master ParkSuMin:API

7 Commits
f3d834574b ... 7b0a6c9f37

Author SHA1 Message Date
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
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
3 changed files with 1738 additions and 1310 deletions
Expand all files Collapse all files

565
package-lock.json generated
View File

@@ -1,28 +1,44 @@
{ {
"name": "deliver_man", "name": "deliver-man-server",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "deliver_man", "name": "deliver-man-server",
"version": "1.0.0", "version": "1.0.0",
"license": "ISC",
"dependencies": { "dependencies": {
"express": "^5.2.1" "dotenv": "^17.2.3",
"express": "^4.22.1",
"mariadb": "^3.4.5"
}, },
"devDependencies": { "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": { "node_modules/accepts": {
"version": "2.0.0", "version": "1.3.8",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
"integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"mime-types": "^3.0.0", "mime-types": "~2.1.34",
"negotiator": "^1.0.0" "negotiator": "0.6.3"
}, },
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
@@ -42,6 +58,12 @@
"node": ">= 8" "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": { "node_modules/balanced-match": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -63,29 +85,44 @@
} }
}, },
"node_modules/body-parser": { "node_modules/body-parser": {
"version": "2.2.1", "version": "1.20.4",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
"integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"bytes": "^3.1.2", "bytes": "~3.1.2",
"content-type": "^1.0.5", "content-type": "~1.0.5",
"debug": "^4.4.3", "debug": "2.6.9",
"http-errors": "^2.0.0", "depd": "2.0.0",
"iconv-lite": "^0.7.0", "destroy": "~1.2.0",
"on-finished": "^2.4.1", "http-errors": "~2.0.1",
"qs": "^6.14.0", "iconv-lite": "~0.4.24",
"raw-body": "^3.0.1", "on-finished": "~2.4.1",
"type-is": "^2.0.1" "qs": "~6.14.0",
"raw-body": "~2.5.3",
"type-is": "~1.6.18",
"unpipe": "~1.0.0"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">= 0.8",
}, "npm": "1.2.8000 || >= 1.4.16"
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"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": { "node_modules/brace-expansion": {
"version": "1.1.12", "version": "1.1.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -181,16 +218,15 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/content-disposition": { "node_modules/content-disposition": {
"version": "1.0.1", "version": "0.5.4",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
"integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
"license": "MIT", "license": "MIT",
"engines": { "dependencies": {
"node": ">=18" "safe-buffer": "5.2.1"
}, },
"funding": { "engines": {
"type": "opencollective", "node": ">= 0.6"
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/content-type": { "node_modules/content-type": {
@@ -212,18 +248,16 @@
} }
}, },
"node_modules/cookie-signature": { "node_modules/cookie-signature": {
"version": "1.2.2", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
"integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
"license": "MIT", "license": "MIT"
"engines": {
"node": ">=6.6.0"
}
}, },
"node_modules/debug": { "node_modules/debug": {
"version": "4.4.3", "version": "4.4.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
"dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ms": "^2.1.3" "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": { "node_modules/depd": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -246,6 +289,28 @@
"node": ">= 0.8" "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": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -321,48 +386,66 @@
} }
}, },
"node_modules/express": { "node_modules/express": {
"version": "5.2.1", "version": "4.22.1",
"resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
"integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==", "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"accepts": "^2.0.0", "accepts": "~1.3.8",
"body-parser": "^2.2.1", "array-flatten": "1.1.1",
"content-disposition": "^1.0.0", "body-parser": "~1.20.3",
"content-type": "^1.0.5", "content-disposition": "~0.5.4",
"cookie": "^0.7.1", "content-type": "~1.0.4",
"cookie-signature": "^1.2.1", "cookie": "~0.7.1",
"debug": "^4.4.0", "cookie-signature": "~1.0.6",
"depd": "^2.0.0", "debug": "2.6.9",
"encodeurl": "^2.0.0", "depd": "2.0.0",
"escape-html": "^1.0.3", "encodeurl": "~2.0.0",
"etag": "^1.8.1", "escape-html": "~1.0.3",
"finalhandler": "^2.1.0", "etag": "~1.8.1",
"fresh": "^2.0.0", "finalhandler": "~1.3.1",
"http-errors": "^2.0.0", "fresh": "~0.5.2",
"merge-descriptors": "^2.0.0", "http-errors": "~2.0.0",
"mime-types": "^3.0.0", "merge-descriptors": "1.0.3",
"on-finished": "^2.4.1", "methods": "~1.1.2",
"once": "^1.4.0", "on-finished": "~2.4.1",
"parseurl": "^1.3.3", "parseurl": "~1.3.3",
"proxy-addr": "^2.0.7", "path-to-regexp": "~0.1.12",
"qs": "^6.14.0", "proxy-addr": "~2.0.7",
"range-parser": "^1.2.1", "qs": "~6.14.0",
"router": "^2.2.0", "range-parser": "~1.2.1",
"send": "^1.1.0", "safe-buffer": "5.2.1",
"serve-static": "^2.2.0", "send": "~0.19.0",
"statuses": "^2.0.1", "serve-static": "~1.16.2",
"type-is": "^2.0.1", "setprototypeof": "1.2.0",
"vary": "^1.1.2" "statuses": "~2.0.1",
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
}, },
"engines": { "engines": {
"node": ">= 18" "node": ">= 0.10.0"
}, },
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/express" "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": { "node_modules/fill-range": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -377,26 +460,38 @@
} }
}, },
"node_modules/finalhandler": { "node_modules/finalhandler": {
"version": "2.1.1", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.1.tgz", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
"integrity": "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==", "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"debug": "^4.4.0", "debug": "2.6.9",
"encodeurl": "^2.0.0", "encodeurl": "~2.0.0",
"escape-html": "^1.0.3", "escape-html": "~1.0.3",
"on-finished": "^2.4.1", "on-finished": "~2.4.1",
"parseurl": "^1.3.3", "parseurl": "~1.3.3",
"statuses": "^2.0.1" "statuses": "~2.0.2",
"unpipe": "~1.0.0"
}, },
"engines": { "engines": {
"node": ">= 18.0.0" "node": ">= 0.8"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"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": { "node_modules/forwarded": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -407,12 +502,12 @@
} }
}, },
"node_modules/fresh": { "node_modules/fresh": {
"version": "2.0.0", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.8" "node": ">= 0.6"
} }
}, },
"node_modules/fsevents": { "node_modules/fsevents": {
@@ -556,19 +651,15 @@
} }
}, },
"node_modules/iconv-lite": { "node_modules/iconv-lite": {
"version": "0.7.1", "version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.1.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"safer-buffer": ">= 2.1.2 < 3.0.0" "safer-buffer": ">= 2.1.2 < 3"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/ignore-by-default": { "node_modules/ignore-by-default": {
@@ -639,11 +730,39 @@
"node": ">=0.12.0" "node": ">=0.12.0"
} }
}, },
"node_modules/is-promise": { "node_modules/lru-cache": {
"version": "4.0.0", "version": "10.4.3",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
"license": "MIT" "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": { "node_modules/math-intrinsics": {
"version": "1.1.0", "version": "1.1.0",
@@ -655,49 +774,63 @@
} }
}, },
"node_modules/media-typer": { "node_modules/media-typer": {
"version": "1.1.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.8" "node": ">= 0.6"
} }
}, },
"node_modules/merge-descriptors": { "node_modules/merge-descriptors": {
"version": "2.0.0", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
"integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
"license": "MIT", "license": "MIT",
"engines": {
"node": ">=18"
},
"funding": { "funding": {
"url": "https://github.com/sponsors/sindresorhus" "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": { "node_modules/mime-db": {
"version": "1.54.0", "version": "1.52.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
"integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/mime-types": { "node_modules/mime-types": {
"version": "3.0.2", "version": "2.1.35",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
"integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"mime-db": "^1.54.0" "mime-db": "1.52.0"
}, },
"engines": { "engines": {
"node": ">=18" "node": ">= 0.6"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/minimatch": { "node_modules/minimatch": {
@@ -720,9 +853,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/negotiator": { "node_modules/negotiator": {
"version": "1.0.0", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
"integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
"license": "MIT", "license": "MIT",
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
@@ -791,15 +924,6 @@
"node": ">= 0.8" "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": { "node_modules/parseurl": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -810,14 +934,10 @@
} }
}, },
"node_modules/path-to-regexp": { "node_modules/path-to-regexp": {
"version": "8.3.0", "version": "0.1.12",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
"integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
"license": "MIT", "license": "MIT"
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
}
}, },
"node_modules/picomatch": { "node_modules/picomatch": {
"version": "2.3.1", "version": "2.3.1",
@@ -853,9 +973,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/qs": { "node_modules/qs": {
"version": "6.14.0", "version": "6.14.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
"integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"side-channel": "^1.1.0" "side-channel": "^1.1.0"
@@ -877,18 +997,18 @@
} }
}, },
"node_modules/raw-body": { "node_modules/raw-body": {
"version": "3.0.2", "version": "2.5.3",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.2.tgz", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
"integrity": "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==", "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"bytes": "~3.1.2", "bytes": "~3.1.2",
"http-errors": "~2.0.1", "http-errors": "~2.0.1",
"iconv-lite": "~0.7.0", "iconv-lite": "~0.4.24",
"unpipe": "~1.0.0" "unpipe": "~1.0.0"
}, },
"engines": { "engines": {
"node": ">= 0.10" "node": ">= 0.8"
} }
}, },
"node_modules/readdirp": { "node_modules/readdirp": {
@@ -904,21 +1024,25 @@
"node": ">=8.10.0" "node": ">=8.10.0"
} }
}, },
"node_modules/router": { "node_modules/safe-buffer": {
"version": "2.2.0", "version": "5.2.1",
"resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"license": "MIT", "funding": [
"dependencies": { {
"debug": "^4.4.0", "type": "github",
"depd": "^2.0.0", "url": "https://github.com/sponsors/feross"
"is-promise": "^4.0.0",
"parseurl": "^1.3.3",
"path-to-regexp": "^8.0.0"
}, },
"engines": { {
"node": ">= 18" "type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
} }
],
"license": "MIT"
}, },
"node_modules/safer-buffer": { "node_modules/safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@@ -940,48 +1064,57 @@
} }
}, },
"node_modules/send": { "node_modules/send": {
"version": "1.2.1", "version": "0.19.2",
"resolved": "https://registry.npmjs.org/send/-/send-1.2.1.tgz", "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
"integrity": "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==", "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"debug": "^4.4.3", "debug": "2.6.9",
"encodeurl": "^2.0.0", "depd": "2.0.0",
"escape-html": "^1.0.3", "destroy": "1.2.0",
"etag": "^1.8.1", "encodeurl": "~2.0.0",
"fresh": "^2.0.0", "escape-html": "~1.0.3",
"http-errors": "^2.0.1", "etag": "~1.8.1",
"mime-types": "^3.0.2", "fresh": "~0.5.2",
"ms": "^2.1.3", "http-errors": "~2.0.1",
"on-finished": "^2.4.1", "mime": "1.6.0",
"range-parser": "^1.2.1", "ms": "2.1.3",
"statuses": "^2.0.2" "on-finished": "~2.4.1",
"range-parser": "~1.2.1",
"statuses": "~2.0.2"
}, },
"engines": { "engines": {
"node": ">= 18" "node": ">= 0.8.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/serve-static": { "node_modules/send/node_modules/debug": {
"version": "2.2.1", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"encodeurl": "^2.0.0", "ms": "2.0.0"
"escape-html": "^1.0.3", }
"parseurl": "^1.3.3", },
"send": "^1.2.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": { "engines": {
"node": ">= 18" "node": ">= 0.8.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
} }
}, },
"node_modules/setprototypeof": { "node_modules/setprototypeof": {
@@ -1130,14 +1263,13 @@
} }
}, },
"node_modules/type-is": { "node_modules/type-is": {
"version": "2.0.1", "version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
"integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"content-type": "^1.0.5", "media-typer": "0.3.0",
"media-typer": "^1.1.0", "mime-types": "~2.1.24"
"mime-types": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
@@ -1150,6 +1282,12 @@
"dev": true, "dev": true,
"license": "MIT" "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": { "node_modules/unpipe": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1159,6 +1297,15 @@
"node": ">= 0.8" "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": { "node_modules/vary": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -1167,12 +1314,6 @@
"engines": { "engines": {
"node": ">= 0.8" "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"
} }
} }
} }

359
server/db/database.js
View File

@@ -24,7 +24,7 @@ export default class DBAdapter {
#dbName = 'N'; #dbName = 'N';
#dbUserLogin = 'u'; #dbUserLogin = 'u';
#dbUserPassword = 'p'; #dbUserPassword = 'p';
#dbClient = null; #pool = null;
constructor({ constructor({
dbHost, dbHost,
@@ -38,40 +38,43 @@ export default class DBAdapter {
this.#dbName = dbName; this.#dbName = dbName;
this.#dbUserLogin = dbUserLogin; this.#dbUserLogin = dbUserLogin;
this.#dbUserPassword = dbUserPassword; this.#dbUserPassword = dbUserPassword;
this.#dbClient = new mdb.createPool({ this.#pool = mdb.createPool({
host: this.#dbhost, host: this.#dbhost,
port: this.#dbPort, port: this.#dbPort,
database: this.#dbName, database: this.#dbName,
user: this.#dbUserLogin, user: this.#dbUserLogin,
password: this.#dbUserPassword, password: this.#dbUserPassword,
dateStrings: true dateStrings: true,
acquireTimeout: 10000,
}); });
} }
async #getConnection() {
return await this.#pool.getConnection();
}
async connect() { async connect() {
try { try {
// Проверяем подключение, выполняя простой запрос const conn = await this.#pool.getConnection();
const conn = await this.#dbClient.getConnection();
console.log("✅ Database connection test successful"); console.log("✅ Database connection test successful");
conn.release(); conn.release();
} catch (err) { } catch (err) {
console.error("❌ Database connection failed:", err.message); console.error("❌ Database connection failed:", err.message);
// Пробрасываем ошибку дальше
return Promise.reject(); return Promise.reject();
} }
} }
async disconnect() { async disconnect() {
await this.#dbClient.end(); await this.#pool.end();
console.log("DISCONNECT"); console.log("DISCONNECT");
} }
async stock(){ async stock(){
try { 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) { for (const product of products) {
const increment = Random_Increase(); 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, increment,
product.id product.id
]); ]);
@@ -86,8 +89,7 @@ export default class DBAdapter {
async getProducts() { async getProducts() {
try { try {
const products = await this.#dbClient.query('SELECT * FROM products ORDER BY name'); const products = await this.#pool.query('SELECT * FROM products ORDER BY name');
console.log("All products:", products);
return products; return products;
} catch(err){ } catch(err){
console.log(`WHOOPS`); console.log(`WHOOPS`);
@@ -97,14 +99,12 @@ export default class DBAdapter {
async getOrders() { async getOrders() {
try { try {
const raw_orders = await this.#dbClient.query('SELECT * FROM orders ORDER BY order_date ASC'); const raw_orders = await this.#pool.query('SELECT * FROM orders ORDER BY order_date ASC');
console.log("All orders:", raw_orders);
const items = await this.#dbClient.query( const items = await this.#pool.query(
`SELECT order_items.*, products.name AS product_name FROM order_items `SELECT order_items.*, products.name AS product_name FROM order_items
JOIN products ON order_items.product_id = products.id` JOIN products ON order_items.product_id = products.id`
); );
console.log("All order items:", items);
const groupedItems = {}; const groupedItems = {};
if (items && items.length > 0) { if (items && items.length > 0) {
@@ -132,7 +132,7 @@ export default class DBAdapter {
} }
async addOrder({ id, customer_name, orderDate} ){ async addOrder({ id, customer_name, orderDate} ){
if (!customer_name || !orderDate){ if (!id || !customer_name || !orderDate){
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Empty in customer name or order date") error: new Error("Empty in customer name or order date")
@@ -146,7 +146,7 @@ export default class DBAdapter {
}); });
} }
try { 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] [id, customer_name, orderDate]
); );
} catch(err){ } catch(err){
@@ -159,7 +159,7 @@ export default class DBAdapter {
async getOrdersByDate(date){ async getOrdersByDate(date){
try { 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; return order_ids;
} catch(err){ } catch(err){
return Promise.reject(); return Promise.reject();
@@ -175,7 +175,7 @@ export default class DBAdapter {
try { try {
const placeholders = orderIds.map(() => '?').join(','); const placeholders = orderIds.map(() => '?').join(',');
const result = await this.#dbClient.query( const result = await this.#pool.query(
`DELETE FROM orders WHERE id IN (${placeholders})`, `DELETE FROM orders WHERE id IN (${placeholders})`,
orderIds orderIds
); );
@@ -188,11 +188,12 @@ export default class DBAdapter {
} }
} }
async changeOrderInfo({ id, customer_name, orderDate }){ async changeOrderInfo({ id, customer_name, orderDate }) {
if (!id) { if (!id || !customer_name || !orderDate) {
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order ID is required") error: new Error("Order ID, name or date is required!"),
message: "Order ID, name or date is required!" // Добавляем message напрямую
}); });
} }
@@ -200,100 +201,205 @@ export default class DBAdapter {
if (orderDate < currentDate) { if (orderDate < currentDate) {
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order date cannot be less than current date") error: new Error("Order date cannot be less than current date"),
message: "Order date cannot be less than current date"
}); });
} }
try { 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({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order not found") error: new Error("Order not found"),
message: "Order not found"
}); });
} }
const updatedName = customer_name; const updatedName = customer_name;
const updatedDate = orderDate; 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] [updatedName, updatedDate, id]
); );
} catch(err){ } catch(err) {
console.error('Database error in changeOrderInfo:', err);
return Promise.reject({ return Promise.reject({
type: DB_INTERNAL_ERROR, type: DB_INTERNAL_ERROR,
error: new Error("Server error") error: new Error("Server error"),
message: err.message || "Database operation failed",
details: err.message
}); });
} }
} }
async deleteOrderById(order_id){ async deleteOrderById(order_id) {
let connection;
try { 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 = ?`, `SELECT product_id, quantity FROM order_items WHERE order_id = ?`,
[order_id] [order_id]
); );
for (const item of orderItems){ 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] [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 = ?`, `DELETE FROM orders WHERE id = ?`,
[order_id] [order_id]
); );
} catch(err){
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({ return Promise.reject({
type: DB_INTERNAL_ERROR, type: DB_INTERNAL_ERROR,
error: new Error("Server error") error: new Error("Failed to delete order"),
details: err.message
}); });
} }
} }
async addOrderItem({ orderId, productId, quantity }){ async addOrderItem({ orderId, productId, quantity }) {
await this.#dbClient.query('BEGIN'); let connection;
try { try {
const product = await this.#dbClient.query( connection = await this.#pool.getConnection();
'SELECT quantity FROM products WHERE id = ?', [productId]
await connection.beginTransaction();
const orderCheck = await connection.query(
'SELECT id FROM orders WHERE id = ?',
[orderId]
);
if (!orderCheck || orderCheck.length === 0) {
await connection.rollback();
connection.release();
return Promise.reject({
type: DB_USER_ERROR,
error: new Error("Order not found")
});
}
const product = await connection.query(
'SELECT id, quantity FROM products WHERE id = ? FOR UPDATE',
[productId]
); );
const productRow = product?.[0]; const productRow = product?.[0];
if (!productRow || productRow.quantity < quantity){
if (!productRow) {
await connection.rollback();
connection.release();
return Promise.reject({
type: DB_USER_ERROR,
error: new Error("Product not found")
});
}
if (productRow.quantity < quantity) {
await connection.rollback();
connection.release();
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Insufficient product quantity") error: new Error("Insufficient product quantity")
}); });
} }
const result = await this.#dbClient.query( await connection.query(
'INSERT INTO order_items (order_id, product_id, quantity) VALUES (?, ?, ?)',
[orderId, productId, quantity]
);
await this.#dbClient.query(
'UPDATE products SET quantity = quantity - ? WHERE id = ?', 'UPDATE products SET quantity = quantity - ? WHERE id = ?',
[quantity, productId] [quantity, productId]
); );
await this.#dbClient.query('COMMIT'); const result = await connection.query(
} catch (err){ 'INSERT INTO order_items (order_id, product_id, quantity) VALUES (?, ?, ?)',
await this.#dbClient.query('ROLLBACK'); [orderId, productId, quantity]
return Promise.reject(); );
await connection.commit();
connection.release();
return result.insertId;
} catch (err) {
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 = "Database operation failed";
let retryable = false;
if (err.code === 'ER_LOCK_WAIT_TIMEOUT' || err.errno === 1205) {
errorType = 'DB_CONFLICT';
userMessage = "System is busy. Please try again in a moment.";
retryable = true;
} else if (err.code === 'ER_DUP_ENTRY') {
errorType = DB_USER_ERROR;
userMessage = "Item already exists in the order";
}
return Promise.reject({
type: errorType,
error: new Error(userMessage),
details: err.message,
code: err.code,
retryable: retryable,
originalError: err
});
} }
} }
async updateOrderItem({ itemId, quantity }){ async updateOrderItem({ itemId, quantity }) {
await this.#dbClient.query('BEGIN'); let connection;
try { try {
const item = await this.#dbClient.query( connection = await this.#pool.getConnection();
'SELECT product_id, quantity FROM order_items WHERE id = ?', [itemId] await connection.beginTransaction();
const item = await connection.query(
'SELECT product_id, quantity FROM order_items WHERE id = ? FOR UPDATE',
[itemId]
); );
const itemRow = item?.[0]; const itemRow = item?.[0];
if (!itemRow){ if (!itemRow) {
await connection.rollback();
connection.release();
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order item not found") error: new Error("Order item not found")
@@ -302,100 +408,177 @@ export default class DBAdapter {
const diff = quantity - itemRow.quantity; const diff = quantity - itemRow.quantity;
if (diff > 0){ if (diff > 0) {
const product = await this.#dbClient.query( const product = await connection.query(
'SELECT quantity FROM products WHERE id = ?', [itemRow.product_id] 'SELECT quantity FROM products WHERE id = ? FOR UPDATE',
[itemRow.product_id]
); );
const productRow = product?.[0]; const productRow = product?.[0];
if (!productRow || productRow.quantity < diff){ if (!productRow || productRow.quantity < diff) {
await connection.rollback();
connection.release();
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Insufficient product quantity") error: new Error("Insufficient product quantity")
}); });
} }
await this.#dbClient.query( await connection.query(
'UPDATE products SET quantity = quantity - ? WHERE id = ?', 'UPDATE products SET quantity = quantity - ? WHERE id = ?',
[diff, itemRow.product_id] [diff, itemRow.product_id]
); );
} }
if (diff < 0) { if (diff < 0) {
await this.#dbClient.query( await connection.query(
'UPDATE products SET quantity = quantity + ? WHERE id = ?', 'UPDATE products SET quantity = quantity + ? WHERE id = ?',
[-diff, itemRow.product_id] [-diff, itemRow.product_id]
); );
} }
await this.#dbClient.query( await connection.query(
'UPDATE order_items SET quantity = ? WHERE id = ?', 'UPDATE order_items SET quantity = ? WHERE id = ?',
[quantity, itemId] [quantity, itemId]
); );
await this.#dbClient.query('COMMIT'); await connection.commit();
} catch (err){ connection.release();
await this.#dbClient.query('ROLLBACK');
return Promise.reject(); } 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("Failed to update order item"),
details: err.message
});
} }
} }
async deleteOrderItem(itemId){ async deleteOrderItem(itemId) {
await this.#dbClient.query('BEGIN'); let connection;
try { try {
const item = await this.#dbClient.query( connection = await this.#pool.getConnection();
'SELECT product_id, quantity FROM order_items WHERE id = ?', [itemId] await connection.beginTransaction();
const item = await connection.query(
'SELECT product_id, quantity FROM order_items WHERE id = ? FOR UPDATE',
[itemId]
); );
const itemRow = item?.[0]; const itemRow = item?.[0];
if (!itemRow){ if (!itemRow) {
await connection.rollback();
connection.release();
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order item not found") error: new Error("Order item not found")
}); });
} }
await this.#dbClient.query( await connection.query(
'UPDATE products SET quantity = quantity + ? WHERE id = ?', 'UPDATE products SET quantity = quantity + ? WHERE id = ?',
[itemRow.quantity, itemRow.product_id] [itemRow.quantity, itemRow.product_id]
); );
await this.#dbClient.query( await connection.query(
'DELETE FROM order_items WHERE id = ?', 'DELETE FROM order_items WHERE id = ?',
[itemId] [itemId]
); );
await this.#dbClient.query('COMMIT'); await connection.commit();
} catch (err){ connection.release();
await this.#dbClient.query('ROLLBACK');
return Promise.reject(); } catch (err) {
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("Failed to delete order item"),
details: err.message,
itemId: itemId
});
} }
} }
async moveOrderItem( {itemId, targetOrderId }){ async moveOrderItem({ itemId, targetOrderId }) {
await this.#dbClient.query('BEGIN'); let connection;
try { try {
const item = await this.#dbClient.query( connection = await this.#pool.getConnection();
'SELECT id, order_id FROM order_items WHERE id = ?', [itemId] 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("Target order not found")
});
}
const item = await connection.query(
'SELECT id, order_id FROM order_items WHERE id = ? FOR UPDATE',
[itemId]
); );
const itemRow = item?.[0]; const itemRow = item?.[0];
if (!itemRow){ if (!itemRow) {
await connection.rollback();
connection.release();
return Promise.reject({ return Promise.reject({
type: DB_USER_ERROR, type: DB_USER_ERROR,
error: new Error("Order item not found") error: new Error("Order item not found")
}); });
} }
await this.#dbClient.query( await connection.query(
'UPDATE order_items SET order_id = ? WHERE id = ?', 'UPDATE order_items SET order_id = ? WHERE id = ?',
[targetOrderId, itemId] [targetOrderId, itemId]
); );
await this.#dbClient.query('COMMIT'); await connection.commit();
} catch (err){ connection.release();
await this.#dbClient.query('ROLLBACK');
return Promise.reject(); } 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("Failed to move order item"),
details: err.message
});
} }
} }
} }

182
server/server.js
View File

@@ -20,6 +20,16 @@ const appPort = 3000;
const app = express(); const app = express();
app.use(express.json()); 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');
if (req.method === 'OPTIONS') {
res.sendStatus(204);
return;
}
next();
});
const adapter = new DBAdapter({ const adapter = new DBAdapter({
dbHost: HOST, dbHost: HOST,
@@ -40,31 +50,6 @@ app.get('/api/current-date', async (req, res) => {
res.json({ currentDate }); res.json({ currentDate });
}); });
app.get('/api/products', async(req, res) => {
try {
const db_products = await adapter.getProducts();
const products = db_products.map(
( {id, name, quantity} ) => ({
ID: id,
pr_name: name,
count: quantity
})
);
res.statusCode = 200;
res.message = "OK";
res.json(products);
} catch (err){
res.statusCode = 500;
res.message = "WHOOPS";
res.json({
timeStamp: new Date().toISOString(),
statusCode: 500,
error : `${err}`
})
}
});
app.post('/api/current-date/advance', async (req, res) => { app.post('/api/current-date/advance', async (req, res) => {
let currentDate = getCurrentDate(); let currentDate = getCurrentDate();
try { try {
@@ -88,7 +73,32 @@ app.post('/api/current-date/advance', async (req, res) => {
} }
}); });
app.get('/api/orders', async(req, res) => { app.get('/api/products', async (req, res) => {
try {
const db_products = await adapter.getProducts();
const products = db_products.map(
( {id, name, quantity} ) => ({
ID: id,
pr_name: name,
count: quantity
})
);
res.statusCode = 200;
res.message = "OK";
res.json(products);
} catch (err){
res.statusCode = 500;
res.message = "WHOOPS";
res.json({
timeStamp: new Date().toISOString(),
statusCode: 500,
error : `${err}`
})
}
});
app.get('/api/orders', async (req, res) => {
try { try {
const db_orders = await adapter.getOrders(); const db_orders = await adapter.getOrders();
@@ -100,6 +110,7 @@ app.get('/api/orders', async(req, res) => {
status: status, status: status,
total: total_amount, total: total_amount,
items: items ? items.map(item => ({ items: items ? items.map(item => ({
id: item.id,
product_id: item.product_id, product_id: item.product_id,
product_name: item.product_name || item.name, product_name: item.product_name || item.name,
quantity: item.quantity, quantity: item.quantity,
@@ -170,6 +181,64 @@ app.post('/api/orders', async (req, res) => {
} }
}); });
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: "Customer name and order date are required"
});
}
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 ||
"Unknown error occurred";
switch(err.type) {
case DB_INTERNAL_ERROR:
return res.status(500).json({
timeStamp: new Date().toISOString(),
statusCode: 500,
error: errorMessage,
details: err.details || "Internal server error"
});
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) => { app.delete('/api/orders/:id', async (req, res) => {
try { try {
await adapter.deleteOrderById(req.params.id); await adapter.deleteOrderById(req.params.id);
@@ -191,25 +260,52 @@ app.post('/api/orders/:orderId/items', async (req, res) => {
let orderId = req.params.orderId; let orderId = req.params.orderId;
let { productId, quantity } = req.body; let { productId, quantity } = req.body;
if (!productId || !quantity || quantity <= 0) {
return res.status(400).json({
timeStamp: new Date().toISOString(),
statusCode: 400,
error: "Invalid productId or quantity"
});
}
try { try {
await adapter.addOrderItem({ const itemId = await adapter.addOrderItem({
orderId, orderId,
productId, productId,
quantity quantity
}); });
res.status(201).json({ return res.status(201).json({
itemId: itemId.toString(),
orderId, orderId,
productId, productId,
quantity quantity
}); });
} catch (err) { } catch (err) {
// TODO console.error('Error adding order item:', err);
res.status(500).json({
if (err.type === DB_USER_ERROR) {
return res.status(400).json({
timeStamp: new Date().toISOString(),
statusCode: 400,
error: err.error?.message || "Invalid request",
details: err.details
});
} else if (err.type === DB_INTERNAL_ERROR) {
return res.status(500).json({
timeStamp: new Date().toISOString(), timeStamp: new Date().toISOString(),
statusCode: 500, statusCode: 500,
error: "Internal server error",
details: err.error?.message
}); });
} else {
return res.status(500).json({
timeStamp: new Date().toISOString(),
statusCode: 500,
error: "Internal server error"
});
}
} }
}); });
@@ -229,10 +325,10 @@ app.put('/api/orders/:orderId/items/:itemId', async (req, res) => {
}); });
} catch (err) { } catch (err) {
// TODO res.json({
res.status(500).json({
timeStamp: new Date().toISOString(), timeStamp: new Date().toISOString(),
statusCode: 500, statusCode: 500,
error: err.message
}); });
} }
}); });
@@ -240,17 +336,25 @@ app.put('/api/orders/:orderId/items/:itemId', async (req, res) => {
app.delete('/api/orders/:orderId/items/:itemId', async (req, res) => { app.delete('/api/orders/:orderId/items/:itemId', async (req, res) => {
try { try {
await adapter.deleteOrderItem(req.params.itemId); await adapter.deleteOrderItem(req.params.itemId);
res.status(204).end(); return res.status(204).end();
} catch (err){ } catch (err) {
res.statusCode = 500; if (err.type === DB_INTERNAL_ERROR) {
res.message = "WHOOPS"; return res.status(500).json({
res.json({
timeStamp: new Date().toISOString(), timeStamp: new Date().toISOString(),
statusCode: 500, statusCode: 500,
error: `${err}` error: "Server error",
details: err.error.message
});
} else {
return res.status(500).json({
timeStamp: new Date().toISOString(),
statusCode: 500,
error: "Internal server error",
details: err.message
}); });
} }
}) }
});
app.post('/api/order-items/:itemId/move', async (req, res) => { app.post('/api/order-items/:itemId/move', async (req, res) => {
let itemId = req.params.itemId; let itemId = req.params.itemId;