Merge pull request 'feat: add get master with orders' (#68) from feat/get-master into master

Reviewed-on: #68

server/routers/dry-wash/arm-master.js

@@ -1,16 +1,40 @@
 const router = require('express').Router()
 const {MasterModel} = require('./model/master')
 const mongoose = require("mongoose")
+const {OrderModel} = require("./model/order")
 
 
-router.get('/masters', async (req, res,next) => {
+router.get("/masters", async (req, res, next) => {
     try {
-        const master = await MasterModel.find({})
-        res.status(200).send({success: true, body: master})
+        const masters = await MasterModel.find({});
+        const orders = await OrderModel.find({});
+
+        const mastersWithOrders = masters.map((master) => {
+            const masterOrders = orders.filter((order) => {
+                return (
+                    order?.master && order.master.toString() === master._id.toString()
+                );
+            });
+
+            const schedule = masterOrders.map((order) => ({
+                id: order._id,
+                startWashTime: order.startWashTime,
+                endWashTime: order.endWashTime,
+            }));
+
+            return {
+                id: master._id,
+                name: master.name,
+                schedule: schedule,
+                phone: master.phone,
+            };
+        });
+
+        res.status(200).send({ success: true, body: mastersWithOrders });
     } catch (error) {
-        next(error)
+        next(error);
     }
-})
+});
 
 router.delete('/masters/:id', async (req, res,next) => {
     const { id } = req.params;

server/routers/kazan-explore/const.js

@@ -0,0 +1,3 @@
+exports.KAZAN_EXPLORE_RESULTS_MODEL_NAME = 'KAZAN_EXPLORE_RESULTS'
+
+exports.TOKEN_KEY = "KAZAN_EXPLORE_TOP_SECRET_TOKEN_KEY"

server/routers/kazan-explore/index.js

@@ -1,211 +1,250 @@
-const router = require('express').Router();
-
-
-// First page
-router.get('/getInfoAboutKazan', (request, response) => {
-    const lang = request.query.lang || 'ru'; // Получаем язык из параметров запроса
-    try {
-        const data = require('./json/first/info-about-kazan/success.json'); // Загружаем весь JSON
-        const translatedData = data[lang] || data['ru']; // Выбираем перевод по языку или дефолтный
-        response.send(translatedData); // Отправляем перевод клиенту
-    } catch (error) {
-        response.status(500).send({ message: 'Internal server error' }); // Ошибка в случае проблем с JSON
-    }
-});
-
-router.get('/getNews', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/first/news/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Sport page
-router.get('/getFirstText', (request, response) => {
-    const lang = request.query.lang || 'ru'; // Получаем язык из параметров
-    try {
-        const data = require('./json/sport/first-text/success.json'); // Загружаем JSON
-        const translatedData = data[lang] || data['ru']; // Берём перевод или дефолтный
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' }); // Обработка ошибки
-    }
-});
-
-router.get('/getSecondText', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/sport/second-text/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-});
-
-router.get('/getSportData', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/sport/sport-list/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-router.get('/getSportQuiz', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/sport/quiz/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Places page
-router.get('/getPlacesData', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/places/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Transport page
-router.get('/getInfoAboutTransportPage', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/transport/info-about-page/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-router.get('/getBus', (request, response) => {
-    response.send(require('./json/transport/bus-numbers/success.json'))
-})
-
-router.get('/getTral', (request, response) => {
-    response.send(require('./json/transport/tral-numbers/success.json'))
-})
-
-router.get('/getEvents', (request, response) => {
-    response.send(require('./json/transport/events-calendar/success.json'))
-})
-
-router.get('/getTripSchedule', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/transport/trip-schedule/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// History page
-router.get('/getHistoryText', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/history/text/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getHistoryList', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/history/list/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Education page
-router.get('/getInfoAboutEducation', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/education/text/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getEducationList', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/education/cards/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getInfoAboutKFU', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/education/kfu/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-
-// Login
-router.post('/entrance', (request, response) => {
-    const { email, password } = request.body.entranceData;
-
-    try {
-        const users = require('./json/users-information/success.json');
-        const user = users.data.find(user => user.email === email && user.password === password);
-
-        if (!user) {
-            return response.status(401).send('Неверные учетные данные');
-        }
-
-        const responseObject = {
-            email: user.email,
-        }
-
-        return response.json(responseObject);
-    } catch (error) {
-        console.error('Ошибка чтения файла:', error);
-        response.status(500).send('Внутренняя ошибка сервера');
-    }
-})
-
-router.post('/registration', async (request, response) => {
-    const { email, password, confirmPassword } = request.body.registerData;
-
-    try {
-        if (password !== confirmPassword) {
-            return response.status(400).send('Пароли не совпадают!');
-        }
-        const users = require('./json/users-information/success.json');
-
-        const existingUser = users.data.find(user => user.email === email);
-
-        if (existingUser) {
-            return response.status(400).send('Пользователь с такой почтой уже существует!');
-        }
-
-        return response.json({ email: email });
-    } catch (error) {
-        console.error('Ошибка регистрации пользователя:', error);
-        response.status(500).send('Внутренняя ошибка сервера');
-    }
-});
-
-module.exports = router;
+const router = require('express').Router();
+const { ResultsModel } = require('./model/results')
+
+
+
+router.get('/getQuizResults/:userId', async (request, response) => {
+    const { userId } = request.params;
+
+    try {
+        const results = await ResultsModel.findOne({ userId : userId }).exec();
+
+        if (!results) {
+            return response.status(404).send({ message: 'Quiz results not found' });
+        }
+
+        response.send(results.items);
+    } catch (error) {
+        response.status(500).send({ message: 'An error occurred while fetching quiz results' });
+    }
+});
+
+router.post('/addQuizResult', async (request, response) => {
+    const { userId, quizId, result } = request.body;
+
+    if (!userId || !quizId || !result) {
+        return response.status(400).send({ message: 'Invalid input data' });
+    }
+    try {
+        let userResults = await ResultsModel.findOne({ userId : userId }).exec();
+        if (!userResults) {
+            userResults = new ResultsModel({ userId, items: [] });
+        }
+        userResults.items.push({ quizId, result });
+        await userResults.save();
+
+        response.status(200).send({ message: 'Quiz result added successfully', data: userResults });
+    } catch (error) {
+        response.status(500).send({ message: 'An error occurred while adding quiz result' });
+    }
+});
+
+
+// First page
+router.get('/getInfoAboutKazan', (request, response) => {
+    const lang = request.query.lang || 'ru'; 
+    try {
+        const data = require('./json/first/info-about-kazan/success.json'); 
+        const translatedData = data[lang] || data['ru']; 
+        response.send(translatedData); 
+    } catch (error) {
+        response.status(500).send({ message: 'Internal server error' }); 
+    }
+});
+
+router.get('/getNews', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/first/news/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Sport page
+router.get('/getFirstText', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/sport/first-text/success.json');
+        const translatedData = data[lang] || data['ru']; 
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' }); 
+    }
+});
+
+router.get('/getSecondText', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/sport/second-text/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+});
+
+router.get('/getSportData', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/sport/sport-list/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+router.get('/getSportQuiz', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/sport/quiz/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Places page
+router.get('/getPlacesData', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/places/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Transport page
+router.get('/getInfoAboutTransportPage', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/transport/info-about-page/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+router.get('/getBus', (request, response) => {
+    response.send(require('./json/transport/bus-numbers/success.json'))
+})
+
+router.get('/getTral', (request, response) => {
+    response.send(require('./json/transport/tral-numbers/success.json'))
+})
+
+router.get('/getEvents', (request, response) => {
+    response.send(require('./json/transport/events-calendar/success.json'))
+})
+
+router.get('/getTripSchedule', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/transport/trip-schedule/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// History page
+router.get('/getHistoryText', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/history/text/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getHistoryList', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/history/list/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Education page
+router.get('/getInfoAboutEducation', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/education/text/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getEducationList', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/education/cards/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getInfoAboutKFU', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/education/kfu/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+
+// Login
+router.post('/entrance', (request, response) => {
+    const { email, password } = request.body.entranceData;
+
+    try {
+        const users = require('./json/users-information/success.json');
+        const user = users.data.find(user => user.email === email && user.password === password);
+
+        if (!user) {
+            return response.status(401).send('Неверные учетные данные');
+        }
+
+        const responseObject = {
+            email: user.email,
+        }
+
+        return response.json(responseObject);
+    } catch (error) {
+        console.error('Ошибка чтения файла:', error);
+        response.status(500).send('Внутренняя ошибка сервера');
+    }
+})
+
+router.post('/registration', async (request, response) => {
+    const { email, password, confirmPassword } = request.body.registerData;
+
+    try {
+        if (password !== confirmPassword) {
+            return response.status(400).send('Пароли не совпадают!');
+        }
+        const users = require('./json/users-information/success.json');
+
+        const existingUser = users.data.find(user => user.email === email);
+
+        if (existingUser) {
+            return response.status(400).send('Пользователь с такой почтой уже существует!');
+        }
+
+        return response.json({ email: email });
+    } catch (error) {
+        console.error('Ошибка регистрации пользователя:', error);
+        response.status(500).send('Внутренняя ошибка сервера');
+    }
+});
+
+module.exports = router;

server/routers/kazan-explore/model/results.js

@@ -0,0 +1,27 @@
+const { Schema, model } = require('mongoose')
+
+const { KAZAN_EXPLORE_RESULTS_MODEL_NAME } = require('../const')
+
+const schema = new Schema({
+    userId: { type: String },
+    items: [
+        {
+          quizId: { type: String },
+          result: { type: Number }
+        }
+    ]
+})
+
+schema.set('toJSON', {
+    virtuals: true,
+    versionKey: false,
+    transform: function (doc, ret) {
+        delete ret._id
+    }
+})
+
+schema.virtual('id').get(function () {
+    return this._id.toHexString()
+})
+
+exports.ResultsModel = model(KAZAN_EXPLORE_RESULTS_MODEL_NAME, schema)