From d149dcf3bd6234afdde3f4d1458a7a047b8d885c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Thu, 11 Jul 2024 14:00:25 +0200
Subject: [PATCH] fix: refs #6802 fix merge conflicts

---
 modules/claim/back/methods/claim/regularizeClaim.js  |  2 +-
 .../back/methods/claim/specs/regularizeClaim.spec.js |  6 +++---
 modules/client/back/models/specs/client.spec.js      | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/claim/back/methods/claim/regularizeClaim.js b/modules/claim/back/methods/claim/regularizeClaim.js
index a56d57e9b..ea1a7a813 100644
--- a/modules/claim/back/methods/claim/regularizeClaim.js
+++ b/modules/claim/back/methods/claim/regularizeClaim.js
@@ -41,7 +41,7 @@ module.exports = Self => {
                     relation: 'claimDestination',
                     fields: ['addressFk']
                 },
-                where: {claimFk: claimFk}
+                where: {claimFk}
             }, myOptions);
 
             for (let claimEnd of claimEnds) {
diff --git a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
index a1578ac7f..c3fe7daa6 100644
--- a/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
+++ b/modules/claim/back/methods/claim/specs/regularizeClaim.spec.js
@@ -55,7 +55,7 @@ describe('claim regularizeClaim()', () => {
             expect(trashTicket.addressFk).toEqual(trashAddress);
             expect(claimBefore.claimStateFk).toEqual(pendentState);
             expect(claimAfter.claimStateFk).toEqual(resolvedState);
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jvp_equipo', 'Trash');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es5_equipo', 'Trash');
             expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
@@ -80,7 +80,7 @@ describe('claim regularizeClaim()', () => {
 
             await models.Claim.regularizeClaim(ctx, claimId, options);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jvp_equipo', 'Bueno');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es5_equipo', 'Bueno');
             expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
@@ -105,7 +105,7 @@ describe('claim regularizeClaim()', () => {
 
             await models.Claim.regularizeClaim(ctx, claimId, options);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jvp_equipo', 'Bueno');
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es5_equipo', 'Bueno');
             expect(chatModel.send).toHaveBeenCalledTimes(4);
 
             await tx.rollback();
diff --git a/modules/client/back/models/specs/client.spec.js b/modules/client/back/models/specs/client.spec.js
index 3b194e721..af0e19c7b 100644
--- a/modules/client/back/models/specs/client.spec.js
+++ b/modules/client/back/models/specs/client.spec.js
@@ -16,8 +16,8 @@ describe('Client Model', () => {
     const ctx = {req: activeCtx};
     const chatModel = models.Chat;
     const instance = {id: 1101, name: 'Bruce Banner'};
-    const previousDepartmetnId = 80; // jvp_equipo
-    const currentDepartmetnId = 94; // jes_equipo
+    const previousDepartmetnId = 80; // es5_equipo
+    const currentDepartmetnId = 94; // es2_equipo
 
     beforeEach(() => {
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
@@ -31,8 +31,8 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, previousDepartmetnId, currentDepartmetnId);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jvp_equipo', `Client assignment has changed`);
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jes_equipo', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es5_equipo', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es2_equipo', `Client assignment has changed`);
         });
 
         it('should call to the Chat send() method for the previous worker', async() => {
@@ -40,7 +40,7 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, null, currentDepartmetnId);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jes_equipo', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es2_equipo', `Client assignment has changed`);
         });
 
         it('should call to the Chat send() method for the current worker', async() => {
@@ -48,7 +48,7 @@ describe('Client Model', () => {
 
             await models.Client.notifyAssignment(instance, previousDepartmetnId, null);
 
-            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@jvp_equipo', `Client assignment has changed`);
+            expect(chatModel.send).toHaveBeenCalledWith(ctx, '@es5_equipo', `Client assignment has changed`);
         });
     });