Update server.js

Update .drone.yml
8 changed files with 339 additions and 756 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,65 @@
+kind: pipeline
+type: docker
+name: build-and-deploy
+
+steps:
+- name: files-to-server
+  image: appleboy/drone-scp
+  settings:
+    host: 192.168.0.77
+    username:
+      from_secret: username_deploy
+    password:
+      from_secret: password_deploy
+    port: 22
+    target: /root/docker/trash-api/
+    source: .
+
+- name: build-deploy-docker-image
+  image: appleboy/drone-ssh
+  settings:
+    host: 192.168.0.77
+    username:
+      from_secret: username_deploy
+    password:
+      from_secret: password_deploy
+    port: 22
+    script:
+      - cd /root/docker/trash-api
+      - docker build -f Dockerfile-api -t trash-api .
+      - docker stop trash-api || true
+      - docker rm trash-api || true
+      - docker run -d -p 3001:3001 --name trash-api trash-api
+
+- name: telegram notification
+  image: appleboy/drone-telegram
+  settings:
+    token: 
+      from_secret: telegram_token
+    to:
+      from_secret: telegram_to
+    format: markdown
+  when:
+      status:
+          - success
+          - failure
+  message: >
+    {{#success build.status}}
+    ✅ Build #{{build.number}} of `{{repo.name}}` succeeded.
+    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
+    ```
+    {{commit.message}}
+    ```
+    🌐 {{ build.link }}
+    {{else}}
+    ❌ Build #{{build.number}} of `{{repo.name}}` failed.
+    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
+    ```
+    {{commit.message}}
+    ```
+    🌐 {{ build.link }}
+    {{/success}}
+
+  when:
+    branch:
+    - dev
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+node_modules/
--- a/123.yml
+++ b/123.yml
@ -0,0 +1,51 @@
+kind: pipeline
+type: docker
+name: build-and-deploy
+
+steps:
+- name: install_and_build
+  image: node:18
+  commands:
+    - npm install
+    - npm run build
+
+- name: deploy
+  image: appleboy/drone-scp
+  settings:
+    host: 192.168.0.129
+    username: 
+      from_secret: username_deploy
+    password: 
+      from_secret: password_deploy
+    port: 22
+    target: /root/docker/nginx/www_data
+    source: build
+  
+- name: telegram notification
+  image: appleboy/drone-telegram
+  settings:
+    token: 
+      from_secret: telegram_token
+    to: 
+      from_secret: telegram_to
+    format: markdown
+  when:
+      status:
+          - success
+          - failure
+  message: >
+    {{#success build.status}}
+    ✅ Build #{{build.number}} of `{{repo.name}}` succeeded.
+    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
+    ```
+    {{commit.message}}
+    ```
+    🌐 {{ build.link }}
+    {{else}}
+    ❌ Build #{{build.number}} of `{{repo.name}}` failed.
+    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
+    ```
+    {{commit.message}}
+    ```
+    🌐 {{ build.link }}
+    {{/success}}            
--- a/12
+++ b/12
@ -0,0 +1,12 @@
+FROM node
+
+ARG APP_DIR=/var/www/trash/api
+RUN mkdir -p ${APP_DIR}
+WORKDIR ${APP_DIR}
+
+COPY package*.json ./
+RUN npm ci
+COPY . .
+
+EXPOSE 3001/tcp
+CMD npm start
--- a/14
+++ b/14
@ -0,0 +1,14 @@
+FROM node
+
+ARG APP_DIR=/var/www/trash/web
+RUN mkdir -p ${APP_DIR}
+WORKDIR ${APP_DIR}
+
+COPY package*.json ./
+RUN npm ci
+COPY . .
+
+RUN npm run build
+
+EXPOSE 3000/tcp
+CMD npm start
--- a/package-lock.json
+++ b/package-lock.json
@ -1,42 +1,18 @@
 {
-  "name": "trash-api",
+  "name": "trashsensor_api",
+  "version": "1.0.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
+      "name": "trashsensor_api",
+      "version": "1.0.0",
+      "license": "ISC",
      "dependencies": {
-        "dotenv": "^16.4.5",
-        "express": "^4.19.1",
-        "pg": "^8.11.3",
-        "sequelize": "^6.37.1"
-      }
-    },
-    "node_modules/@types/debug": {
-      "version": "4.1.12",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
-      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
-      "dependencies": {
-        "@types/ms": "*"
-      }
-    },
-    "node_modules/@types/ms": {
-      "version": "0.7.34",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",
-      "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
-    },
-    "node_modules/@types/node": {
-      "version": "20.11.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
-      "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
+        "express": "^4.21.0",
+        "util": "^0.12.5"
      }
    },
-    "node_modules/@types/validator": {
-      "version": "13.11.9",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.11.9.tgz",
-      "integrity": "sha512-FCTsikRozryfayPuiI46QzH3fnrOoctTjvOYZkho9BTFLCOZ2rgZJHMOVgCOfttjPJcgOx52EpkY0CMfy87MIw=="
-    },
    "node_modules/accepts": {
      "version": "1.3.8",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@ -54,10 +30,24 @@
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
      "dependencies": {
        "bytes": "3.1.2",
        "content-type": "~1.0.5",
@ -67,7 +57,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@ -77,14 +67,6 @@
        "npm": "1.2.8000 || >= 1.4.16"
      }
    },
-    "node_modules/buffer-writer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
-      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
    "node_modules/bytes": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@ -184,31 +166,15 @@
        "npm": "1.2.8000 || >= 1.4.16"
      }
    },
-    "node_modules/dotenv": {
-      "version": "16.4.5",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/dottie": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",
-      "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA=="
-    },
    "node_modules/ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
    },
    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
      "engines": {
        "node": ">= 0.8"
      }
