Merge pull request 'feat: add dry wash json' (#44) from feature/dry-wash-arm into master

Reviewed-on: #44

d-scripts/rerun.sh

@@ -3,4 +3,4 @@
 docker stop ms-mongo
 docker volume remove ms_volume
 docker volume create ms_volume
-docker run --rm -v ms_volume:/data/db --name ms-mongo -p 27017:27017 -d mongo:4.4.13
+docker run --rm -v ms_volume:/data/db --name ms-mongo -p 27017:27017 -d mongo:8.0.3

docker-compose.yaml

@@ -1,18 +1,19 @@
 version: "3"
 
 volumes:
-    ms_volume:
+    ms_volume8:
 
 services:
     mongoDb:
-        image: mongo:4.4.13
+        image: mongo:8.0.3
         volumes:
-            - ms_volume:/data/db
+            - ms_volume8:/data/db
         restart: always
         # ports:
         #     - 27017:27017
     multy-stubs:
-        build: .
+        # build: .
+        image: bro.js/ms/bh:$TAG
         restart: always
         ports:
             - 8044:8044

server/index.js

@@ -44,6 +44,10 @@ app.use(require('./root'))
  */
 app.use('/epja-2024-1', require('./routers/epja-2024-1'))
 app.use('/todo', require('./routers/todo/routes'))
+app.use('/dogsitters-finder', require('./routers/dogsitters-finder'))
+app.use('/kazan-explore', require('./routers/kazan-explore'))
+app.use('/edateam', require('./routers/edateam-legacy'))
+app.use('/dry-wash', require('./routers/dry-wash'))
 
 app.use(require('./error'))
 

server/routers/dogsitters-finder/index.js

@@ -0,0 +1,35 @@
+const router = require('express').Router();
+
+router.get("/users", (request, response) => {
+    response.send(require("./json/users/users.json"))
+})
+
+router.post("/auth", (request, response) => {
+    const {phoneNumber, password} = request.body;
+    console.log(phoneNumber, password);
+    if (phoneNumber === '89999999999') {
+        response.send(require("./json/auth/dogsitter.success.json"))
+    }
+    else if (phoneNumber === '89555555555') {
+        response.status(400).send(require("./json/auth/error.json"))
+    }
+    else {
+        response.send(require("./json/auth/owner.success.json"))
+    }
+})
+
+router.post("/register", (request, response) => {
+    const {firstName, secondName, phoneNumber, password, role} = request.body;
+    console.log(phoneNumber, password, role);
+    if (phoneNumber === '89283244141' || phoneNumber === '89872855893') {
+        response.status(400).send(require("./json/register/error.json"))
+    }
+    else if (role === 'dogsitter') {
+        response.send(require("./json/register/dogsitter.success.json"))
+    }
+    else {
+        response.send(require("./json/register/owner.success.json"))
+    }
+})
+
+module.exports = router;

server/routers/dogsitters-finder/json/auth/dogsitter.success.json

@@ -0,0 +1,12 @@
+{
+    "data": {
+        "id": 1,
+        "phoneNumber": 89283244141,
+        "firstName": "Вася",
+        "secondName": "Пупкин",
+        "role": "dogsitter",
+        "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12",
+        "price": 1500,
+        "aboutMe": "Я люблю собак"
+    }
+}

server/routers/dogsitters-finder/json/auth/error.json

@@ -0,0 +1,3 @@
+{
+    "error": "Пользователь не найден"
+}

server/routers/dogsitters-finder/json/auth/owner.success.json

@@ -0,0 +1,9 @@
+{
+    "data": {
+        "id": 3,
+        "phoneNumber": 89872855893,
+        "firstName": "Гадий",
+        "secondName": "Петрович",
+        "role": "owner"
+    }
+}

server/routers/dogsitters-finder/json/register/dogsitter.success.json

@@ -0,0 +1,12 @@
+{
+    "data": {
+        "id": 5,
+        "phoneNumber": 89555555555,
+        "firstName": "Масяня",
+        "secondName": "Карлова",
+        "role": "dogsitter",
+        "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12",
+        "price": 100,
+        "aboutMe": "Все на свете - собаки"
+    }
+}

server/routers/dogsitters-finder/json/register/error.json

@@ -0,0 +1,3 @@
+{
+    "error": "Пользователь с таким номером телефона уже существует"
+}

server/routers/dogsitters-finder/json/register/owner.success.json

@@ -0,0 +1,9 @@
+{
+    "data": {
+        "id": 6,
+        "phoneNumber": 89888888888,
+        "firstName": "Генадий",
+        "secondName": "Паровозов",
+        "role": "owner"
+    }
+}

server/routers/dogsitters-finder/json/users/users.json

@@ -2,7 +2,6 @@
     {
         "id": 1,
         "phone_number": 89283244141,
-        "password": "1234",
         "first_name": "Вася",
         "second_name": "Пупкин",
         "role": "dogsitter",
@@ -13,7 +12,6 @@
     {
         "id": 2,
         "phone_number": 89272844541,
-        "password": "1234",
         "first_name": "Ваня",
         "second_name": "Пуськин",
         "role": "dogsitter",
@@ -24,7 +22,6 @@
     {
         "id": 3,
         "phone_number": 89872855893,
-        "password": "12345",
         "first_name": "Гадий",
         "second_name": "Петрович",
         "role": "owner"
@@ -32,10 +29,9 @@
     {
         "id": 4,
         "phone_number": 89872844591,
-        "password": "12345",
         "first_name": "Галкин",
         "second_name": "Максим",
-        "role": ["owner", "dogsitter"],
+        "role": "dogsitter",
         "location": "Россия, республика Татарстан, Казань, проспект Ямашева, 83",
         "price": 1000000,
         "about_me": "Миллион алых роз"

server/routers/dry-wash/index.js

@@ -0,0 +1,15 @@
+const router = require('express').Router()
+
+router.get('/arm/masters', (req, res) => {
+    res
+        .status(200)
+        .send(require("./json/arm-masters/success.json"))
+})
+
+router.get('/arm/orders', (req, res) => {
+    res
+        .status(200)
+        .send(require(`./json/arm-orders/success.json`))
+})
+
+module.exports = router

server/routers/dry-wash/json/arm-masters/success.json

@@ -0,0 +1,35 @@
+{
+  "success": true,
+  "body": [
+    {
+      "id": "masters1",
+      "name": "Иван Иванов",
+      "schedule": [ {
+        "id": "order1",
+        "startWashTime": "2024-11-24T10:30:00.000Z",
+        "endWashTime": "2024-11-24T16:30:00.000Z"
+      },
+        {
+          "id": "order2",
+          "startWashTime": "2024-11-24T11:30:00.000Z",
+          "endWashTime": "2024-11-24T17:30:00.000Z"
+        }],
+      "phone": "+7 900 123 45 67"
+    },
+    {
+      "id": "masters12",
+      "name": "Иван Иванов",
+      "schedule": [ {
+        "id": "order1",
+        "startWashTime": "2024-11-24T10:30:00.000Z",
+        "endWashTime": "2024-11-24T16:30:00.000Z"
+      },
+        {
+          "id": "order2",
+          "startWashTime": "2024-11-24T11:30:00.000Z",
+          "endWashTime": "2024-11-24T17:30:00.000Z"
+        }],
+      "phone": "+7 900 123 45 67"
+    }
+  ]
+}

server/routers/dry-wash/json/arm-orders/success.json

@@ -0,0 +1,25 @@
+{
+  "success": true,
+  "body": [
+    {
+      "id": "order1",
+      "carNumber": "A123BC",
+      "startWashTime": "2024-11-24T10:30:00.000Z",
+      "endWashTime": "2024-11-24T16:30:00.000Z",
+      "orderDate": "2024-11-24T08:41:46.366Z",
+      "status": "progress",
+      "phone": "79001234563",
+      "location": "Казань, ул. Баумана, 1"
+    },
+    {
+      "id": "order2",
+      "carNumber": "A245BC",
+      "startWashTime": "2024-11-24T11:30:00.000Z",
+      "endWashTime": "2024-11-24T17:30:00.000Z",
+      "orderDate": "2024-11-24T07:40:46.366Z",
+      "status": "progress",
+      "phone": "79001234567",
+      "location": "Казань, ул. Баумана, 43"
+    }
+  ]
+}

server/routers/edateam-legacy/index.js

@@ -0,0 +1,15 @@
+const router = require('express').Router();
+
+router.get('/recipe-data', (request, response) => {
+    response.send(require('./json/recipe-data/success.json'))
+  })
+
+router.get('/userpage-data', (req, res)=>{
+  res.send(require('./json/userpage-data/success.json'))
+})
+
+router.get('/homepage-data', (req, res)=>{
+  res.send(require('./json/homepage-data/success.json'))
+})
+
+module.exports = router;

server/routers/edateam-legacy/json/homepage-data/success.json

@@ -0,0 +1,112 @@
+{
+    "data": [
+        {
+            "src": "pancakes_meat",
+            "alt": "Фотография блинчиков с мясом, сыром и луком",
+            "href": "?=dish01",
+            "name": "Блинчики с мясом, сыром и лучком",
+            "category": [
+                "Ужины"
+            ]
+        },
+        {
+            "src": "cheesecakes",
+            "alt": "Фотография сырников из творога",
+            "href": "?=dish02",
+            "name": "Сырники из творога",
+            "category": [
+                "Завтраки"
+            ]
+        },
+        {
+            "src": "borsch",
+            "alt": "Фотография борща",
+            "href": "?=dish03",
+            "name": "Борщ",
+            "category": [
+                "Супы"
+            ]
+        },
+        {
+            "src": "vareniki",
+            "alt": "Фотография вареников",
+            "href": "?=dish04",
+            "name": "Ленивые вареники",
+            "category": [
+                "Ужины"
+            ]
+        },
+        {
+            "src": "rice_porridge",
+            "alt": "Фотография рисовой каши",
+            "href": "?=dish05",
+            "name": "Рисовая каша",
+            "category": [
+                "Завтраки"
+            ]
+        },
+        {
+            "src": "cutlets",
+            "alt": "Фотография котлет по-киевски",
+            "href": "?=dish06",
+            "name": "Котлеты по-киевски",
+            "category": [
+                "Обеды"
+            ]
+        },
+        {
+            "src": "draniki",
+            "alt": "Фотография драников",
+            "href": "?=dish07",
+            "name": "Драники",
+            "category": [
+                "Обеды"
+            ]
+        },
+        {
+            "src": "meringue",
+            "alt": "Фотография безе",
+            "href": "?=dish08",
+            "name": "Безе",
+            "category": [
+                "Выпечка и десерты"
+            ]
+        },
+        {
+            "src": "goulash",
+            "alt": "Фотография гуляша",
+            "href": "?=dish09",
+            "name": "Гуляш",
+            "category": [
+                "Мясо"
+            ]
+        },
+        {
+            "src": "pancakes_cherries",
+            "alt": "Фотография блинчиков с вишней и творожным сыром",
+            "href": "?=dish10",
+            "name": "Блинчики с вишней и творожным сыром",
+            "category": [
+                "Завтраки"
+            ]
+        },
+        {
+            "src": "canned_soup",
+            "alt": "Фотография супа из рыбных консервов",
+            "href": "?=dish11",
+            "name": "Суп из рыбных консервов",
+            "category": [
+                "Супы"
+            ]
+        },
+        {
+            "src": "salad",
+            "alt": "Фотография салата",
+            "href": "?=dish12",
+            "name": "Салат \"Весенний\"",
+            "category": [
+                "Салаты"
+            ]
+        }
+    ]
+}

server/routers/edateam-legacy/json/recipe-data/success.json

@@ -0,0 +1,58 @@
+{
+    "name":"Блинчики с вишней и творожным сыром",
+
+    "stages":
+[
+    "Смешать муку, молоко, яйца, сахар и соль в миске",
+    "Добавить вишню в тесто и перемешать",
+    "Вылить тесто на разогретую сковороду и обжарить с двух сторон до золотистого цвета",
+    "Подавать блинчики, украсив творожным сыром сверху"
+],
+
+    "table":
+[
+    { "ingredient": "1", 
+    "weight": "500 гр", 
+    "price1": "500р.", 
+    "price2": "439р.", 
+    "price3": "600р." },
+
+    { "ingredient": "Ингредиент 2", 
+    "weight": "2 шт", 
+    "price1": "120р.", 
+    "price2": "150р.", 
+    "price3": "130р." },
+    
+    { "ingredient": "Ингредиент 3", 
+    "weight": "500 гр", 
+    "price1": "12р.", 
+    "price2": "12.99р.", 
+    "price3": "10р." },
+
+    { "ingredient": "Ингредиент 4", 
+    "weight": "500 гр", 
+    "price1": "500р.",
+    "price2": "439р.", 
+    "price3": "600р." },
+
+    { "ingredient": "Ингредиент 5", 
+    "weight": "500 гр", 
+    "price1": "500р.",
+    "price2": "439р.", 
+    "price3": "600р." },
+
+    { "ingredient": "Ингредиент 6", 
+    "weight": "500 гр", 
+    "price1": "500р.",
+    "price2": "439р.", 
+    "price3": "600р." }
+],
+
+    "tags": 
+[
+    { "name": "#блины", "href": "#01" },
+    { "name": "#вишня", "href": "#02" },
+    { "name": "#молоко"," href": "#03" }
+]
+
+}

server/routers/edateam-legacy/json/userpage-data/success.json

@@ -0,0 +1,30 @@
+{
+    "data":{
+        "id":1,
+        "loginname":"Логин пользователя",
+        "datesignin":"2024/05/18",
+        "favoritedishes":
+            [
+        {"id":1,
+        "dishlink":"?=dish1",
+        "dishname":"Блюдо1"
+        },
+        {"id":2,
+        "dishlink":"?=dish2",
+        "dishname":"Блюдо2"
+        },
+        {"id":3,
+        "dishlink":"?=dish3",
+        "dishname":"Блюдо3"
+        },
+        {"id":4,
+        "dishlink":"?=dish4",
+        "dishname":"Блюдо4"
+        },
+        {"id":5,
+        "dishlink":"?=dish5",
+        "dishname":"Блюдо5"
+        }
+    ]        
+    }
+}

server/routers/old/dogsitters-finder/index.js

@@ -1,9 +0,0 @@
-const { response } = require('express');
-
-const router = require('express').Router();
-
-router.get("/users", (request, response) => {
-    response.send(require("./json/users.json"))
-})
-
-module.exports = router;