From 92dcdb05d2ae79e4b1488b7323ed208f5a41cd7b Mon Sep 17 00:00:00 2001 From: Angie Date: Sat, 26 Jul 2025 20:51:17 +0200 Subject: [PATCH] feat: updated generatio of test data, always starting from yesterday, to leave today free to create a report and update report endpoint to send username of the worker who created report --- backend/database/init.js | 2 +- backend/routes/reports.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/database/init.js b/backend/database/init.js index 2998ea0..5df6006 100644 --- a/backend/database/init.js +++ b/backend/database/init.js @@ -159,7 +159,7 @@ async function createTestData() { // Создаем тестовые отчеты за последние 30 дней const today = new Date(); - for (let i = 0; i < 30; i++) { + for (let i = 1; i < 30; i++) { const date = new Date(today); date.setDate(date.getDate() - i); const dateString = date.toISOString().split("T")[0]; diff --git a/backend/routes/reports.js b/backend/routes/reports.js index 72eea03..4863a20 100644 --- a/backend/routes/reports.js +++ b/backend/routes/reports.js @@ -66,6 +66,7 @@ router.post( finalCash, ], function (err) { + console.error("DB error:", err); if (err) return res.status(500).json({ error: "Database error" }); res.status(201).json({ id: this.lastID }); } @@ -84,11 +85,12 @@ router.get( ], (req, res) => { let sql = ` - SELECT reports.*, stores.name AS storeName - FROM reports - JOIN stores ON reports.storeId = stores.id - WHERE 1=1 - `; + SELECT reports.*, stores.name AS storeName, users.username AS username, users.fullName AS fullName + FROM reports + JOIN stores ON reports.storeId = stores.id + JOIN users ON reports.userId = users.id + WHERE 1=1 +`; const params = []; if (req.user.role !== "admin") {