@ -246,36 +212,36 @@
      }
    },
    "node_modules/express": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.1.tgz",
-      "integrity": "sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
        "cookie": "0.6.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@ -287,12 +253,12 @@
      }
    },
    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
      "dependencies": {
        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@ -303,6 +269,14 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
    "node_modules/forwarded": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@ -389,6 +363,20 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/hasown": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@ -426,14 +414,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/inflection": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
-      "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
-      "engines": [
-        "node >= 0.4.0"
-      ]
-    },
    "node_modules/inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@ -447,20 +427,58 @@
        "node": ">= 0.10"
      }
    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
+      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
      "dependencies": {
-        "yallist": "^4.0.0"
+        "has-tostringtag": "^1.0.0"
      },
      "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
+      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "dependencies": {
+        "which-typed-array": "^1.1.14"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/media-typer": {
@ -472,9 +490,12 @@
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
    },
    "node_modules/methods": {
      "version": "1.1.2",
@ -514,25 +535,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.5.45",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
-      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
-      "dependencies": {
-        "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@ -547,9 +549,12 @@
      }
    },
    "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "engines": {
+        "node": ">= 0.4"
+      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
@ -565,11 +570,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/packet-reader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
-      "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
-    },
    "node_modules/parseurl": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@ -579,126 +579,16 @@
      }
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
-    },
-    "node_modules/pg": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz",
-      "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==",
-      "dependencies": {
-        "buffer-writer": "2.0.0",
-        "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.6.2",
-        "pg-pool": "^3.6.1",
-        "pg-protocol": "^1.6.0",
-        "pg-types": "^2.1.0",
-        "pgpass": "1.x"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "optionalDependencies": {
-        "pg-cloudflare": "^1.1.1"
-      },
-      "peerDependencies": {
-        "pg-native": ">=3.0.1"
-      },
-      "peerDependenciesMeta": {
-        "pg-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pg-cloudflare": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
-      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
-      "optional": true
-    },
-    "node_modules/pg-connection-string": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
-      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
    },
