Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AT entity creation event listener fix #7387

Merged
merged 1 commit into from
Oct 20, 2024
Merged

AT entity creation event listener fix #7387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions app/api/externalIntegrations.v2/automaticTranslation/RequestEntityTranslation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,8 @@ export class RequestEntityTranslation {

async execute(entityInputModel: EntityInputModel | unknown) {
this.inputValidator.ensure(entityInputModel);
const atConfig = await this.ATConfigDS.get();
const atTemplateConfig = atConfig.templates.find(
t => t.template === entityInputModel.template?.toString()
);

const languageFrom = entityInputModel.language;
const languagesTo = atConfig.languages.filter(
language => language !== entityInputModel.language
);
const entity = Entity.fromInputModel(entityInputModel);
const { atTemplateConfig, languagesTo, atConfig, languageFrom } = await this.getConfig(entity);

if (
!atTemplateConfig ||
Expand All @@ -64,7 +57,6 @@ export class RequestEntityTranslation {
return;
}

const entity = Entity.fromInputModel(entityInputModel);
let updatedEntities = (await this.entitiesDS.getByIds([entity.sharedId]).all()).filter(
e => e.language !== languageFrom
);
Expand Down Expand Up @@ -105,4 +97,15 @@ export class RequestEntityTranslation {
})
);
}

private async getConfig(entity: Entity) {
const atConfig = await this.ATConfigDS.get();
const atTemplateConfig = atConfig.templates.find(
t => t.template === entity.template?.toString()
);

const languageFrom = entity.language;
const languagesTo = atConfig.languages.filter(language => language !== entity.language);
return { atTemplateConfig, languagesTo, atConfig, languageFrom };
}
}
4 changes: 1 addition & 3 deletions ...externalIntegrations.v2/automaticTranslation/adapters/driving/ATEntityCreationListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { DefaultTransactionManager } from 'api/common.v2/database/data_source_defaults';
import { EntityCreatedEvent } from 'api/entities/events/EntityCreatedEvent';
import { EventsBus } from 'api/eventsbus';
import { permissionsContext } from 'api/permissions/permissionsContext';
import { AutomaticTranslationFactory } from '../../AutomaticTranslationFactory';
import { DefaultTransactionManager } from 'api/common.v2/database/data_source_defaults';

export class ATEntityCreationListener {
private eventBus: EventsBus;
Expand All @@ -24,7 +23,6 @@ export class ATEntityCreationListener {
).get();

if (active) {
permissionsContext.setCommandContext();
const entityFrom = event.entities.find(e => e.language === event.targetLanguageKey) || {};

entityFrom._id = entityFrom._id?.toString();
Expand Down
11 changes: 1 addition & 10 deletions ...egrations.v2/automaticTranslation/adapters/driving/specs/ATEntityCreationListener.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import { EntityCreatedEvent } from 'api/entities/events/EntityCreatedEvent';
import { EventsBus } from 'api/eventsbus';
import { AutomaticTranslationFactory } from 'api/externalIntegrations.v2/automaticTranslation/AutomaticTranslationFactory';
import { RequestEntityTranslation } from 'api/externalIntegrations.v2/automaticTranslation/RequestEntityTranslation';
import { permissionsContext } from 'api/permissions/permissionsContext';
import { tenants } from 'api/tenants';
import { appContext } from 'api/utils/AppContext';
import { getFixturesFactory } from 'api/utils/fixturesFactory';
import { testingEnvironment } from 'api/utils/testingEnvironment';
import { UserSchema } from 'shared/types/userType';
import { ATEntityCreationListener } from '../ATEntityCreationListener';

const factory = getFixturesFactory();
Expand All @@ -32,17 +30,14 @@ describe('ATEntityCreationListener', () => {
let listener: ATEntityCreationListener;
const eventBus: EventsBus = new EventsBus();
let executeSpy: jest.Mock<any, any, any>;
let userInContext: UserSchema | undefined = {} as UserSchema;

beforeEach(async () => {
await testingEnvironment.setUp({
settings: [{ features: { automaticTranslation: { active: false } } }],
});
await testingEnvironment.setTenant('tenant');

executeSpy = jest.fn().mockImplementation(() => {
userInContext = permissionsContext.getUserInContext();
});
executeSpy = jest.fn().mockImplementation(() => {});

listener = new ATEntityCreationListener(eventBus, prepareATFactory(executeSpy));
listener.start();
Expand Down Expand Up @@ -88,10 +83,6 @@ describe('ATEntityCreationListener', () => {
it('should execute RequestEntityTranslation on receiving entity creation event', async () => {
expect(executeSpy).toHaveBeenCalledWith(entityEn);
});

it('should execute RequestEntityTranslation with commandUser as its context user', async () => {
expect(userInContext).toBe(permissionsContext.commandUser);
});
});
});
});
Loading