From 524c1f135a695ffcb6ab791b91d5d4ce22fc9768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Thu, 28 Dec 2023 14:23:04 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B0=D0=B9=20=D0=B1=D0=BE=D0=B3=20?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=BE=D1=80=D0=BE=D0=B2=D1=8C=D1=8F=20=D0=90=D0=BD?=
 =?UTF-8?q?=D0=B4=D1=80=D0=B5=D1=8E,=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B3=20?=
 =?UTF-8?q?=D0=BE=D1=82=D1=87=D0=B8=D1=81=D1=82=D0=B8=D1=82=D1=8C=20=D0=BA?=
 =?UTF-8?q?=D0=B5=D1=88=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=82=D1=87=D0=B5?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myapplication/api/MyServerService.kt      |  2 +-
 server/data.json                              | 20 +++++++++++++++++--
 server/router.js                              |  4 ++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/myapplication/api/MyServerService.kt b/app/src/main/java/com/example/myapplication/api/MyServerService.kt
index b8be1d6..7a8e222 100644
--- a/app/src/main/java/com/example/myapplication/api/MyServerService.kt
+++ b/app/src/main/java/com/example/myapplication/api/MyServerService.kt
@@ -150,7 +150,7 @@ interface MyServerService {
         //Раздача с тлф
         private const val BASE_URL = "http://192.168.138.47:8079/"
         //Пк дома
-/*        private const val BASE_URL = "http://192.168.0.104:8079/"*/
+        /*private const val BASE_URL = "http://192.168.0.104:8079/"*/
         //private const val BASE_URL = "http://10.0.2.2:8079/"
 
         @Volatile
diff --git a/server/data.json b/server/data.json
index b996f4e..331e453 100644
--- a/server/data.json
+++ b/server/data.json
@@ -4,7 +4,14 @@
       "id": 1,
       "login": "admin",
       "role": "admin",
-      "password": "admin"
+      "password": "admin",
+      "items": [
+        {
+          "id": 7,
+          "count": 5,
+          "bikeId": 8
+        }
+      ]
     },
     {
       "id": 2,
@@ -116,10 +123,19 @@
       "id": 7,
       "dateTime": 2030,
       "weight": 10,
-      "radius": 20,
+      "radius": 30,
       "colorbike": "Красный",
       "maxCount": 10,
       "bikeId": 8
+    },
+    {
+      "dateTime": 2003,
+      "weight": 15.7,
+      "radius": 16.5,
+      "colorbike": "Жёлтый",
+      "maxCount": 10,
+      "bikeId": 7,
+      "id": 8
     }
   ],
   "bikes": [
diff --git a/server/router.js b/server/router.js
index ba6f8f5..d2db700 100644
--- a/server/router.js
+++ b/server/router.js
@@ -3,6 +3,8 @@ const data = require('./data.json');
 module.exports = (req, res, next) => {
   if (req.url.startsWith('/search') && req.method === 'GET') {
     try {
+      delete require.cache[require.resolve('./data.json')];
+      const data = require('./data.json');
       const searchText = req.query.name;
       const searched = data.products.filter(
         (product) =>
@@ -15,6 +17,8 @@ module.exports = (req, res, next) => {
     }
   } else if (req.url.startsWith('/report') && req.method === 'GET') {
     try {
+      delete require.cache[require.resolve('./data.json')];
+      const data = require('./data.json');
       // Добавляем фильтрацию по полю dateTime
       const fromDate = req.query.fromDate;
       const toDate = req.query.toDate;