From cc1cd0563fe1b8cee7bbedf3b827fe881d908d54 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 16 Sep 2024 09:00:46 +0200
Subject: [PATCH] feat: refs #7404 fixtures and translates

---
 db/dump/fixtures.before.sql                   |  2 +-
 loopback/locale/en.json                       |  3 +-
 .../methods/stock-bought/getStockBought.js    | 49 +++++++++++--------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index ce33b4e48..cd1a470ff 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -183,7 +183,7 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
         (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
         (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
-        (6,  'Warehouse six',   NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
+        (6,  'Warehouse six',   'VNH',    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
         (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);
 
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 06538a524..b8835f5f3 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -235,5 +235,6 @@
 	"Cannot add holidays on this day": "Cannot add holidays on this day",
 	"Cannot send mail": "Cannot send mail",
 	"CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`": "CONSTRAINT `chkParkingCodeFormat` failed for `vn`.`parking`",
-	"This postcode already exists": "This postcode already exists"
+	"This postcode already exists": "This postcode already exists",
+	"This buyer has already made a reservation for this date": "This buyer has already made a reservation for this date"
 }
\ No newline at end of file
diff --git a/modules/entry/back/methods/stock-bought/getStockBought.js b/modules/entry/back/methods/stock-bought/getStockBought.js
index da194ed80..0f67d878d 100644
--- a/modules/entry/back/methods/stock-bought/getStockBought.js
+++ b/modules/entry/back/methods/stock-bought/getStockBought.js
@@ -3,6 +3,11 @@ module.exports = Self => {
         description: 'Returns the stock bought for a given date',
         accessType: 'READ',
         accepts: [{
+            arg: 'workerFk',
+            type: 'number',
+            description: 'The id for a buyer',
+        },
+        {
             arg: 'dated',
             type: 'date',
             description: 'The date to filter',
@@ -18,7 +23,7 @@ module.exports = Self => {
         }
     });
 
-    Self.getStockBought = async(dated = Date.vnNew()) => {
+    Self.getStockBought = async(workerFk, dated = Date.vnNew()) => {
         const models = Self.app.models;
         const today = Date.vnNew();
         dated.setHours(0, 0, 0, 0);
@@ -27,26 +32,30 @@ module.exports = Self => {
         if (dated.getTime() === today.getTime())
             await models.StockBought.rawSql(`CALL vn.stockBought_calculate()`);
 
-        return models.StockBought.find(
-            {
-                where: {
-                    dated: dated
-                },
-                include: [
-                    {
-                        relation: 'worker',
-                        scope: {
-                            include: [
-                                {
-                                    relation: 'user',
-                                    scope: {
-                                        fields: ['id', 'name']
-                                    }
+        const filter = {
+            where: {
+                dated: dated
+            },
+            include: [
+                {
+                    relation: 'worker',
+                    scope: {
+                        include: [
+                            {
+                                relation: 'user',
+                                scope: {
+                                    fields: ['id', 'name']
                                 }
-                            ]
-                        }
+                            }
+                        ]
                     }
-                ]
-            });
+                }
+            ]
+        };
+
+        if (workerFk) filter.where.workerFk = workerFk;
+        console.log('workerFk: ', workerFk);
+
+        return models.StockBought.find(filter);
     };
 };