-    "node_modules/pg-int8": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
-      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pg-pool": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz",
-      "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==",
-      "peerDependencies": {
-        "pg": ">=8.0"
-      }
-    },
-    "node_modules/pg-protocol": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz",
-      "integrity": "sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="
-    },
-    "node_modules/pg-types": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
-      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
-      "dependencies": {
-        "pg-int8": "1.0.1",
-        "postgres-array": "~2.0.0",
-        "postgres-bytea": "~1.0.0",
-        "postgres-date": "~1.0.4",
-        "postgres-interval": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pgpass": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
-      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
-      "dependencies": {
-        "split2": "^4.1.0"
-      }
-    },
-    "node_modules/postgres-array": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
-      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postgres-bytea": {
+    "node_modules/possible-typed-array-names": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-date": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
-      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postgres-interval": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
-      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
      }
    },
    "node_modules/proxy-addr": {
@ -714,11 +604,11 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
      "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
      },
      "engines": {
        "node": ">=0.6"
@ -749,11 +639,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/retry-as-promised": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.0.4.tgz",
-      "integrity": "sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA=="
-    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@ -778,24 +663,10 @@
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
-    "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
      "dependencies": {
        "debug": "2.6.9",
        "depd": "2.0.0",
@ -815,110 +686,28 @@
        "node": ">= 0.8.0"
      }
    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/send/node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
-    "node_modules/sequelize": {
-      "version": "6.37.1",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.1.tgz",
-      "integrity": "sha512-vIKKzQ9dGp2aBOxQRD1FmUYViuQiKXSJ8yah8TsaBx4U3BokJt+Y2A0qz2C4pj08uX59qpWxRqSLEfRmVOEgQw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/sequelize"
-        }
-      ],
-      "dependencies": {
-        "@types/debug": "^4.1.8",
-        "@types/validator": "^13.7.17",
-        "debug": "^4.3.4",
-        "dottie": "^2.0.6",
-        "inflection": "^1.13.4",
-        "lodash": "^4.17.21",
-        "moment": "^2.29.4",
-        "moment-timezone": "^0.5.43",
-        "pg-connection-string": "^2.6.1",
-        "retry-as-promised": "^7.0.4",
-        "semver": "^7.5.4",
-        "sequelize-pool": "^7.1.0",
-        "toposort-class": "^1.0.1",
-        "uuid": "^8.3.2",
-        "validator": "^13.9.0",
-        "wkx": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ibm_db": {
-          "optional": true
-        },
-        "mariadb": {
-          "optional": true
-        },
-        "mysql2": {
-          "optional": true
-        },
-        "oracledb": {
-          "optional": true
-        },
-        "pg": {
-          "optional": true
-        },
-        "pg-hstore": {
-          "optional": true
-        },
-        "snowflake-sdk": {
-          "optional": true
-        },
-        "sqlite3": {
-          "optional": true
-        },
-        "tedious": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sequelize-pool": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
-      "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/sequelize/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sequelize/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
      "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
      },
      "engines": {
        "node": ">= 0.8.0"
@ -962,14 +751,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/split2": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
-      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
    "node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@ -986,11 +767,6 @@
        "node": ">=0.6"
      }
    },
-    "node_modules/toposort-class": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
-      "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg=="
-    },
    "node_modules/type-is": {
      "version": "1.6.18",
      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@ -1003,11 +779,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
    "node_modules/unpipe": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@ -1016,6 +787,18 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
    "node_modules/utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@ -1024,22 +807,6 @@
        "node": ">= 0.4.0"
      }
    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/validator": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz",
-      "integrity": "sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
    "node_modules/vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@ -1048,26 +815,23 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/wkx": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz",
-      "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==",
+    "node_modules/which-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
+      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.2"
+      },
      "engines": {
-        "node": ">=0.4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    }
  }
 }
--- a/package.json
+++ b/package.json
@ -1,8 +1,16 @@
 {
+  "name": "trashsensor_api",
+  "version": "1.0.0",
+  "description": "Датчик наполнения мусорных контейнеров. Система позволяет пользователю получить информацию о наполненности мусорных контейнеров. Тем самым помогает ему решить задачи оптимизации и эффективности предоставления услуг по управлению отходами.",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "author": "",
+  "license": "ISC",
  "dependencies": {
-    "dotenv": "^16.4.5",
-    "express": "^4.19.1",
-    "pg": "^8.11.3",
-    "sequelize": "^6.37.1"
+    "express": "^4.21.0",
+    "util": "^0.12.5"
  }
 }
--- a/server.js
+++ b/server.js
@ -1,93 +1,9 @@
 const util = require('util');
 const express = require('express');
 const bodyParser = require('body-parser');
-const { Sequelize, DataTypes } = require('sequelize');
-require('dotenv').config();
-process.env.TZ = "Europe/Moscow";

