The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(server): sync userWorkspace.locale when a workspace member's locale is updated through the record API (#27245)
Slava Rosine7dd79dcc4fe
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/global-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/user/services/global-workspace-member.listener.tsindex 656970bc128..0c7ec6cd1ab 100644--- a/packages/twenty-server/src/engine/core-modules/user/services/global-workspace-member.listener.ts+++ b/packages/twenty-server/src/engine/core-modules/user/services/global-workspace-member.listener.ts@@ -1,5 +1,6 @@import { Injectable } from '@nestjs/common';+import { isDefined } from 'twenty-shared/utils';import {ObjectRecordCreateEvent,ObjectRecordRestoreEvent,@@ -11,13 +12,17 @@ import {import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';@Injectable()export class GlobalWorkspaceMemberListener {- constructor(private readonly workspaceCacheService: WorkspaceCacheService) {}+ constructor(+ private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly userWorkspaceService: UserWorkspaceService,+ ) {}@OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.CREATED)@OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.UPDATED)@@ -40,4 +45,37 @@ export class GlobalWorkspaceMemberListener {['flatWorkspaceMemberMaps'],);}++ @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.UPDATED)+ async syncUserWorkspaceLocale(+ payload: WorkspaceEventBatch<+ ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>+ >,+ ) {+ for (const event of payload.events) {+ const { after } = event.properties;++ if (!isDefined(event.properties.diff?.locale) || !isDefined(after)) {+ continue;+ }++ const userWorkspace =+ await this.userWorkspaceService.getUserWorkspaceForUser({+ userId: after.userId,+ workspaceId: payload.workspaceId,+ relations: [],+ });++ if (!isDefined(userWorkspace) || userWorkspace.locale === after.locale) {+ continue;+ }++ await this.userWorkspaceService.updateUserWorkspaceLocaleForUserWorkspace(+ {+ locale: after.locale,+ userWorkspaceId: userWorkspace.id,+ },+ );+ }+ }}diff --git a/packages/twenty-server/test/integration/graphql/suites/locale/workspace-member-locale-sync.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/locale/workspace-member-locale-sync.integration-spec.tsnew file mode 100644index 00000000000..8458072bddf--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/locale/workspace-member-locale-sync.integration-spec.ts@@ -0,0 +1,61 @@+import gql from 'graphql-tag';+import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { updateOneOperationFactory } from 'test/integration/graphql/utils/update-one-operation-factory.util';+import { makeMetadataApiRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { expectEventually } from 'test/integration/utils/expect-eventually.util';++import { WORKSPACE_MEMBER_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/workspace-member-data-seeds.constant';++const updateJaneLocale = (locale: string) =>+ makeGraphqlApiRequest(+ updateOneOperationFactory({+ objectMetadataSingularName: 'workspaceMember',+ gqlFields: 'id',+ recordId: WORKSPACE_MEMBER_DATA_SEED_IDS.JANE,+ data: { locale },+ }),+ );++const getJaneUserWorkspaceLocale = async () => {+ const response = await makeMetadataApiRequest(+ {+ query: gql`+ query {+ currentUser {+ currentUserWorkspace {+ locale+ }+ }+ }+ `,+ },+ APPLE_JANE_ADMIN_ACCESS_TOKEN,+ );++ return response.body.data.currentUser.currentUserWorkspace.locale;+};++describe('workspace member locale sync (integration)', () => {+ let initialLocale: string;++ beforeAll(async () => {+ initialLocale = await getJaneUserWorkspaceLocale();+ });++ afterAll(async () => {+ await updateJaneLocale(initialLocale);+ await expectEventually(async () => {+ expect(await getJaneUserWorkspaceLocale()).toBe(initialLocale);+ });+ });++ it('applies a locale updated through the record API to the user workspace', async () => {+ const response = await updateJaneLocale('fr-FR');++ expect(response.body.errors).toBeUndefined();++ await expectEventually(async () => {+ expect(await getJaneUserWorkspaceLocale()).toBe('fr-FR');+ });+ });+});