From 277bcafd899f0a1ee0409627eb4579570bf9a7d6 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 23 Feb 2024 14:11:11 +0100
Subject: [PATCH 1/4] fix(commit): refs #6403 hotFix add commit

---
 back/methods/mrw-config/createShipment.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js
index f0f7d66a2f..06b5f01173 100644
--- a/back/methods/mrw-config/createShipment.js
+++ b/back/methods/mrw-config/createShipment.js
@@ -86,7 +86,13 @@ module.exports = Self => {
         const getLabelResponse = await sendXmlDoc('getLabel', {mrw, shipmentId}, 'text/xml');
         const file = getTextByTag(getLabelResponse, 'EtiquetaFile');
 
-        await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
+        try {
+            await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
+            await myOptions.transaction.commit();
+        } catch (error) {
+            await myOptions.transaction.rollback();
+            throw new UserError(`Cant update the expedition`);
+        }
         return file;
     };
 
-- 
2.40.1


From 94b49efb1fa602067654ff8370c4314a550d8861 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 23 Feb 2024 14:38:44 +0100
Subject: [PATCH 2/4] feat(fix): refs #6403 add transaction to createShipment

---
 back/methods/mrw-config/createShipment.js           | 13 ++++++++-----
 .../methods/mrw-config/specs/createShipment.spec.js |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js
index 06b5f01173..b18040a3d4 100644
--- a/back/methods/mrw-config/createShipment.js
+++ b/back/methods/mrw-config/createShipment.js
@@ -25,12 +25,15 @@ module.exports = Self => {
 
     Self.createShipment = async(expeditionFk, options) => {
         const myOptions = {};
+        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        if (!myOptions.transaction)
-            myOptions.transaction = await Self.beginTransaction({});
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
 
         const models = Self.app.models;
         const mrw = await models.MrwConfig.findOne(null, myOptions);
@@ -88,10 +91,10 @@ module.exports = Self => {
 
         try {
             await models.Expedition.updateAll({id: expeditionFk}, {externalId: shipmentId}, myOptions);
-            await myOptions.transaction.commit();
+            if (tx) await tx.commit();
         } catch (error) {
-            await myOptions.transaction.rollback();
-            throw new UserError(`Cant update the expedition`);
+            if (tx) await tx.rollback();
+            throw new UserError(`Cant update `);
         }
         return file;
     };
diff --git a/back/methods/mrw-config/specs/createShipment.spec.js b/back/methods/mrw-config/specs/createShipment.spec.js
index e7bba524a9..5aa69bac01 100644
--- a/back/methods/mrw-config/specs/createShipment.spec.js
+++ b/back/methods/mrw-config/specs/createShipment.spec.js
@@ -31,7 +31,7 @@ const expedition1 = {
 let tx;
 let options;
 
-describe('MRWConfig createShipment()', () => {
+fdescribe('MRWConfig createShipment()', () => {
     beforeEach(async() => {
         options = tx = undefined;
         tx = await models.MrwConfig.beginTransaction({});
-- 
2.40.1


From 44668b24457da6d59c5a5dcbca1c0f9bc669cc59 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 23 Feb 2024 14:41:35 +0100
Subject: [PATCH 3/4] remove(focus). refs #6403 remove f

---
 back/methods/mrw-config/specs/createShipment.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/methods/mrw-config/specs/createShipment.spec.js b/back/methods/mrw-config/specs/createShipment.spec.js
index 5aa69bac01..e7bba524a9 100644
--- a/back/methods/mrw-config/specs/createShipment.spec.js
+++ b/back/methods/mrw-config/specs/createShipment.spec.js
@@ -31,7 +31,7 @@ const expedition1 = {
 let tx;
 let options;
 
-fdescribe('MRWConfig createShipment()', () => {
+describe('MRWConfig createShipment()', () => {
     beforeEach(async() => {
         options = tx = undefined;
         tx = await models.MrwConfig.beginTransaction({});
-- 
2.40.1


From c8e0195510bcaa12f99aacbfe9b78b119e604404 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 23 Feb 2024 14:44:59 +0100
Subject: [PATCH 4/4] fix throw error

---
 back/methods/mrw-config/createShipment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/methods/mrw-config/createShipment.js b/back/methods/mrw-config/createShipment.js
index b18040a3d4..12263de033 100644
--- a/back/methods/mrw-config/createShipment.js
+++ b/back/methods/mrw-config/createShipment.js
@@ -94,7 +94,7 @@ module.exports = Self => {
             if (tx) await tx.commit();
         } catch (error) {
             if (tx) await tx.rollback();
-            throw new UserError(`Cant update `);
+            throw error;
         }
         return file;
     };
-- 
2.40.1