-const sequelize = new Sequelize('TrashSensor', process.env.DB_USER, process.env.DB_PASS, {
-    host: 'localhost',
-    dialect: 'postgres',
-    schema: 'sensors',
-    logging: false
-});
-
-const Sensor = sequelize.define('Sensor', {
-    id: {
-        type: DataTypes.INTEGER,
-        primaryKey: true,
-        autoIncrement: true,
-    },
-    name: {
-        type: DataTypes.STRING,
-        allowNull: false,
-    },
-    address: {
-        type: DataTypes.STRING,
-        allowNull: false,
-    },
-    lat: {
-        type: DataTypes.FLOAT,
-        allowNull: false,
-        unique: true,
-    },
-    lng: {
-        type: DataTypes.FLOAT,
-        allowNull: false,
-        unique: true,
-    }
-});
-
-const FullnessData = sequelize.define('FullnessData', {
-    id: {
-        type: DataTypes.INTEGER,
-        primaryKey: true,
-        autoIncrement: true,
-    },
-    containerNumber: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-    },
-    percent: {
-        type: DataTypes.INTEGER,
-    },
-    batLevel: {
-        type: DataTypes.INTEGER,
-    }
-},
-    // {
-    //     timestamps: false
-    // }
-);
-
-const DoorData = sequelize.define('DoorData', {
-    id: {
-        type: DataTypes.INTEGER,
-        primaryKey: true,
-        autoIncrement: true,
-    },
-    containerNumber: {
-        type: DataTypes.INTEGER,
-        allowNull: false,
-    },
-    isOpened: {
-        type: DataTypes.BOOLEAN,
-    }
-},
-);
-
-Sensor.hasMany(FullnessData, { as: "FullnessData" });
-FullnessData.belongsTo(Sensor, { as: "Sensor" });
-
-Sensor.hasMany(DoorData, { as: "DoorData" });
-DoorData.belongsTo(Sensor, { as: "Sensor" });
-
-//const app = express();
-const exp = express();
-const app = express.Router(); // Создание экземпляра маршрутизатора для API
-exp.use('/api', app);
-
-const port = 1778;
+const app = express();
+const port = 3001;

 const logging = (req, res, next) => {
    var ip = req.ip;
@ -107,258 +23,10 @@ const logging = (req, res, next) => {
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(logging);

-const authenticateToken = (req, res, next) => {
-    const token = req.header('Authorization');
-    if (!token) return res.sendStatus(401);
-
-    jwt.verify(token, secretKey, (err, user) => {
-        if (err) return res.sendStatus(403);
-        req.user = user;
-        next();
-    });
-};
-
-app.post('/login', (req, res) => {
-    const username = req.body.username;
-    const password = req.body.password;
-
-    const role = getRole(username, password);
-    console.log(role);
-    const user = { username: username, role: role };
-
-    const token = jwt.sign(user, secretKey);
-    res.json({ token: token });
-});
-
 app.get('/', (req, res) => {
-    res.send('OK');
+    res.send('OK TEST!!!');
 });

-app.get('/sensors', async (req, res) => {
-    try {
-        const { _start = 0, _end = 100, _sort = 'createdAt', _order = 'ASC' } = req.query
-
-        const data = await FullnessData.findAll({
-            attributes: [
-                'id',
-                [Sequelize.col('Sensor.name'), 'name'],
-                [Sequelize.col('Sensor.address'), 'address'],
-                [Sequelize.col('Sensor.lat'), 'lat'],
-                [Sequelize.col('Sensor.lng'), 'lng'],
-                'percent',
-                'batLevel',
-            ],
-            include: [
-                {
-                    model: Sensor,
-                    as: "Sensor",
-                    attributes: [],
-                    required: true,
-                }
-            ],
-            order: [[_sort, _order]],
-            offset: parseInt(_start),
-            limit: parseInt(_end) - parseInt(_start),
-        });
-
-        res.header('Access-Control-Allow-Origin', '*')
-        res.header('Access-Control-Expose-Headers', 'X-Total-Count')
-        res.header('X-Total-Count', data.length);
-
-        res.json(data);
-    } catch (error) {
-        console.error('Error fetching data', error);
-        res.status(500).json({ error: 'Internal Server Error' });
-    }
-});
-
-app.get('/sensors', async (req, res) => {
-    try {
-        const { _start = 0, _end = 100, _sort = 'createdAt', _order = 'ASC' } = req.query
-
-        const data = await FullnessData.findAll({
-            attributes: [
-                'id',
-                [Sequelize.col('Sensor.name'), 'name'],
-                [Sequelize.col('Sensor.address'), 'address'],
-                [Sequelize.col('Sensor.lat'), 'lat'],
-                [Sequelize.col('Sensor.lng'), 'lng'],
-                'percent',
-                'batLevel',
-            ],
-            include: [
-                {
-                    model: Sensor,
-                    as: "Sensor",
-                    attributes: [],
-                    required: true,
-                }
-            ],
-            order: [[_sort, _order]],
-            offset: parseInt(_start),
-            limit: parseInt(_end) - parseInt(_start),
-        });
-
-        res.header('Access-Control-Allow-Origin', '*')
-        res.header('Access-Control-Expose-Headers', 'X-Total-Count')
-        res.header('X-Total-Count', data.length);
-
-        res.json(data);
-    } catch (error) {
-        console.error('Error fetching data', error);
-        res.status(500).json({ error: 'Internal Server Error' });
-    }
+app.listen(port, '0.0.0.0', () => {
+    console.log(`Server is running on http://localhost:${port}`);
 });
-
-app.get('/now', async (req, res) => {
-    const sensors = await Sensor.findAll({
-        order: [['id', 'ASC']]
-    });
-
-    let result = [];
-    for (let sens of sensors) {
-        for (let i = 0; i < 7; i++) {
-            const infoFull = await FullnessData.findOne({
-                where: { SensorId: sens.id, containerNumber: i },
-                order: [['createdAt', 'DESC']]
-            });
-
-            const infoDoor = await DoorData.findOne({
-                where: { SensorId: sens.id, containerNumber: i },
-                order: [['createdAt', 'DESC']]
-            });
-
-            const date = infoFull ? formatDateTime(new Date(infoFull.createdAt)) : '-';
-
-            result.push({
-                id: `${sens.id}.${i}`, name: sens.name, address: sens.address,
-                lat: sens.lat, lng: sens.lng, percent: infoFull ? infoFull.percent : '-',
-                batLevel: infoFull ? infoFull.batLevel : '-', isDoorOpened: infoDoor ? infoDoor.isOpened : '-', timeAt: date
-            })
-        }
-        /* for (let i = 0; i < info.length; i++) {
-             const date = new Date(info[i].createdAt)
-             result.push({
-                 id: `${sens.id}.${info[i].containerNumber}`, name: sens.name, address: sens.address,
-                 lat: sens.lat, lng: sens.lng, percent: info[i].percent,
-                 batLevel: info[i].batLevel, timeAt: formatDateTime(date)
-             })
-         }*/
-
-
-    }
-    result.sort((a, b) => b.timeAt - a.timeAt);
-    res.header('Access-Control-Allow-Origin', '*')
-    res.header('Access-Control-Expose-Headers', 'X-Total-Count')
-    res.header('X-Total-Count', result.length);
-
-    res.json(result);
-});
-
-app.post('/data', async (req, res) => {
-    if (!req.body) return res.sendStatus(400);
-
-    try {
-        const info = req.body.data;
-        console.log(info);
-        const fillLevelRegex = /SN\.SR\.FU\.LL\.(\w+)\.(\w+)\.(\w+)/;
-        const doorStatusRegex = /SN\.SR\.DO\.OR\.(\w+)\.(\w+)/;
-
-        if (doorStatusRegex.test(info)) {
-            const match = info.match(doorStatusRegex);
-            const sensorId = parseInt(match[1], 16);
-            const doorStatus = match[2].split('');
-            console.log(`ID датчика: ${sensorId}, Состояние дверей: ${doorStatus.join(', ') || 'N/A'}`);
-            console.log(doorStatus);
-
-            for (let i = 0; i < doorStatus.length; i++) {
-                if (doorStatus[i] == 'x') {
-                    continue;
-                }
-
-                console.log(i, doorStatus[i]);
-
-                const sensorReady = await Sensor.findOne({
-                    where: { id: sensorId },
-                });
-
-                if (sensorReady)
-                    DoorData.create({ isOpened: doorStatus[i] == 0 ? false : true, SensorId: sensorId, containerNumber: i });
-                else
-                    res.sendStatus(400);
-            }
-            res.status(200).json({ data: 'OK' });
-        }
-        else if (fillLevelRegex.test(info)) {
-            const match = info.match(fillLevelRegex);
-            const sensorId = parseInt(match[1], 16);
-            const fillLevelsHex = match[2].split('');
-            const batteryLevelHex = match[3];
-
-            const fillLevelsDec = fillLevelsHex.map(hex => {
-                if (hex === 'x') return 'x';
-                if (hex === 'e') return -1;
-                if (hex === 'f') return 100;
-                return parseInt(hex, 16) * 10;
-            }); // Фильтрация пустых значений
-
-            const batteryLevelDec = parseInt(batteryLevelHex, 16);
-
-            console.log(`ID датчика: ${sensorId}, Уровни наполненности: ${fillLevelsDec.join('%, ') || 'N/A'}, Заряд батареи: ${batteryLevelDec}%`);
-
-            console.log(fillLevelsDec);
-
-            const sensorReady = await Sensor.findOne({
-                where: { id: sensorId },
-            });
-
-            if (sensorReady)
-                for (let i = 0; i < fillLevelsDec.length; i++) {
-                    if (fillLevelsDec[i] == 'x') {
-                        continue;
-                    }
-                    const newData = await FullnessData.create({ percent: fillLevelsDec[i], batLevel: batteryLevelDec, SensorId: sensorId, containerNumber: i });
-                }
-            else
-                res.sendStatus(400);
-
-            res.header('Access-Control-Allow-Origin', '*');
-            res.status(200).json({ data: 'OK' });
-
-        } else {
-            console.log('Неизвестный формат строки');
-            res.sendStatus(400);
-        }
-
-    } catch (error) {
-        console.error('Error creating', error);
-        res.status(500).json({ error: 'Internal Server Error' });
-    }
-});
-
-sequelize.sync({ alter: true }).then(() => {
-    exp.listen(port, '0.0.0.0', () => {
-        console.log(`Server is running on http://localhost:${port}`);
-    });
-});
-
-function getRole(username, password) {
-    if (username == 'rfid_esp32' && password == 'skbkit2024')
-        return 'rfid';
-
-    if (username == 'vladimir' && password == 'vladimir_kit2024')
-        return 'admin';
-
-    return 'user';
-}
-
-function formatDateTime(date) {
-    const hours = String(date.getHours()).padStart(2, '0');
-    const minutes = String(date.getMinutes()).padStart(2, '0');
-    const seconds = String(date.getSeconds()).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const year = date.getFullYear();
-
-    return `${day}.${month}.${year} ${hours}:${minutes}:${seconds}`;
-}
Author	SHA1	Message	Date
Vladimir Kutkovoy	0eb63323dc	Update server.js continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	1 year ago
Vladimir Kutkovoy	dd3b697a74	Update server.js continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	163a550a1d	Update .drone.yml continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	2a7a4c1e3b	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	aaf71fcd96	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	c717e08aa1	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	e5a0229963	update port -> 3001 continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	faa1016918	Update .drone.yml continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	aa3d6872a2	Update server.js continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	08f7318620	Update .drone.yml continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	8c1633bcba	Update .drone.yml continuous-integration/drone/push Build encountered an error Details	1 year ago
Vladimir Kutkovoy	29abae507b	update dockerfiles continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	c60acb495f	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	68130acc70	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	b0181acb26	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	2bd0b7bfc1	Update .drone.yml continuous-integration/drone/push Build encountered an error Details	1 year ago
Vladimir Kutkovoy	11bc7e573f	Update .drone.yml continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	ead6a75ea7	Update .drone.yml continuous-integration/drone/push Build encountered an error Details	1 year ago
Vladimir Kutkovoy	61365ca1c1	Update .drone.yml continuous-integration/drone/push Build encountered an error Details	1 year ago
Vladimir Kutkovoy	eee3978591	Update .drone.yml continuous-integration/drone/push Build is passing Details	1 year ago
Vladimir Kutkovoy	510ec0f527	drone continuous-integration/drone/push Build is failing Details	1 year ago
Vladimir Kutkovoy	09be963d0f	Update drone.yml	1 year ago
Vladimir Kutkovoy	a7e2b00716	test_deploy_v1	1 year ago