6619 modify event emitter to emit an array of events (#6625)
Closes #6619 --------- Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
@ -8,6 +8,7 @@ import { objectRecordChangedValues } from 'src/engine/integrations/event-emitter
|
||||
import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
|
||||
import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
|
||||
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
|
||||
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
|
||||
import { CreateAuditLogFromInternalEvent } from 'src/modules/timeline/jobs/create-audit-log-from-internal-event';
|
||||
import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';
|
||||
|
||||
@ -19,40 +20,46 @@ export class EntityEventsToDbListener {
|
||||
) {}
|
||||
|
||||
@OnEvent('*.created')
|
||||
async handleCreate(payload: ObjectRecordCreateEvent<any>) {
|
||||
async handleCreate(
|
||||
payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
|
||||
) {
|
||||
return this.handle(payload);
|
||||
}
|
||||
|
||||
@OnEvent('*.updated')
|
||||
async handleUpdate(payload: ObjectRecordUpdateEvent<any>) {
|
||||
payload.properties.diff = objectRecordChangedValues(
|
||||
payload.properties.before,
|
||||
payload.properties.after,
|
||||
payload.properties.updatedFields,
|
||||
payload.objectMetadata,
|
||||
);
|
||||
async handleUpdate(
|
||||
payload: WorkspaceEventBatch<ObjectRecordUpdateEvent<any>>,
|
||||
) {
|
||||
for (const eventPayload of payload.events) {
|
||||
eventPayload.properties.diff = objectRecordChangedValues(
|
||||
eventPayload.properties.before,
|
||||
eventPayload.properties.after,
|
||||
eventPayload.properties.updatedFields,
|
||||
eventPayload.objectMetadata,
|
||||
);
|
||||
}
|
||||
|
||||
return this.handle(payload);
|
||||
}
|
||||
|
||||
@OnEvent('*.deleted')
|
||||
async handleDelete(payload: ObjectRecordUpdateEvent<any>) {
|
||||
async handleDelete(
|
||||
payload: WorkspaceEventBatch<ObjectRecordUpdateEvent<any>>,
|
||||
) {
|
||||
return this.handle(payload);
|
||||
}
|
||||
|
||||
private async handle(payload: ObjectRecordBaseEvent) {
|
||||
if (!payload.objectMetadata?.isAuditLogged) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.messageQueueService.add<ObjectRecordBaseEvent>(
|
||||
CreateAuditLogFromInternalEvent.name,
|
||||
payload,
|
||||
private async handle(payload: WorkspaceEventBatch<ObjectRecordBaseEvent>) {
|
||||
payload.events = payload.events.filter(
|
||||
(event) => event.objectMetadata?.isAuditLogged,
|
||||
);
|
||||
|
||||
this.messageQueueService.add<ObjectRecordBaseEvent>(
|
||||
UpsertTimelineActivityFromInternalEvent.name,
|
||||
payload,
|
||||
);
|
||||
await this.messageQueueService.add<
|
||||
WorkspaceEventBatch<ObjectRecordBaseEvent>
|
||||
>(CreateAuditLogFromInternalEvent.name, payload);
|
||||
|
||||
await this.messageQueueService.add<
|
||||
WorkspaceEventBatch<ObjectRecordBaseEvent>
|
||||
>(UpsertTimelineActivityFromInternalEvent.name, payload);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import { OnEvent } from '@nestjs/event-emitter';
|
||||
import { AnalyticsService } from 'src/engine/core-modules/analytics/analytics.service';
|
||||
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
|
||||
import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
|
||||
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
|
||||
|
||||
@Injectable()
|
||||
export class TelemetryListener {
|
||||
@ -13,36 +14,48 @@ export class TelemetryListener {
|
||||
) {}
|
||||
|
||||
@OnEvent('*.created')
|
||||
async handleAllCreate(payload: ObjectRecordCreateEvent<any>) {
|
||||
await this.analyticsService.create(
|
||||
{
|
||||
type: 'track',
|
||||
data: {
|
||||
eventName: payload.name,
|
||||
},
|
||||
},
|
||||
payload.userId,
|
||||
payload.workspaceId,
|
||||
'', // voluntarely not retrieving this
|
||||
'', // to avoid slowing down
|
||||
this.environmentService.get('SERVER_URL'),
|
||||
async handleAllCreate(
|
||||
payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
|
||||
) {
|
||||
await Promise.all(
|
||||
payload.events.map((eventPayload) =>
|
||||
this.analyticsService.create(
|
||||
{
|
||||
type: 'track',
|
||||
data: {
|
||||
eventName: payload.name,
|
||||
},
|
||||
},
|
||||
eventPayload.userId,
|
||||
payload.workspaceId,
|
||||
'', // voluntarily not retrieving this
|
||||
'', // to avoid slowing down
|
||||
this.environmentService.get('SERVER_URL'),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@OnEvent('user.signup')
|
||||
async handleUserSignup(payload: ObjectRecordCreateEvent<any>) {
|
||||
await this.analyticsService.create(
|
||||
{
|
||||
type: 'track',
|
||||
data: {
|
||||
eventName: 'user.signup',
|
||||
},
|
||||
},
|
||||
payload.userId,
|
||||
payload.workspaceId,
|
||||
'',
|
||||
'',
|
||||
this.environmentService.get('SERVER_URL'),
|
||||
async handleUserSignup(
|
||||
payload: WorkspaceEventBatch<ObjectRecordCreateEvent<any>>,
|
||||
) {
|
||||
await Promise.all(
|
||||
payload.events.map((eventPayload) =>
|
||||
this.analyticsService.create(
|
||||
{
|
||||
type: 'track',
|
||||
data: {
|
||||
eventName: 'user.signup',
|
||||
},
|
||||
},
|
||||
eventPayload.userId,
|
||||
payload.workspaceId,
|
||||
'',
|
||||
'',
|
||||
this.environmentService.get('SERVER_URL'),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||
|
||||
import isEmpty from 'lodash.isempty';
|
||||
import { DataSource } from 'typeorm';
|
||||
@ -55,6 +54,8 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.
|
||||
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
|
||||
import { isQueryTimeoutError } from 'src/engine/utils/query-timeout.util';
|
||||
import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
|
||||
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
|
||||
import { isDefined } from 'src/utils/is-defined';
|
||||
|
||||
import {
|
||||
PGGraphQLMutation,
|
||||
@ -78,7 +79,7 @@ export class WorkspaceQueryRunnerService {
|
||||
private readonly queryResultGettersFactory: QueryResultGettersFactory,
|
||||
@InjectMessageQueue(MessageQueue.webhookQueue)
|
||||
private readonly messageQueueService: MessageQueueService,
|
||||
private readonly eventEmitter: EventEmitter2,
|
||||
private readonly workspaceEventEmitter: WorkspaceEventEmitter,
|
||||
private readonly workspaceQueryHookService: WorkspaceQueryHookService,
|
||||
private readonly environmentService: EnvironmentService,
|
||||
private readonly duplicateService: DuplicateService,
|
||||
@ -304,18 +305,21 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
parsedResults.forEach((record) => {
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
|
||||
name: `${objectMetadataItem.nameSingular}.created`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
after: record,
|
||||
},
|
||||
} satisfies ObjectRecordCreateEvent<any>);
|
||||
});
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.created`,
|
||||
parsedResults.map(
|
||||
(record) =>
|
||||
({
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
after: record,
|
||||
},
|
||||
}) satisfies ObjectRecordCreateEvent<any>,
|
||||
),
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults;
|
||||
}
|
||||
@ -440,18 +444,22 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
|
||||
name: `${objectMetadataItem.nameSingular}.updated`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: existingRecord.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
updatedFields: Object.keys(args.data),
|
||||
before: this.removeNestedProperties(existingRecord as Record),
|
||||
after: this.removeNestedProperties(parsedResults?.[0]),
|
||||
},
|
||||
} satisfies ObjectRecordUpdateEvent<any>);
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.updated`,
|
||||
[
|
||||
{
|
||||
userId: authContext.user?.id,
|
||||
recordId: existingRecord.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
updatedFields: Object.keys(args.data),
|
||||
before: this.removeNestedProperties(existingRecord as Record),
|
||||
after: this.removeNestedProperties(parsedResults?.[0]),
|
||||
},
|
||||
} satisfies ObjectRecordUpdateEvent<any>,
|
||||
],
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults?.[0];
|
||||
}
|
||||
@ -513,30 +521,36 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
parsedResults.forEach((record) => {
|
||||
const existingRecord = mappedRecords.get(record.id);
|
||||
const eventsToEmit: ObjectRecordUpdateEvent<any>[] = parsedResults
|
||||
.map((record) => {
|
||||
const existingRecord = mappedRecords.get(record.id);
|
||||
|
||||
if (!existingRecord) {
|
||||
this.logger.warn(
|
||||
`Record with id ${record.id} not found in the database`,
|
||||
);
|
||||
if (!existingRecord) {
|
||||
this.logger.warn(
|
||||
`Record with id ${record.id} not found in the database`,
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
|
||||
name: `${objectMetadataItem.nameSingular}.updated`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: existingRecord.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
updatedFields: Object.keys(args.data),
|
||||
before: this.removeNestedProperties(existingRecord as Record),
|
||||
after: this.removeNestedProperties(record),
|
||||
},
|
||||
} satisfies ObjectRecordUpdateEvent<any>);
|
||||
});
|
||||
return {
|
||||
userId: authContext.user?.id,
|
||||
recordId: existingRecord.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
updatedFields: Object.keys(args.data),
|
||||
before: this.removeNestedProperties(existingRecord as Record),
|
||||
after: this.removeNestedProperties(record),
|
||||
},
|
||||
};
|
||||
})
|
||||
.filter(isDefined);
|
||||
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.updated`,
|
||||
eventsToEmit,
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults;
|
||||
}
|
||||
@ -602,18 +616,21 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
parsedResults.forEach((record) => {
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
|
||||
name: `${objectMetadataItem.nameSingular}.deleted`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
before: this.removeNestedProperties(record),
|
||||
},
|
||||
} satisfies ObjectRecordDeleteEvent<any>);
|
||||
});
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.deleted`,
|
||||
parsedResults.map(
|
||||
(record) =>
|
||||
({
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
before: this.removeNestedProperties(record),
|
||||
},
|
||||
}) satisfies ObjectRecordDeleteEvent<any>,
|
||||
),
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults;
|
||||
}
|
||||
@ -744,18 +761,21 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
parsedResults.forEach((record) => {
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
|
||||
name: `${objectMetadataItem.nameSingular}.created`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
after: this.removeNestedProperties(record),
|
||||
},
|
||||
} satisfies ObjectRecordCreateEvent<any>);
|
||||
});
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.created`,
|
||||
parsedResults.map(
|
||||
(record) =>
|
||||
({
|
||||
userId: authContext.user?.id,
|
||||
recordId: record.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
after: this.removeNestedProperties(record),
|
||||
},
|
||||
}) satisfies ObjectRecordCreateEvent<any>,
|
||||
),
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults;
|
||||
}
|
||||
@ -821,19 +841,23 @@ export class WorkspaceQueryRunnerService {
|
||||
options,
|
||||
);
|
||||
|
||||
this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
|
||||
name: `${objectMetadataItem.nameSingular}.deleted`,
|
||||
workspaceId: authContext.workspace.id,
|
||||
userId: authContext.user?.id,
|
||||
recordId: args.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
before: {
|
||||
...(existingRecord ?? {}),
|
||||
...this.removeNestedProperties(parsedResults?.[0]),
|
||||
},
|
||||
},
|
||||
} satisfies ObjectRecordDeleteEvent<any>);
|
||||
this.workspaceEventEmitter.emit(
|
||||
`${objectMetadataItem.nameSingular}.deleted`,
|
||||
[
|
||||
{
|
||||
userId: authContext.user?.id,
|
||||
recordId: args.id,
|
||||
objectMetadata: objectMetadataItem,
|
||||
properties: {
|
||||
before: {
|
||||
...(existingRecord ?? {}),
|
||||
...this.removeNestedProperties(parsedResults?.[0]),
|
||||
},
|
||||
},
|
||||
} satisfies ObjectRecordDeleteEvent<any>,
|
||||
],
|
||||
authContext.workspace.id,
|
||||
);
|
||||
|
||||
return parsedResults?.[0];
|
||||
}
|
||||
|
||||
@ -10,6 +10,7 @@ import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/t
|
||||
import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
|
||||
import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
|
||||
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
|
||||
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
|
||||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
|
||||
|
||||
@Injectable()
|
||||
@ -23,7 +24,9 @@ export class BillingWorkspaceMemberListener {
|
||||
@OnEvent('workspaceMember.created')
|
||||
@OnEvent('workspaceMember.deleted')
|
||||
async handleCreateOrDeleteEvent(
|
||||
payload: ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>,
|
||||
payload: WorkspaceEventBatch<
|
||||
ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>
|
||||
>,
|
||||
) {
|
||||
if (!this.environmentService.get('IS_BILLING_ENABLED')) {
|
||||
return;
|
||||
|
||||
@ -13,6 +13,7 @@ import { PostgresCredentialsModule } from 'src/engine/core-modules/postgres-cred
|
||||
import { UserModule } from 'src/engine/core-modules/user/user.module';
|
||||
import { WorkflowTriggerCoreModule } from 'src/engine/core-modules/workflow/core-workflow-trigger.module';
|
||||
import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
|
||||
import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
|
||||
|
||||
import { AnalyticsModule } from './analytics/analytics.module';
|
||||
import { ClientConfigModule } from './client-config/client-config.module';
|
||||
@ -36,6 +37,7 @@ import { FileModule } from './file/file.module';
|
||||
AISQLQueryModule,
|
||||
PostgresCredentialsModule,
|
||||
WorkflowTriggerCoreModule,
|
||||
WorkspaceEventEmitterModule,
|
||||
],
|
||||
exports: [
|
||||
AnalyticsModule,
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
/* eslint-disable @nx/workspace-inject-workspace-repository */
|
||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
|
||||
@ -11,6 +10,7 @@ import { User } from 'src/engine/core-modules/user/user.entity';
|
||||
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
|
||||
import { ObjectRecordCreateEvent } from 'src/engine/integrations/event-emitter/types/object-record-create.event';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
|
||||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
|
||||
import { assert } from 'src/utils/assert';
|
||||
|
||||
@ -22,7 +22,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
|
||||
private readonly userRepository: Repository<User>,
|
||||
private readonly dataSourceService: DataSourceService,
|
||||
private readonly typeORMService: TypeORMService,
|
||||
private eventEmitter: EventEmitter2,
|
||||
private workspaceEventEmitter: WorkspaceEventEmitter,
|
||||
) {
|
||||
super(userWorkspaceRepository);
|
||||
}
|
||||
@ -35,11 +35,9 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
|
||||
|
||||
const payload = new ObjectRecordCreateEvent<UserWorkspace>();
|
||||
|
||||
payload.workspaceId = workspaceId;
|
||||
payload.userId = userId;
|
||||
payload.name = 'user.signup';
|
||||
|
||||
this.eventEmitter.emit('user.signup', payload);
|
||||
this.workspaceEventEmitter.emit('user.signup', [payload], workspaceId);
|
||||
|
||||
return this.userWorkspaceRepository.save(userWorkspace);
|
||||
}
|
||||
@ -76,14 +74,16 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
|
||||
const payload =
|
||||
new ObjectRecordCreateEvent<WorkspaceMemberWorkspaceEntity>();
|
||||
|
||||
payload.workspaceId = workspaceId;
|
||||
payload.properties = {
|
||||
after: workspaceMember[0],
|
||||
};
|
||||
payload.recordId = workspaceMember[0].id;
|
||||
payload.name = 'workspaceMember.created';
|
||||
|
||||
this.eventEmitter.emit('workspaceMember.created', payload);
|
||||
this.workspaceEventEmitter.emit(
|
||||
'workspaceMember.created',
|
||||
[payload],
|
||||
workspaceId,
|
||||
);
|
||||
}
|
||||
|
||||
async addUserToWorkspace(user: User, workspace: Workspace) {
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
import { Test, TestingModule } from '@nestjs/testing';
|
||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||
|
||||
import { UserService } from 'src/engine/core-modules/user/services/user.service';
|
||||
import { User } from 'src/engine/core-modules/user/user.entity';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
|
||||
import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
|
||||
import { UserService } from 'src/engine/core-modules/user/services/user.service';
|
||||
import { User } from 'src/engine/core-modules/user/user.entity';
|
||||
import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
|
||||
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
|
||||
|
||||
describe('UserService', () => {
|
||||
let service: UserService;
|
||||
@ -34,7 +34,7 @@ describe('UserService', () => {
|
||||
useValue: {},
|
||||
},
|
||||
{
|
||||
provide: EventEmitter2,
|
||||
provide: WorkspaceEventEmitter,
|
||||
useValue: {},
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
|
||||
import assert from 'assert';
|
||||
@ -16,6 +15,7 @@ import {
|
||||
import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
|
||||
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
|
||||
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
|
||||
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
|
||||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
|
||||
|
||||
// eslint-disable-next-line @nx/workspace-inject-workspace-repository
|
||||
@ -25,7 +25,7 @@ export class UserService extends TypeOrmQueryService<User> {
|
||||
private readonly userRepository: Repository<User>,
|
||||
private readonly dataSourceService: DataSourceService,
|
||||
private readonly typeORMService: TypeORMService,
|
||||
private readonly eventEmitter: EventEmitter2,
|
||||
private readonly workspaceEventEmitter: WorkspaceEventEmitter,
|
||||
private readonly workspaceService: WorkspaceService,
|
||||
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
|
||||
) {
|
||||
@ -110,15 +110,16 @@ export class UserService extends TypeOrmQueryService<User> {
|
||||
const payload =
|
||||
new ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>();
|
||||
|
||||
payload.workspaceId = workspaceId;
|
||||
payload.properties = {
|
||||
before: workspaceMember,
|
||||
};
|
||||
payload.name = 'workspaceMember.deleted';
|
||||
payload.recordId = workspaceMember.id;
|
||||
payload.name = 'workspaceMember.deleted';
|
||||
|
||||
this.eventEmitter.emit('workspaceMember.deleted', payload);
|
||||
this.workspaceEventEmitter.emit(
|
||||
'workspaceMember.deleted',
|
||||
[payload],
|
||||
workspaceId,
|
||||
);
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ import { ObjectRecordUpdateEvent } from 'src/engine/integrations/event-emitter/t
|
||||
import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
|
||||
import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
|
||||
import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
|
||||
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
|
||||
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
|
||||
|
||||
@Injectable()
|
||||
@ -23,39 +24,51 @@ export class WorkspaceWorkspaceMemberListener {
|
||||
|
||||
@OnEvent('workspaceMember.updated')
|
||||
async handleUpdateEvent(
|
||||
payload: ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>,
|
||||
payload: WorkspaceEventBatch<
|
||||
ObjectRecordUpdateEvent<WorkspaceMemberWorkspaceEntity>
|
||||
>,
|
||||
) {
|
||||
const { firstName: firstNameAfter, lastName: lastNameAfter } =
|
||||
payload.properties.after.name;
|
||||
await Promise.all(
|
||||
payload.events.map((eventPayload) => {
|
||||
const { firstName: firstNameAfter, lastName: lastNameAfter } =
|
||||
eventPayload.properties.after.name;
|
||||
|
||||
if (firstNameAfter === '' && lastNameAfter === '') {
|
||||
return;
|
||||
}
|
||||
if (firstNameAfter === '' && lastNameAfter === '') {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!payload.userId) {
|
||||
return;
|
||||
}
|
||||
if (!eventPayload.userId) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.onboardingService.setOnboardingCreateProfilePending({
|
||||
userId: payload.userId,
|
||||
workspaceId: payload.workspaceId,
|
||||
value: false,
|
||||
});
|
||||
return this.onboardingService.setOnboardingCreateProfilePending({
|
||||
userId: eventPayload.userId,
|
||||
workspaceId: payload.workspaceId,
|
||||
value: false,
|
||||
});
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@OnEvent('workspaceMember.deleted')
|
||||
async handleDeleteEvent(
|
||||
payload: ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>,
|
||||
payload: WorkspaceEventBatch<
|
||||
ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>
|
||||
>,
|
||||
) {
|
||||
const userId = payload.properties.before.userId;
|
||||
await Promise.all(
|
||||
payload.events.map((eventPayload) => {
|
||||
const userId = eventPayload.properties.before.userId;
|
||||
|
||||
if (!userId) {
|
||||
return;
|
||||
}
|
||||
if (!userId) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.messageQueueService.add<HandleWorkspaceMemberDeletedJobData>(
|
||||
HandleWorkspaceMemberDeletedJob.name,
|
||||
{ workspaceId: payload.workspaceId, userId },
|
||||
return this.messageQueueService.add<HandleWorkspaceMemberDeletedJobData>(
|
||||
HandleWorkspaceMemberDeletedJob.name,
|
||||
{ workspaceId: payload.workspaceId, userId },
|
||||
);
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
import { ObjectRecordBaseEvent } from 'src/engine/integrations/event-emitter/types/object-record.base.event';
|
||||
|
||||
export class ObjectRecordJobData extends ObjectRecordBaseEvent {
|
||||
getOperation() {
|
||||
return this.name.split('.')[1];
|
||||
}
|
||||
|
||||
getObjectName() {
|
||||
return this.name.split('.')[0];
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,14 @@
|
||||
import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
|
||||
|
||||
export class ObjectRecordBaseEvent {
|
||||
name: string;
|
||||
workspaceId: string;
|
||||
recordId: string;
|
||||
userId?: string;
|
||||
workspaceMemberId?: string;
|
||||
objectMetadata: ObjectMetadataInterface;
|
||||
properties: any;
|
||||
}
|
||||
|
||||
export class ObjectRecordBaseEventWithNameAndWorkspaceId extends ObjectRecordBaseEvent {
|
||||
name: string;
|
||||
workspaceId: string;
|
||||
}
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
import { Global, Module } from '@nestjs/common';
|
||||
|
||||
import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
|
||||
|
||||
@Global()
|
||||
@Module({
|
||||
imports: [],
|
||||
providers: [WorkspaceEventEmitter],
|
||||
exports: [WorkspaceEventEmitter],
|
||||
})
|
||||
export class WorkspaceEventEmitterModule {}
|
||||
@ -0,0 +1,21 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { EventEmitter2 } from '@nestjs/event-emitter';
|
||||
|
||||
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/workspace-event.type';
|
||||
|
||||
@Injectable()
|
||||
export class WorkspaceEventEmitter {
|
||||
constructor(private readonly eventEmitter: EventEmitter2) {}
|
||||
|
||||
public emit(eventName: string, events: any[], workspaceId: string) {
|
||||
if (!events.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
return this.eventEmitter.emit(eventName, {
|
||||
name: eventName,
|
||||
workspaceId,
|
||||
events,
|
||||
} satisfies WorkspaceEventBatch<any>);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
export type WorkspaceEventBatch<WorkspaceEvent> = {
|
||||
name: string;
|
||||
workspaceId: string;
|
||||
events: WorkspaceEvent[];
|
||||
};
|
||||
Reference in New Issue
Block a user