Изменены запросы и добавлены новые

Reviewed-on: https://git.bro-js.ru/bro-students/multy-stub/pulls/88

.bzr/legacy/basket/controller.js

@@ -1,7 +1,7 @@
 const ObjectId = require('mongodb').ObjectID
 const getHash = require('pbkdf2-password')()
 
-const { getDB } = require('../../utils/mongo')
+const { getDB } = require('../../../utils/mongo')
 
 const USERS_COLLECTION = 'users'
 const LISTS_COLLECTION = 'lists'

.bzr/legacy/coder/controllers.js

@@ -1,4 +1,4 @@
-const { getDB } = require('../../utils/mongo')
+const { getDB } = require('../../../utils/mongo')
 
 let db = null
 

.bzr/legacy/coder/forum/index.js

@@ -1,6 +1,6 @@
 const router = require('express').Router();
 
-const { getResponse } = require('../../../utils/common');
+const { getResponse } = require('../../../../utils/common');
 const {
     getTags,
     connect,

.bzr/legacy/easy-project/db.js

@@ -1,7 +1,7 @@
 const { v4: uuid } = require('uuid')
 const ObjectId = require('mongodb').ObjectID
 
-const { getDB } = require('../../utils/mongo')
+const { getDB } = require('../../../utils/mongo')
 const { _idToId, checkDB, _idToIdArray, filterId } = require('./utils')
 
 let db = null

.bzr/legacy/edateam/auth.js

@@ -0,0 +1,36 @@
+const router = require('express').Router();
+const checkPassword = require('pbkdf2-password')();
+const jwt = require('jsonwebtoken');
+const {EDATEAM_JWT_TOKEN}  = require('./key');
+
+const {getUser, _idToId, getResponse, requiredFields, signUp} = require('./controllers');
+
+router.post('/sign-in', requiredFields(['email','password']), async (req, res)=>{
+    try{
+        const user = await getUser(req.body);
+        
+        checkPassword({password:req.body.password, salt:user.salt},async(err, pass, salt, hash )=>{
+            if(err){
+                throw new Error(err);
+            }
+            
+            if(user.password === hash){
+                const {password, salt:_salt, ...rest} = user;
+                const token = jwt.sign(_idToId(rest), EDATEAM_JWT_TOKEN);
+                return res.send(getResponse(null, token));
+            }    
+            return res.status(400).send(getResponse('Wrong email or password!'));        
+        } )
+    }
+    catch(error){
+        res.status(400).send(getResponse(error.message));
+    }
+});
+
+router.post('/sign-up', requiredFields(['email', 'login', 'password']), async (req, res) => {
+    let error = null
+    const data = await signUp(req.body).catch((e) => error = e.message)
+    return res.status(error ? 400 : 200).send(getResponse(error, data))
+})
+
+module.exports = router;

.bzr/legacy/edateam/controllers.js

@@ -0,0 +1,217 @@
+const ObjectId = require('mongodb').ObjectId;
+const getHash = require('pbkdf2-password')();
+const { getDB } = require('../../../utils/mongo');
+
+const USERS_COLLECTION = 'users';
+const RECIPES_COLLECTION = 'recipes_collection';
+const FAVORITES_USER = 'favorites_user'
+let db =null;
+
+const connect = async () => {
+    db = await getDB('edateam');
+};
+
+const init = async () => {
+    await connect();
+};
+
+init();
+
+const _idToId = (data) => {
+    const { _id, ...rest } = data;
+    return {
+        id: _id,
+        ...rest
+    };
+}
+
+const _idToArray = (data) => {
+    const _idToMap = data.map((item) => _idToId(item));
+    return _idToMap;
+}
+
+const getResponse = (error, data, success = true) => {
+    if (error) {
+        return {
+            success: false,
+            error,
+        }
+    }
+
+    return {
+        success,
+        data,
+    }
+}
+
+const signUp = async ({ email, login, password }) => {
+    try {
+    db = await getDB('edateam');
+    const userCollection = db.collection(USERS_COLLECTION);
+
+    const userData = await userCollection.findOne({
+        $or: [
+            { login },
+            { email }
+        ]
+    })
+
+    if (userData?.login === login) {
+        throw new Error('This login already in db!\nPlease come up with another login!');
+    }
+
+    if (userData?.email === email) {
+        throw new Error('This email already in db!\nPlease come up with another email!');
+    }
+    
+    return new Promise((resolve, reject) => {
+        getHash({ password }, async (err, pass, salt, hash) => {
+            if (err) {
+                return reject(err);
+            }
+            const insertedCount  = await userCollection.insertOne({ email, login, password: hash, salt });
+            
+            if (!insertedCount) {
+                return reject(new Error('Insert error!'));
+            }
+            resolve({});
+        });
+    });
+   
+    } catch (error) {
+        console.error(error);
+        throw error;
+    }
+};
+
+const getUser = async ({ email }) => {
+    if (db === null) {
+        throw new Error('no db connection :((');
+    }
+
+    try {
+        const userCollection = db.collection(USERS_COLLECTION);
+        const userData = await userCollection.findOne({ email });
+        if (userData) {
+            return userData;
+        }
+        throw new Error('Wrong email or password!');
+    } catch (error) {
+        throw new Error(error);
+    }
+}
+
+const getListRecipes = async () => {
+    try {
+        db = await getDB('edateam');
+        const recipesCollection = db.collection(RECIPES_COLLECTION);
+        const recipesData = await recipesCollection.find().toArray();
+
+        if (recipesData.length > 0) {
+            return _idToArray(recipesData);
+        } else {
+            throw new Error('No recipes found in the database!');
+        }
+    } catch (error) {
+        console.error('Error in getListRecipes:', error.message);
+        throw new Error(error.message);
+    }
+};
+
+const getRecipe = async (dishId ) => {
+    try {
+        db = await getDB('edateam');
+        const recipesCollection = db.collection(RECIPES_COLLECTION);
+        const id = dishId.id;
+        const recipeData = await recipesCollection.findOne({ _id :new ObjectId(id) } );
+        if (recipeData!=null) {
+            return _idToId(recipeData);
+        }
+
+        throw new Error('Not found recipe');
+    } catch (error) {
+        throw new Error(error);
+    }
+}
+
+const addRecipe = async (recipe) => {
+    try {
+        db = await getDB('edateam');
+        const recipesCollection = db.collection(RECIPES_COLLECTION);
+        const result = await recipesCollection.insertOne(recipe);
+        
+        if (!result.insertedId) {
+            throw new Error('Recipe insertion failed');
+        }
+        
+        return {
+            success: true,
+            id: result.insertedId
+        };
+    } catch (error) {
+        console.error('Error in addRecipe:', error.message);
+        throw new Error(error.message);
+    }
+};
+
+
+const requiredFields = (fields) => (req, res, next) => {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const fieldName of fields) {
+        if (!req.body[fieldName]) {
+            throw new Error(`Параметр ${fieldName} не установлен`)
+        }
+    }
+
+    next()
+}
+
+const addFavorite = async (userId, recipeId) => {
+    
+    try {
+        db = await getDB('edateam');
+        const favoritesCollection = db.collection(FAVORITES_USER);
+        const result = await favoritesCollection.updateOne(
+            { userId: new ObjectId(userId) },
+            { $addToSet: { favorites: new ObjectId(recipeId) } },
+            { upsert: true }
+        );
+        return result;
+    } catch (error) {
+        throw new Error('Error adding favorite: ' + error.message);
+    }
+};
+
+const getFavorites = async (userId) => {
+    try {
+        db = await getDB('edateam');
+        const favoritesCollection = db.collection(FAVORITES_USER);
+        const userFavorites = await favoritesCollection.findOne({ userId: new ObjectId(userId) });
+
+        if (!userFavorites || !userFavorites.favorites || userFavorites.favorites.length === 0) {
+            return [];
+        }
+
+        const recipesCollection = db.collection(RECIPES_COLLECTION);
+        const favoriteRecipes = await recipesCollection.find({ _id: { $in: userFavorites.favorites } }).toArray();
+
+        return favoriteRecipes;
+    } catch (error) {
+        console.error(error);
+        throw new Error("Failed to get user favorites with recipes");
+    }
+};
+
+module.exports = {
+    getUser,
+    signUp,
+    getResponse,
+    _idToId,
+    _idToArray,
+    getListRecipes,
+    getRecipe,
+    addRecipe,
+    requiredFields, 
+    getFavorites,
+    addFavorite
+};

