From 202884fdce1ccbf984cb1fcf49e2a16be971dd34 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 14 Jun 2024 14:25:15 +0200
Subject: [PATCH 1/2] feat: refs #6238 add travelKgPercentage table and model

---
 .../00-createTravelKgPercentage.sql           | 17 +++++++++++++++
 .../methods/travel/extraCommunityFilter.js    | 14 ++++++++++++-
 modules/travel/back/model-config.json         |  5 ++++-
 .../back/models/travel-kg-percentage.json     | 21 +++++++++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 db/versions/11102-wheatCarnation/00-createTravelKgPercentage.sql
 create mode 100644 modules/travel/back/models/travel-kg-percentage.json

diff --git a/db/versions/11102-wheatCarnation/00-createTravelKgPercentage.sql b/db/versions/11102-wheatCarnation/00-createTravelKgPercentage.sql
new file mode 100644
index 000000000..9df89d869
--- /dev/null
+++ b/db/versions/11102-wheatCarnation/00-createTravelKgPercentage.sql
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS travelKgPercentage (
+	value INT(3) PRIMARY KEY,
+	className VARCHAR(50)
+);
+
+INSERT INTO travelKgPercentage (value, className) 
+	VALUES
+		(80, 'primary'),
+		(100, 'alert');
+
+INSERT INTO salix.ACL
+	SET model = 'TravelKgPercentage',
+		property = '*',
+		accessType = 'READ',
+		permission = 'ALLOW',
+		principalType = 'ROLE',
+		principalId = 'employee';
\ No newline at end of file
diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 488297318..107bf6f39 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -138,7 +138,19 @@ module.exports = Self => {
                             b.stickers * 
                             IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
                         ) as DECIMAL(10,0)
-                    ) as volumeKg
+                    ) as volumeKg,
+                    ROUND(GREATEST(
+                    CAST(SUM(b.weight * b.stickers) AS INT),
+                    CAST(
+                        SUM(vc.aerealVolumetricDensity * 
+                            b.stickers * 
+                            IF(pkg.volume,
+                                pkg.volume,
+                                pkg.width * pkg.depth * pkg.height
+                            ) / 1000000
+                        ) AS INT
+                    )
+                ) / t.kg * 100, 0) percentageKg
                 FROM travel t
                     LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
                     LEFT JOIN entry e ON e.travelFk = t.id
diff --git a/modules/travel/back/model-config.json b/modules/travel/back/model-config.json
index ed5c071b3..952ce0d20 100644
--- a/modules/travel/back/model-config.json
+++ b/modules/travel/back/model-config.json
@@ -11,6 +11,9 @@
     "Thermograph": {
         "dataSource": "vn"
     },
+    "TravelKgPercentage": {
+        "dataSource": "vn"
+    },
     "TravelThermograph": {
         "dataSource": "vn"
     },
@@ -20,4 +23,4 @@
     "Temperature": {
         "dataSource": "vn"
     }
-}
+}
\ No newline at end of file
diff --git a/modules/travel/back/models/travel-kg-percentage.json b/modules/travel/back/models/travel-kg-percentage.json
new file mode 100644
index 000000000..e99a88999
--- /dev/null
+++ b/modules/travel/back/models/travel-kg-percentage.json
@@ -0,0 +1,21 @@
+{
+    "name": "TravelKgPercentage",
+    "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
+    "options": {
+        "mysql": {
+            "table": "travelKgPercentage"
+        }
+    },
+    "properties": {
+        "value": {
+            "type": "number",
+            "id": true
+        },
+        "className": {
+            "type": "string"
+        }
+    }
+}
\ No newline at end of file

From 3070d1ef0182b4e3d098cdd8c2b32bfd93176314 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 18 Jun 2024 10:04:21 +0200
Subject: [PATCH 2/2] refactor: refs #6238 drop useless round

---
 .../methods/travel/extraCommunityFilter.js    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/travel/back/methods/travel/extraCommunityFilter.js b/modules/travel/back/methods/travel/extraCommunityFilter.js
index 107bf6f39..dcb704ff5 100644
--- a/modules/travel/back/methods/travel/extraCommunityFilter.js
+++ b/modules/travel/back/methods/travel/extraCommunityFilter.js
@@ -139,18 +139,18 @@ module.exports = Self => {
                             IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
                         ) as DECIMAL(10,0)
                     ) as volumeKg,
-                    ROUND(GREATEST(
-                    CAST(SUM(b.weight * b.stickers) AS INT),
-                    CAST(
-                        SUM(vc.aerealVolumetricDensity * 
-                            b.stickers * 
-                            IF(pkg.volume,
-                                pkg.volume,
-                                pkg.width * pkg.depth * pkg.height
-                            ) / 1000000
-                        ) AS INT
+                    GREATEST(
+                        CAST(SUM(b.weight * b.stickers) AS INT),
+                        CAST(
+                            SUM(vc.aerealVolumetricDensity * 
+                                b.stickers * 
+                                IF(pkg.volume,
+                                    pkg.volume,
+                                    pkg.width * pkg.depth * pkg.height
+                                ) / 1000000
+                            ) AS INT
                     )
-                ) / t.kg * 100, 0) percentageKg
+                 / t.kg * 100, 0) percentageKg
                 FROM travel t
                     LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
                     LEFT JOIN entry e ON e.travelFk = t.id