From 57add7abf016602c15786d719efd3f46142a549a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 5 Dec 2023 07:16:12 +0100
Subject: [PATCH] refs #5666 perf: replace Role by VnRole

---
 back/methods/vn-user/privileges.js                            | 2 +-
 back/methods/vn-user/specs/privileges.spec.js                 | 2 +-
 modules/account/back/models/ldap-config.js                    | 2 +-
 modules/ticket/back/methods/sale/specs/canEdit.spec.js        | 4 ++--
 .../back/methods/worker/specs/activeWithInheritedRole.spec.js | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/back/methods/vn-user/privileges.js b/back/methods/vn-user/privileges.js
index 08cfaaae8..9f936c29b 100644
--- a/back/methods/vn-user/privileges.js
+++ b/back/methods/vn-user/privileges.js
@@ -68,7 +68,7 @@ module.exports = Self => {
             userToUpdate.hasGrant = hasGrant;
 
         if (roleFk) {
-            const role = await models.Role.findById(roleFk, {fields: ['name']}, myOptions);
+            const role = await models.VnRole.findById(roleFk, {fields: ['name']}, myOptions);
             const hasRole = await Self.hasRole(userId, role.name, myOptions);
 
             if (!hasRole)
diff --git a/back/methods/vn-user/specs/privileges.spec.js b/back/methods/vn-user/specs/privileges.spec.js
index 3d25eecf9..04d9c09ff 100644
--- a/back/methods/vn-user/specs/privileges.spec.js
+++ b/back/methods/vn-user/specs/privileges.spec.js
@@ -70,7 +70,7 @@ describe('VnUser privileges()', () => {
         const tx = await models.VnUser.beginTransaction({});
 
         const options = {transaction: tx};
-        const agency = await models.Role.findOne({
+        const agency = await models.VnRole.findOne({
             where: {
                 name: 'agency'
             }
diff --git a/modules/account/back/models/ldap-config.js b/modules/account/back/models/ldap-config.js
index b557d243c..89f0add48 100644
--- a/modules/account/back/models/ldap-config.js
+++ b/modules/account/back/models/ldap-config.js
@@ -239,7 +239,7 @@ module.exports = Self => {
 
             // Prepare data
 
-            let roles = await $.Role.find({
+            let roles = await $.VnRole.find({
                 fields: ['id', 'name', 'description']
             });
             let roleRoles = await $.RoleRole.find({
diff --git a/modules/ticket/back/methods/sale/specs/canEdit.spec.js b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
index eef9136a8..200ea24cc 100644
--- a/modules/ticket/back/methods/sale/specs/canEdit.spec.js
+++ b/modules/ticket/back/methods/sale/specs/canEdit.spec.js
@@ -102,7 +102,7 @@ describe('sale canEdit()', () => {
             try {
                 const options = {transaction: tx};
 
-                const role = await models.Role.findOne({
+                const role = await models.VnRole.findOne({
                     where: {
                         name: roleEnabled.principalId
                     }
@@ -159,7 +159,7 @@ describe('sale canEdit()', () => {
             try {
                 const options = {transaction: tx};
 
-                const role = await models.Role.findOne({
+                const role = await models.VnRole.findOne({
                     where: {
                         name: roleEnabled.principalId
                     }
diff --git a/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js b/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js
index da54f6adb..580e07351 100644
--- a/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js
+++ b/modules/worker/back/methods/worker/specs/activeWithInheritedRole.spec.js
@@ -3,7 +3,7 @@ const app = require('vn-loopback/server/server');
 describe('Worker activeWithInheritedRole', () => {
     let allRolesCount;
     beforeAll(async() => {
-        allRolesCount = await app.models.Role.count();
+        allRolesCount = await app.models.VnRole.count();
     });
 
     it('should return the workers with an inherited role of salesPerson', async() => {