.bzr/legacy/edateam/index.js

@@ -0,0 +1,25 @@
+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.post('/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'));
+});
+
+router.use('/auth', require('./auth'));
+
+router.use('/recipe', require('./user'));
+
+router.use('/main', require('./main'));
+
+module.exports = router;

.bzr/legacy/edateam/json/homepage-data/success.json

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

.bzr/legacy/edateam/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" }
+]
+
+}

.bzr/legacy/edateam/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"
+        }
+    ]        
+    }
+}

.bzr/legacy/edateam/key.js

@@ -0,0 +1,3 @@
+const EDATEAM_JWT_TOKEN = 'secretyk token';
+
+module.exports = {EDATEAM_JWT_TOKEN};

.bzr/legacy/edateam/main.js

@@ -0,0 +1,51 @@
+const { getListRecipes , getRecipe, addFavorite , getFavorites} = require('./controllers');
+
+const router = require('express').Router();
+
+router.get('/recipes', async (req, res) => { 
+    try {
+        const result = await getListRecipes();
+        return res.status(200).json({ success: true, data: result });
+    } catch (error) {
+        console.error('Error in GET /recipes:', error.message);
+        return res.status(500).json({ success: false, message: error.message });
+    }
+});
+
+router.post('/recipe', async(req,res)=>{
+    try{
+        const result = await getRecipe(req.body);
+
+        return res.status(200).json({success:true, data: result});
+    }
+    catch(error){
+        console.error('Error in GET /recipes:', error.message);
+        return res.status(500).json({ success: false, message: error.message });
+    }
+})
+
+router.post('/favorites', async (req, res) => {
+    try {
+        
+        const { userId, recipeId } = req.body;
+        const result = await addFavorite(userId, recipeId);
+        return res.status(200).json({ success: true, data: result });
+    } catch (error) {
+        console.error('Error in POST /favorites:', error.message);
+        return res.status(500).json({ success: false, message: error.message });
+    }
+});
+
+router.post('/get-favorites', async(req,res) =>{
+    try {
+        const { userId } = req.body;
+        const result = await getFavorites(userId);
+        console.log(result)
+        return res.status(200).json({ success: true, data: result });
+    } catch (error) {
+        console.error('Error in POST /get-favorites:', error.message);
+        return res.status(500).json({ success: false, message: error.message });
+    }
+});
+
+module.exports = router;

.bzr/legacy/edateam/user.js

@@ -0,0 +1,35 @@
+const { requiredFields , getFavorites, addRecipe} = require('./controllers');
+
+const router = require('express').Router();
+
+router.post('/favorites', requiredFields('id'), async(req,res)=>{
+    try{
+        const recipes = await getFavorites(req.body);
+        res.status(200).send(getResponse(recipes));
+    }
+    catch(error){
+        res.status(400).send(getResponse(error.message));
+    }
+})
+
+router.post('/add-recept', async (req, res) => {
+    let error = null;
+    let result = null;
+
+    try {
+        result = await addRecipe(req.body);
+    } catch (e) {
+        error = e.message;
+    }
+
+    if (error) {
+        console.error(`Error in POST /add-recept: ${error}`);
+    }
+
+    return res.status(error ? 500 : 201).json({
+        message: error ? error : 'Recipe added successfully',
+        id: result?.id
+    });
+});
+
+module.exports = router;