From dbd8d816c06a6a0dc066b14baea4333f712e9a81 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 7 Jan 2025 14:53:26 +0100
Subject: [PATCH] fix: refs #8361 streamline transaction handling in
 exchangeRateUpdate

---
 .../methods/invoice-in/exchangeRateUpdate.js    | 17 ++++++++---------
 .../invoice-in/specs/exchangeRateUpdate.spec.js |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
index b5a081fc6f..a6bad405f5 100644
--- a/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
+++ b/modules/invoiceIn/back/methods/invoice-in/exchangeRateUpdate.js
@@ -16,12 +16,14 @@ module.exports = Self => {
     Self.exchangeRateUpdate = async(options = {}) => {
         const models = Self.app.models;
         const myOptions = {};
-        Object.assign(myOptions, options);
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
 
-        let createdTx = false;
         if (!myOptions.transaction) {
-            myOptions.transaction = await Self.beginTransaction({});
-            createdTx = true;
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
         }
 
         try {
@@ -97,12 +99,9 @@ module.exports = Self => {
                 }
             }
 
-            if (createdTx)
-                await myOptions.transaction.commit();
+            if (tx) await tx.commit();
         } catch (error) {
-            if (createdTx)
-                await myOptions.transaction.rollback();
-
+            if (tx) await tx.rollback();
             throw error;
         }
     };
diff --git a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
index 4b53f65c6b..c3dcca5ae3 100644
--- a/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/exchangeRateUpdate.spec.js
@@ -142,7 +142,7 @@ describe('exchangeRateUpdate functionality', function() {
         expect(afterCount - beforeCount).toBe(4);
     });
 
-    fit('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
+    it('should create entries for day1 and day2 from the feed, and not backfill day3', async function() {
         const lastRate = await models.ReferenceRate.findOne({order: 'dated DESC'}, options);
         if (!lastRate) return fail('No existing ReferenceRate data in DB');