Merge pull request 'Update users.json' (#103) from dsf-fix-1 into master

Reviewed-on: #103

server/index.js

@@ -81,7 +81,7 @@ app.use(require("./root"))
 app.use("/kfu-m-24-1", require("./routers/kfu-m-24-1"))
 app.use("/epja-2024-1", require("./routers/epja-2024-1"))
 app.use("/v1/todo", require("./routers/todo"))
-// app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
+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"))

server/routers/dogsitters-finder/auth.js

@@ -1,74 +0,0 @@
-const { Router } = require("express");
-const hash = require("pbkdf2-password")();
-const { promisify } = require("node:util");
-const jwt = require('jsonwebtoken')
-
-const { getAnswer } = require("../../utils/common");
-
-const { AuthModel } = require("./model/todo/auth");
-const { TOKEN_KEY } = require('./const')
-const { UserModel } = require("./model/todo/user");
-
-const { requiredValidate } = require('./utils')
-
-const router = Router();
-
-router.post(
-  "/signup",
-  requiredValidate("login", "password", "email"),
-  async (req, res, next) => {
-    const { login, password, email } = req.body
-
-    const user = await AuthModel.findOne({ login });
-
-    if (user) {
-      throw new Error("Пользователь с таким логином уже существует");
-    }
-
-    hash({ password }, async function (err, pass, salt, hash) {
-      if (err) return next(err);
-
-      const user = await UserModel.create({ login, email });
-      await AuthModel.create({ login, hash, salt, userId: user.id });
-
-      res.json(getAnswer(null, { ok: true }))
-    })
-  }
-)
-
-function authenticate(login, pass, cb) {
-    AuthModel.findOne({ login }).populate('userId').exec().then((user) => {
-    if (!user) return cb(null, null)
-
-    hash({ password: pass, salt: user.salt }, function (err, pass, salt, hash) {
-      if (err) return cb(err)
-      if (hash === user.hash) return cb(null, user)
-      cb(null, null)
-    })
-  })
-}
-
-const auth = promisify(authenticate)
-
-router.post('/signin', requiredValidate('login', 'password'), async (req, res) => {
-    const { login, password } = req.body
-
-    const user = await auth(login, password)
-
-    if (!user) {
-        throw new Error("Неверный логин или пароль")
-    }
-
-    const accessToken = jwt.sign({
-        ...JSON.parse(JSON.stringify(user.userId)),
-    }, TOKEN_KEY, {
-        expiresIn: '12h'
-    })
-
-    res.json(getAnswer(null, {
-        user: user.userId,
-        token: accessToken,
-    }))
-})
-
-module.exports = router

server/routers/dogsitters-finder/const.js

@@ -1,3 +1,2 @@
-exports.DSF_AUTH_PASSWD_MODEL_NAME = 'DSF_AUTH_PASSWD'
 exports.DSF_AUTH_USER_MODEL_NAME = 'DSF_AUTH_USER'
 exports.DSF_INTERACTION_MODEL_NAME = 'DSF_INTERACTION'

server/routers/dogsitters-finder/index.js

@@ -67,3 +67,5 @@ router.get("/auth/session", (request, response) => {
     return response.status(403).json({ error: "Invalid token" });
   }
 });
+
+module.exports = router

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

@@ -1,39 +1,69 @@
-[
+{
-    {
+    "data": [
-        "id": 1,
+        {
-        "phone_number": 89283244141,
+            "id": 1,
-        "first_name": "Вася",
+            "phone_number": "89999999999",
-        "second_name": "Пупкин",
+            "first_name": "Вася",
-        "role": "dogsitter",
+            "second_name": "Пупкин",
-        "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12",
+            "role": "dogsitter",
-        "price": 1500,
+            "location": "Россия, республика Татарстан, Казань, Пушкина, 12",
-        "about_me": "Я люблю собак"
+            "price": "1500",
-    },
+            "about_me": "Я люблю собак!",
-    {
+            "rating": 5,
-        "id": 2,
+            "ratings": [
-        "phone_number": 89272844541,
+                5,
-        "first_name": "Ваня",
+                5
-        "second_name": "Пуськин",
+            ],
-        "role": "dogsitter",
+            "tg": "jullllllie"
-        "location": "Россия, республика Татарстан, Казань, улица Абсалямова, 19",
+        },
-        "price": 1000000,
+        {
-        "about_me": "Я не люблю собак. И вообще я котоман."
+            "id": 2,
-    },
+            "phone_number": 89272844541,
-    {
+            "first_name": "Ваня",
-        "id": 3,
+            "second_name": "Пуськин",
-        "phone_number": 89872855893,
+            "role": "dogsitter",
-        "first_name": "Гадий",
+            "location": "Россия, республика Татарстан, Казань, улица Абсалямова, 19",
-        "second_name": "Петрович",
+            "price": 2000,
-        "role": "owner"
+            "about_me": "Я не люблю собак. И вообще я котоман.",
-    },
+            "rating": 4,
-    {
+            "ratings": [
-        "id": 4,
+                4,
-        "phone_number": 89872844591,
+                4
-        "first_name": "Галкин",
+            ],
-        "second_name": "Максим",
+            "tg": "vanya006"
-        "role": "dogsitter",
+        },
-        "location": "Россия, республика Татарстан, Казань, проспект Ямашева, 83",
+        {
-        "price": 1000000,
+            "id": 3,
-        "about_me": "Миллион алых роз"
+            "phone_number": 89559999999,
-    }
+            "first_name": "Гадий",
-]
+            "second_name": "Петрович",
+            "role": "owner"
+        },
+        {
+            "id": 4,
+            "phone_number": 89872844591,
+            "first_name": "Галкин",
+            "second_name": "Максим",
+            "role": "dogsitter",
+            "location": "Россия, республика Татарстан, Казань, проспект Ямашева, 83",
+            "price": 1750,
+            "about_me": "Миллион алых роз",
+            "rating": 4.5,
+            "ratings": [
+                4,
+                5
+            ],
+            "tg": "maks100500"
+        }
+    ],
+    "interactions": [
+        {
+            "owner_id": 3,
+            "dogsitter_id": 4
+        },
+        {
+            "owner_id": 1,
+            "dogsitter_id": 2
+        }
+    ]
+}

server/routers/dogsitters-finder/model/auth.js

@@ -1,44 +0,0 @@
-const { Schema, model } = require("mongoose");
-
-const {
-  DSF_AUTH_PASSWD_MODEL_NAME,
-  DSF_AUTH_USER_MODEL_NAME,
-} = require("../../const");
-
-const schema = new Schema({
-  login: { 
-    type: String, 
-    required: true, 
-    unique: true
-  },
-  hash: { 
-    type: String, 
-    required: true 
-  },
-  salt: { 
-    type: String, 
-    required: true 
-  },
-  userId: { 
-    type: Schema.Types.ObjectId, 
-    ref: DSF_AUTH_USER_MODEL_NAME 
-  },
-  created: {
-    type: Date,
-    default: () => new Date().toISOString(),
-  },
-});
-
-schema.set("toJSON", {
-  virtuals: true,
-  versionKey: false,
-  transform: function (doc, ret) {
-    delete ret._id;
-  },
-});
-
-schema.virtual("id").get(function () {
-  return this._id.toHexString();
-});
-
-exports.AuthModel = model(DSF_AUTH_PASSWD_MODEL_NAME, schema);