Compare commits

..

9 Commits

Author SHA1 Message Date
f7ac265e3b Replace users.json to users/ folder
All checks were successful
platform/multy-stub/pipeline/head This commit looks good
2024-11-30 16:04:59 +03:00
d46841c21f Update paths to json files 2024-11-30 14:54:07 +03:00
940349af29 Update stubs DogsittersFinder 2024-11-30 12:16:27 +03:00
268824c108 Added multy stub for project kazan-explore 2024-11-26 19:49:01 +03:00
Primakov Alexandr Alexandrovich
550554a7a5 docker compose by tag 2024-11-25 22:40:47 +03:00
f5a8585845 Merge pull request 'Перемещена папка dogsitters-finder в routes. Добавлен путь в index.js' (#41) from dogsitters-finder-3 into master
Reviewed-on: #41
2024-11-25 21:22:24 +03:00
1e67f25066 Перемещена папка dogsitters-finder в routes. Добавлен путь в index.js 2024-11-25 20:42:38 +03:00
bbc315e270 Merge pull request 'get count by modelname' (#38) from feature/check-jenkins into master
Reviewed-on: #38
2024-10-16 11:57:57 +03:00
Primakov Alexandr Alexandrovich
fbb5d26c8f get count by modelname
All checks were successful
platform/multy-stub/pipeline/head This commit looks good
2024-10-16 11:55:42 +03:00
25 changed files with 101 additions and 17 deletions

View File

@@ -12,7 +12,8 @@ services:
# ports: # ports:
# - 27017:27017 # - 27017:27017
multy-stubs: multy-stubs:
build: . # build: .
image: bro.js/ms/bh:$TAG
restart: always restart: always
ports: ports:
- 8044:8044 - 8044:8044

View File

@@ -44,6 +44,8 @@ app.use(require('./root'))
*/ */
app.use('/epja-2024-1', require('./routers/epja-2024-1')) app.use('/epja-2024-1', require('./routers/epja-2024-1'))
app.use('/todo', require('./routers/todo/routes')) 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(require('./error')) app.use(require('./error'))

View File

@@ -10,14 +10,23 @@ const folderPath = path.resolve(__dirname, './routers')
const folders = fs.readdirSync(folderPath) const folders = fs.readdirSync(folderPath)
router.get('/', async (req, res) => { router.get('/', async (req, res) => {
res.send(` res.send(`
<h1>multy stub is working v${pkg.version}</h1> <h1>multy stub is working v${pkg.version}</h1>
<ul> <ul>
${folders.map((f) => `<li>${f}</li>`).join('')} ${folders.map((f) => `<li>${f}</li>`).join('')}
</ul> </ul>
<h2>models</h2> <h2>models</h2>
<ul>${(await mongoose.modelNames()).map((name) => `<li>${name}</li>`)}</ul> <ul>${
(await Promise.all(
(
await mongoose.modelNames()).map(async (name) => {
const count = await mongoose.model(name).countDocuments()
return `<li>${name} - ${count}</li>`
}
)
)).map(t => t).join(' ')
}</ul>
`) `)
}) })

View File

@@ -0,0 +1,37 @@
const { response } = require('express');
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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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;