diff --git a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts index eebf419a84..60a545d1ea 100644 --- a/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts +++ b/packages/twenty-server/src/engine/core-modules/billing/listeners/billing-workspace-member.listener.ts @@ -27,6 +27,7 @@ export class BillingWorkspaceMemberListener { @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.CREATED) @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.DELETED) + @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.DESTROYED) async handleCreateOrDeleteEvent( payload: WorkspaceEventBatch< ObjectRecordCreateEvent diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts index 2d7c9c912b..fc2311b71e 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/compute-event-select-query-builder.util.ts @@ -46,5 +46,14 @@ export const computeEventSelectQueryBuilder = ({ eventSelectQueryBuilder.expressionMap.aliases = expressionMap.aliases; eventSelectQueryBuilder.setParameters(expressionMap.parameters); + if ( + eventSelectQueryBuilder.expressionMap.selects.length === 0 && + eventSelectQueryBuilder.expressionMap.mainAlias + ) { + eventSelectQueryBuilder.expressionMap.selects = [ + { selection: eventSelectQueryBuilder.expressionMap.mainAlias.name }, + ]; + } + return eventSelectQueryBuilder; };