From b9a173fce811f8fb2b575e44586d94c7b4306442 Mon Sep 17 00:00:00 2001 From: Jamie Howard Date: Mon, 19 Jun 2023 16:37:20 +0100 Subject: [PATCH] fix(ee): use entity service directly for emit event calls --- .../entity-service-decorator.test.js | 24 +++++++++++-------- .../entity-service-decorator.js | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/core/admin/ee/server/services/review-workflows/__tests__/entity-service-decorator.test.js b/packages/core/admin/ee/server/services/review-workflows/__tests__/entity-service-decorator.test.js index 3edf02f50e..d431420a65 100644 --- a/packages/core/admin/ee/server/services/review-workflows/__tests__/entity-service-decorator.test.js +++ b/packages/core/admin/ee/server/services/review-workflows/__tests__/entity-service-decorator.test.js @@ -108,7 +108,6 @@ describe('Entity service decorator', () => { const defaultService = { update: jest.fn(() => Promise.resolve(entry)), - emitEvent: jest.fn(), }; global.strapi = { @@ -117,6 +116,7 @@ describe('Entity service decorator', () => { findOne: jest.fn(() => { return { strapi_reviewWorkflows_stage: { id: 2, workflow: { id: 1 } } }; }), + emitEvent: jest.fn(), }, }; @@ -126,16 +126,20 @@ describe('Entity service decorator', () => { const input = { data: { title: 'title ', strapi_reviewWorkflows_stage: 1 } }; await service.update(uid, id, input); - expect(defaultService.emitEvent).toHaveBeenCalledWith(uid, WORKFLOW_UPDATE_STAGE, { - entityId: 1, - workflow: { - id: 1, - stages: { - from: 2, - to: 1, + expect(global.strapi.entityService.emitEvent).toHaveBeenCalledWith( + uid, + WORKFLOW_UPDATE_STAGE, + { + entityId: 1, + workflow: { + id: 1, + stages: { + from: 2, + to: 1, + }, }, - }, - }); + } + ); expect(defaultService.update).toHaveBeenCalledWith(uid, id, { ...input, diff --git a/packages/core/admin/ee/server/services/review-workflows/entity-service-decorator.js b/packages/core/admin/ee/server/services/review-workflows/entity-service-decorator.js index 3cde80f9cb..4841f7b217 100644 --- a/packages/core/admin/ee/server/services/review-workflows/entity-service-decorator.js +++ b/packages/core/admin/ee/server/services/review-workflows/entity-service-decorator.js @@ -84,7 +84,7 @@ const decorator = (service) => ({ }, }, }; - await service.emitEvent.call(this, uid, WORKFLOW_UPDATE_STAGE, webhookPayload); + await strapi.entityService.emitEvent(uid, WORKFLOW_UPDATE_STAGE, webhookPayload); } return updatedEntity;