Merge pull request 'Fix paths' (#105) from dsf-fix-1 into master
Reviewed-on: #105
This commit is contained in:
commit
02eb0e60b7
@ -73,7 +73,7 @@ router.get("/auth/session", (request, response) => {
|
|||||||
router.get("/interactions/check", (req, res) => {
|
router.get("/interactions/check", (req, res) => {
|
||||||
const { owner_id, dogsitter_id } = req.query;
|
const { owner_id, dogsitter_id } = req.query;
|
||||||
|
|
||||||
const usersFilePath = path.resolve(__dirname, "../json/users/success.json");
|
const usersFilePath = path.resolve(__dirname, "./json/users/users.json");
|
||||||
|
|
||||||
delete require.cache[require.resolve(usersFilePath)];
|
delete require.cache[require.resolve(usersFilePath)];
|
||||||
const usersFile = require(usersFilePath);
|
const usersFile = require(usersFilePath);
|
||||||
@ -97,7 +97,7 @@ router.post("/interactions", (req, res) => {
|
|||||||
return res.status(400).json({ error: "Missing required fields" });
|
return res.status(400).json({ error: "Missing required fields" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const usersFilePath = path.resolve(__dirname, "../json/users/success.json");
|
const usersFilePath = path.resolve(__dirname, "./json/users/users.json");
|
||||||
|
|
||||||
delete require.cache[require.resolve(usersFilePath)];
|
delete require.cache[require.resolve(usersFilePath)];
|
||||||
const usersFile = require(usersFilePath);
|
const usersFile = require(usersFilePath);
|
||||||
@ -138,7 +138,7 @@ router.get("/dogsitter-viewing", (req, res) => {
|
|||||||
const { id } = req.query;
|
const { id } = req.query;
|
||||||
console.log(`Получен запрос для dogsitter с ID: ${id}`);
|
console.log(`Получен запрос для dogsitter с ID: ${id}`);
|
||||||
|
|
||||||
const usersFile = require(`../json/users/${stubs.users}.json`);
|
const usersFile = require("./json/users/users.json");
|
||||||
const users = usersFile.data; // Извлекаем массив из свойства "data"
|
const users = usersFile.data; // Извлекаем массив из свойства "data"
|
||||||
|
|
||||||
const user = users.find((user) => user.id === Number(id));
|
const user = users.find((user) => user.id === Number(id));
|
||||||
@ -162,7 +162,7 @@ router.post('/dogsitter-viewing/rating/:id', (req, res) => {
|
|||||||
return res.status(400).json({ error: 'Некорректная оценка' });
|
return res.status(400).json({ error: 'Некорректная оценка' });
|
||||||
}
|
}
|
||||||
|
|
||||||
const usersFilePath = path.resolve(__dirname, '../json/users/success.json');
|
const usersFilePath = path.resolve(__dirname, "./json/users/users.json");
|
||||||
|
|
||||||
delete require.cache[require.resolve(usersFilePath)];
|
delete require.cache[require.resolve(usersFilePath)];
|
||||||
const usersFile = require(usersFilePath);
|
const usersFile = require(usersFilePath);
|
||||||
@ -200,7 +200,7 @@ router.patch('/users/:id', (req, res) => {
|
|||||||
console.log('Полученные данные для обновления:', updateData);
|
console.log('Полученные данные для обновления:', updateData);
|
||||||
|
|
||||||
|
|
||||||
const usersFilePath = path.resolve(__dirname, '../json/users/success.json');
|
const usersFilePath = path.resolve(__dirname, "./json/users/users.json");
|
||||||
|
|
||||||
delete require.cache[require.resolve(usersFilePath)];
|
delete require.cache[require.resolve(usersFilePath)];
|
||||||
const usersFile = require(usersFilePath);
|
const usersFile = require(usersFilePath);
|
||||||
|
Loading…
Reference in New Issue
Block a user