From 9fa6e2df71ed50fad312acdcdff4cd3f5cd08834 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Mon, 19 Jun 2023 14:54:32 +0200
Subject: [PATCH] refs #5595 VnModel.rawSql() bugfix

---
 loopback/common/models/vn-model.js          | 31 ++++++++++-----------
 modules/order/back/methods/order/confirm.js |  1 -
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/loopback/common/models/vn-model.js b/loopback/common/models/vn-model.js
index f92e1ea09..22b535f62 100644
--- a/loopback/common/models/vn-model.js
+++ b/loopback/common/models/vn-model.js
@@ -200,22 +200,20 @@ module.exports = function(Self) {
             const connector = this.dataSource.connector;
             let conn;
             let res;
-            const opts = Object.assign({}, options);
 
             try {
                 if (userId) {
-                    conn = await new Promise((resolve, reject) => {
-                        connector.client.getConnection(function(err, conn) {
-                            if (err)
-                                reject(err);
-                            else
-                                resolve(conn);
+                    if (!options.transaction) {
+                        options = Object.assign({}, options);
+                        conn = await new Promise((resolve, reject) => {
+                            connector.client.getConnection(function(err, conn) {
+                                if (err)
+                                    reject(err);
+                                else
+                                    resolve(conn);
+                            });
                         });
-                    });
-
-                    const opts = Object.assign({}, options);
-                    if (!opts.transaction) {
-                        opts.transaction = {
+                        options.transaction = {
                             connection: conn,
                             connector
                         };
@@ -223,15 +221,14 @@ module.exports = function(Self) {
 
                     await connector.executeP(
                         'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
-                        [userId], opts
+                        [userId], options
                     );
                 }
 
-                res = await connector.executeP(query, params, opts);
+                res = await connector.executeP(query, params, options);
 
-                if (userId) {
-                    await connector.executeP('CALL account.myUser_logout()', null, opts);
-                }
+                if (userId)
+                    await connector.executeP('CALL account.myUser_logout()', null, options);
             } finally {
                 if (conn) conn.release();
             }
diff --git a/modules/order/back/methods/order/confirm.js b/modules/order/back/methods/order/confirm.js
index 5a31e7149..1fcb3a760 100644
--- a/modules/order/back/methods/order/confirm.js
+++ b/modules/order/back/methods/order/confirm.js
@@ -21,7 +21,6 @@ module.exports = Self => {
 
     Self.confirm = async(ctx, orderFk) => {
         const userId = ctx.req.accessToken.userId;
-        console.log(orderFk, userId);
         const query = `CALL hedera.order_confirmWithUser(?, ?)`;
         const response = await Self.rawSql(query, [orderFk, userId], {userId});