Skip to content

The open alternative to Salesforce, designed for AI.

refactor(twenty-orm): replace scoped repository save() with insert/update (#24294)

Félix Malfait585e87405eec
diff --git a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts
index d8755d641bb..493b4744426 100644
--- a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts
@@ -28,10 +28,13 @@ export class ApiKeyService {
) {}
async create(
- apiKeyData: Partial<ApiKeyEntity> & { roleId: string; workspaceId: string },
+ apiKeyData: Pick<ApiKeyEntity, 'name' | 'expiresAt' | 'revokedAt'> & {
+ roleId: string;
+ workspaceId: string;
+ },
): Promise<ApiKeyEntity> {
const { roleId, workspaceId, ...apiKeyFields } = apiKeyData;
- const savedApiKey = await this.apiKeyRepository.save(
+ const savedApiKey = await this.apiKeyRepository.insertAndReturnOne(
workspaceId,
apiKeyFields,
);
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts
index fa445d885a7..fd80a80ccac 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts
@@ -230,10 +230,13 @@ export class ApprovedAccessDomainService {
);
}
- return this.approvedAccessDomainRepository.save(
+ await this.approvedAccessDomainRepository.update(
approvedAccessDomain.workspaceId,
- { ...approvedAccessDomain, isValidated: true },
+ { id: approvedAccessDomain.id },
+ { isValidated: true },
);
+
+ return { ...approvedAccessDomain, isValidated: true };
}
async createApprovedAccessDomain(
@@ -264,10 +267,11 @@ export class ApprovedAccessDomainService {
);
}
- const approvedAccessDomain = await this.approvedAccessDomainRepository.save(
- inWorkspace.id,
- { domain },
- );
+ const approvedAccessDomain =
+ await this.approvedAccessDomainRepository.insertAndReturnOne(
+ inWorkspace.id,
+ { domain },
+ );
await this.sendApprovedAccessDomainValidationEmail(
fromWorkspaceMember,
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts
index 0459c9f10d6..17e3c19f9c8 100644
--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts
@@ -58,7 +58,8 @@ describe('ApprovedAccessDomainService', () => {
delete: jest.fn(),
findOne: jest.fn(),
find: jest.fn(),
- save: jest.fn(),
+ update: jest.fn(),
+ insertAndReturnOne: jest.fn(),
},
},
{
@@ -142,7 +143,7 @@ describe('ApprovedAccessDomainService', () => {
};
jest
- .spyOn(approvedAccessDomainRepository, 'save')
+ .spyOn(approvedAccessDomainRepository, 'insertAndReturnOne')
.mockResolvedValue(
expectedApprovedAccessDomain as unknown as ApprovedAccessDomainEntity,
);
@@ -158,7 +159,9 @@ describe('ApprovedAccessDomainService', () => {
);
- expect(approvedAccessDomainRepository.save).toHaveBeenCalledWith(
+ expect(
+ approvedAccessDomainRepository.insertAndReturnOne,
+ ).toHaveBeenCalledWith(
'workspace-id',
expect.objectContaining({ domain }),
);
@@ -180,7 +183,9 @@ describe('ApprovedAccessDomainService', () => {
ApprovedAccessDomainExceptionCode.APPROVED_ACCESS_DOMAIN_MUST_BE_A_COMPANY_DOMAIN,
),
);
- expect(approvedAccessDomainRepository.save).not.toHaveBeenCalled();
+ expect(
+ approvedAccessDomainRepository.insertAndReturnOne,
+ ).not.toHaveBeenCalled();
});
});
@@ -390,7 +395,7 @@ describe('ApprovedAccessDomainService', () => {
jest
.spyOn(approvedAccessDomainRepositoryUnscoped, 'findOneBy')
.mockResolvedValue(approvedAccessDomain);
- const saveSpy = jest.spyOn(approvedAccessDomainRepository, 'save');
+ const updateSpy = jest.spyOn(approvedAccessDomainRepository, 'update');
await service.validateApprovedAccessDomain({
validationToken,
@@ -403,9 +408,10 @@ describe('ApprovedAccessDomainService', () => {
expect(
approvedAccessDomainRepositoryUnscoped.findOneBy,
).toHaveBeenCalledWith({ id: approvedAccessDomainId });
- expect(saveSpy).toHaveBeenCalledWith(
+ expect(updateSpy).toHaveBeenCalledWith(
workspaceId,
- expect.objectContaining({ isValidated: true }),
+ { id: approvedAccessDomainId },
+ { isValidated: true },
);
});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts
index b1bebf25a4d..4c6bf9368cc 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts
@@ -94,7 +94,7 @@ export class StripeCustomerService {
},
});
- await this.billingCustomerRepository.save(workspaceId, {
+ await this.billingCustomerRepository.insert(workspaceId, {
stripeCustomerId: customer.id,
hasPaymentMethod: false,
});
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
index b196f4ca327..dc45da93bc2 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
@@ -70,15 +70,13 @@ export class EmailingDomainService {
const isVerifiedOnCreation =
verificationResult.status === EmailingDomainStatus.VERIFIED;
- const emailingDomain = await this.emailingDomainRepository.save(
- workspaceId,
- {
+ const emailingDomain =
+ await this.emailingDomainRepository.insertAndReturnOne(workspaceId, {
domain,
status: verificationResult.status,
verificationRecords: verificationResult.verificationRecords,
verifiedAt: isVerifiedOnCreation ? new Date() : null,
- },
- );
+ });
await this.unsubscribeHostnameService.sync(workspaceId, emailingDomain.id, {
provision: true,
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
index 2e857b580f3..4269ed46a94 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
@@ -107,18 +107,10 @@ export class FeatureFlagService {
);
}
- const existingFeatureFlag = await this.featureFlagRepository.findOne(
+ const result = await this.featureFlagRepository.upsertAndReturnOne(
workspaceId,
- { where: { key: featureFlag } },
- );
-
- const featureFlagToSave = existingFeatureFlag
- ? { ...existingFeatureFlag, value }
- : { key: featureFlag, value };
-
- const result = await this.featureFlagRepository.save(
- workspaceId,
- featureFlagToSave,
+ { key: featureFlag, value },
+ ['workspaceId', 'key'],
);
await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
diff --git a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.service.ts b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.service.ts
index 693ff5c6c6b..998f602a6f6 100644
--- a/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/public-domain/public-domain.service.ts
@@ -149,11 +149,10 @@ export class PublicDomainService {
});
if (publicDomain.isValidated !== isCustomDomainWorking) {
- publicDomain.isValidated = isCustomDomainWorking;
-
- await this.publicDomainRepository.save(
+ await this.publicDomainRepository.update(
publicDomain.workspaceId,
- publicDomain,
+ { id: publicDomain.id },
+ { isValidated: isCustomDomainWorking },
);
}
diff --git a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts
index f9bb4494cff..3506cee8cbc 100644
--- a/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/two-factor-authentication/two-factor-authentication.service.ts
@@ -52,8 +52,6 @@ export class TwoFactorAuthenticationService {
});
}
- // Throws TWO_FACTOR_AUTHENTICATION_VERIFICATION_REQUIRED when 2FA is set up, and
- // TWO_FACTOR_AUTHENTICATION_PROVISION_REQUIRED when it is enforced but not set up
async validateTwoFactorAuthenticationRequirement(
targetWorkspace: WorkspaceEntity,
userTwoFactorAuthenticationMethods?: TwoFactorAuthenticationMethodEntity[],
@@ -135,13 +133,16 @@ export class TwoFactorAuthenticationService {
{ workspaceId },
);
- await this.twoFactorAuthenticationMethodRepository.save(workspaceId, {
- id: existing2FAMethod?.id,
- userWorkspace: userWorkspace,
- secret: encryptedSecret,
- status: context.status,
- strategy: TwoFactorAuthenticationStrategy.TOTP,
- });
+ await this.twoFactorAuthenticationMethodRepository.upsert(
+ workspaceId,
+ {
+ userWorkspaceId: userWorkspace.id,
+ secret: encryptedSecret,
+ status: context.status,
+ strategy: TwoFactorAuthenticationStrategy.TOTP,
+ },
+ ['userWorkspaceId', 'strategy'],
+ );
return uri;
}
@@ -198,10 +199,11 @@ export class TwoFactorAuthenticationService {
);
}
- await this.twoFactorAuthenticationMethodRepository.save(workspaceId, {
- ...userTwoFactorAuthenticationMethod,
- status: OTPStatus.VERIFIED,
- });
+ await this.twoFactorAuthenticationMethodRepository.update(
+ workspaceId,
+ { id: userTwoFactorAuthenticationMethod.id },
+ { status: OTPStatus.VERIFIED },
+ );
}
async verifyTwoFactorAuthenticationMethodForAuthenticatedUser(
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
index 04d5ebdb6cb..499c520b5fe 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-core-sync.service.ts
@@ -39,14 +39,25 @@ export class WorkflowCoreSyncService {
const applicationId = await this.getCustomApplicationIdOrThrow(workspaceId);
+ const linkedCoreWorkflowIds = await this.resolveOwnedCoreWorkflowIds(
+ workspaceId,
+ workflows,
+ );
+
const coreWorkflowIdByWorkspaceRecordId = new Map<string, string>();
const coreRows = workflows.map((workflow) => {
- const coreWorkflowId = isNonEmptyString(workflow.coreWorkflowId)
- ? workflow.coreWorkflowId
- : uuidv4();
+ const candidateCoreWorkflowId = workflow.coreWorkflowId;
+
+ const linkedCoreWorkflowId =
+ isNonEmptyString(candidateCoreWorkflowId) &&
+ linkedCoreWorkflowIds.has(candidateCoreWorkflowId)
+ ? candidateCoreWorkflowId
+ : null;
- if (!isNonEmptyString(workflow.coreWorkflowId)) {
+ const coreWorkflowId = linkedCoreWorkflowId ?? uuidv4();
+
+ if (!isDefined(linkedCoreWorkflowId)) {
coreWorkflowIdByWorkspaceRecordId.set(workflow.id, coreWorkflowId);
}
@@ -71,6 +82,28 @@ export class WorkflowCoreSyncService {
);
}
+ // coreWorkflowId is a writable column on the workspace record, so a caller
+ // can point it at a core row owned by another workspace.
+ private async resolveOwnedCoreWorkflowIds(
+ workspaceId: string,
+ workflows: WorkflowWorkspaceEntity[],
+ ): Promise<Set<string>> {
+ const candidateIds = workflows
+ .map((workflow) => workflow.coreWorkflowId)
+ .filter(isNonEmptyString);
+
+ if (candidateIds.length === 0) {
+ return new Set();
+ }
+
+ const ownedRows = await this.coreWorkflowRepository.find(workspaceId, {
+ where: { id: In(candidateIds) },
+ select: { id: true },
+ });
+
+ return new Set(ownedRows.map((row) => row.id));
+ }
+
async deleteFromCore(
workspaceId: string,
coreWorkflowIds: string[],
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
index c8f06d85a82..4c66d37c573 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/workflow-version-core-sync.service.ts
@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
import { isNonEmptyString } from '@sniptt/guards';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { In, Repository } from 'typeorm';
import { v4 as uuidv4 } from 'uuid';
@@ -44,16 +44,25 @@ export class WorkflowVersionCoreSyncService {
const applicationId = await this.getCustomApplicationIdOrThrow(workspaceId);
+ const linkedCoreVersionIds = await this.resolveOwnedCoreVersionIds(
+ workspaceId,
+ workflowVersions,
+ );
+
const coreVersionIdByWorkspaceRecordId = new Map<string, string>();
const coreRows = workflowVersions.map((workflowVersion) => {
- const coreWorkflowVersionId = isNonEmptyString(
- workflowVersion.coreWorkflowVersionId,
- )
- ? workflowVersion.coreWorkflowVersionId
- : uuidv4();
+ const candidateCoreVersionId = workflowVersion.coreWorkflowVersionId;
+
+ const linkedCoreVersionId =
+ isNonEmptyString(candidateCoreVersionId) &&
+ linkedCoreVersionIds.has(candidateCoreVersionId)
+ ? candidateCoreVersionId
+ : null;
- if (!isNonEmptyString(workflowVersion.coreWorkflowVersionId)) {
+ const coreWorkflowVersionId = linkedCoreVersionId ?? uuidv4();
+
+ if (!isDefined(linkedCoreVersionId)) {
coreVersionIdByWorkspaceRecordId.set(
workflowVersion.id,
coreWorkflowVersionId,
@@ -85,6 +94,30 @@ export class WorkflowVersionCoreSyncService {
await this.invalidateAutomatedTriggerMaps(workspaceId);
}
+ // Same caller-writable column as coreWorkflowId, see WorkflowCoreSyncService.
+ private async resolveOwnedCoreVersionIds(
+ workspaceId: string,
+ workflowVersions: WorkflowVersionWorkspaceEntity[],
+ ): Promise<Set<string>> {
+ const candidateIds = workflowVersions
+ .map((workflowVersion) => workflowVersion.coreWorkflowVersionId)
+ .filter(isNonEmptyString);
+
+ if (candidateIds.length === 0) {
+ return new Set();
+ }
+
+ const ownedRows = await this.coreWorkflowVersionRepository.find(
+ workspaceId,
+ {
+ where: { id: In(candidateIds) },
+ select: { id: true },
+ },
+ );
+
+ return new Set(ownedRows.map((row) => row.id));
+ }
+
async deleteFromCore(
workspaceId: string,
coreWorkflowVersionIds: string[],
@@ -131,13 +164,24 @@ export class WorkflowVersionCoreSyncService {
const resolvedApplicationId =
applicationId ?? (await this.getCustomApplicationIdOrThrow(workspaceId));
- const isNewLink = !isNonEmptyString(workflowVersion.coreWorkflowVersionId);
- const coreWorkflowVersionId = isNonEmptyString(
- workflowVersion.coreWorkflowVersionId,
- )
- ? workflowVersion.coreWorkflowVersionId
- : uuidv4();
+ const candidateCoreVersionId = workflowVersion.coreWorkflowVersionId;
+
+ const linkedCoreVersionId =
+ isNonEmptyString(candidateCoreVersionId) &&
+ (await this.isCoreVersionOwnedByWorkspace({
+ coreWorkflowVersionId: candidateCoreVersionId,
+ workspaceId,
+ transactionScope,
+ }))
+ ? candidateCoreVersionId
+ : null;
+ const isNewLink = !isDefined(linkedCoreVersionId);
+ const coreWorkflowVersionId = linkedCoreVersionId ?? uuidv4();
+
+ // The conflict target is the primary key alone, so without the workspaceId
+ // predicate a core row owned by another workspace would have its triggers
+ // and steps overwritten.
await transactionScope.executeRawQuery(
`INSERT INTO core."workflowVersion"
("id", "workspaceId", "workflowId", "triggers", "steps", "status", "universalIdentifier", "applicationId")
@@ -145,7 +189,8 @@ export class WorkflowVersionCoreSyncService {
ON CONFLICT ("id") DO UPDATE SET
"triggers" = EXCLUDED."triggers",
"steps" = EXCLUDED."steps",
- "status" = EXCLUDED."status"`,
+ "status" = EXCLUDED."status"
+ WHERE core."workflowVersion"."workspaceId" = EXCLUDED."workspaceId"`,
[
coreWorkflowVersionId,
workspaceId,
@@ -173,6 +218,25 @@ export class WorkflowVersionCoreSyncService {
return { coreWorkflowVersionId };
}
+ // Must run inside the caller's transaction so the ownership answer cannot go
+ // stale before the insert below uses it.
+ private async isCoreVersionOwnedByWorkspace({
+ coreWorkflowVersionId,
+ workspaceId,
+ transactionScope,
+ }: {
+ coreWorkflowVersionId: string;
+ workspaceId: string;
+ transactionScope: WorkspaceTransactionScope;
+ }): Promise<boolean> {
+ const rows = await transactionScope.executeRawQuery(
+ `SELECT 1 FROM core."workflowVersion" WHERE "id" = $1 AND "workspaceId" = $2`,
+ [coreWorkflowVersionId, workspaceId],
+ );
+
+ return isNonEmptyArray(rows);
+ }
+
async mirrorWorkflowVersionWrites({
workspaceId,
transactionScope,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
index 1b76543df63..c18ed2f0c24 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -70,23 +70,28 @@ export class AgentTurnResolver {
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string,
): Promise<AgentTurnEntity> {
- // Resolver-level ownership check: throws if the agent doesn't belong
- // to the caller's workspace. Defense in depth: the job also re-fetches
- // the agent through a workspace-scoped repository.
+ // Defense in depth: the job also re-fetches the agent through a
+ // workspace-scoped repository.
await this.agentService.findOneAgentById({
id: agentId,
workspaceId: workspace.id,
});
- const savedThread = await this.threadRepository.save(workspace.id, {
- userWorkspaceId,
- title: `Eval: ${input.substring(0, 50)}...`,
- });
+ const savedThread = await this.threadRepository.insertAndReturnOne(
+ workspace.id,
+ {
+ userWorkspaceId,
+ title: `Eval: ${input.substring(0, 50)}...`,
+ },
+ );
- const savedTurn = await this.turnRepository.save(workspace.id, {
- threadId: savedThread.id,
- agentId,
- });
+ const savedTurn = await this.turnRepository.insertAndReturnOne(
+ workspace.id,
+ {
+ threadId: savedThread.id,
+ agentId,
+ },
+ );
await this.messageQueueService.add<{
turnId: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
index d1a3e76ea48..647bb25e6b1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service.ts
@@ -43,7 +43,7 @@ export class AgentTurnGraderService {
const { score, comment } = await this.evaluateWithAI(turn);
- return this.evaluationRepository.save(workspaceId, {
+ return this.evaluationRepository.insertAndReturnOne(workspaceId, {
turnId,
score,
comment,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
index 5b6b084c854..97b673c6e4e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
@@ -88,11 +88,14 @@ export class AgentChatService {
id?: string;
title?: string;
}) {
- const savedThread = await this.threadRepository.save(workspaceId, {
- ...(isDefined(id) ? { id } : {}),
- ...(isDefined(title) ? { title } : {}),
- userWorkspaceId,
- });
+ const savedThread = await this.threadRepository.insertAndReturnOne(
+ workspaceId,
+ {
+ ...(isDefined(id) ? { id } : {}),
+ ...(isDefined(title) ? { title } : {}),
+ userWorkspaceId,
+ },
+ );
await this.workspaceEventBroadcaster.broadcast({
workspaceId,
@@ -161,8 +164,6 @@ export class AgentChatService {
userWorkspaceId: string;
workspaceId: string;
}): Promise<(AgentChatThreadEntity & { lastMessageAt: Date | null })[]> {
- // Query builder uses the scoped wrapper's escape hatch; we add the
- // workspaceId predicate manually below.
const rankedThreads = await this.threadRepository
.createQueryBuilder('thread')
.select('thread.id', 'id')
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/workspace-scoped-repository.spec.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/workspace-scoped-repository.spec.ts
index 9efb71ab81e..c0718f11ab7 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/workspace-scoped-repository.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/__tests__/workspace-scoped-repository.spec.ts
@@ -1,4 +1,4 @@
-import { type Repository } from 'typeorm';
+import { Not, type Repository } from 'typeorm';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
type FakeEntity = {
@@ -30,7 +30,6 @@ const createMockRepository = (): jest.Mocked<Repository<FakeEntity>> =>
insert: jest.fn(),
upsert: jest.fn(),
create: jest.fn(),
- save: jest.fn(),
createQueryBuilder: jest.fn(),
}) as unknown as jest.Mocked<Repository<FakeEntity>>;
@@ -46,8 +45,7 @@ describe('WorkspaceScopedRepository', () => {
describe('workspaceId guard', () => {
// TypeORM drops `undefined` values from WHERE/criteria, so a
// missing workspaceId would otherwise produce an unscoped query.
- // Each public method must trip before reaching the repository.
- it.each([
+ const unscopedCalls: [string, () => unknown][] = [
['findOne', () => scoped.findOne(undefined as never, { where: {} })],
[
'findOneOrFail',
@@ -70,12 +68,21 @@ describe('WorkspaceScopedRepository', () => {
'upsertAndReturnOne',
() => scoped.upsertAndReturnOne(undefined as never, {}, ['id']),
],
- ['save', () => scoped.save(undefined as never, {})],
- ['saveMany', () => scoped.saveMany(undefined as never, [{}])],
+ [
+ 'insertAndReturnOne',
+ () => scoped.insertAndReturnOne(undefined as never, {}),
+ ],
['maximum', () => scoped.maximum(undefined as never, 'id')],
- ])('%s throws when workspaceId is undefined', (_name, call) => {
- expect(call).toThrow(/workspaceId must be a non-empty string/);
- });
+ ];
+
+ it.each(unscopedCalls)(
+ '%s throws when workspaceId is undefined',
+ async (_name, call) => {
+ await expect(Promise.resolve().then(() => call())).rejects.toThrow(
+ /workspaceId must be a non-empty string/,
+ );
+ },
+ );
it.each([null, ''])('throws when workspaceId is %p', (badWorkspaceId) => {
expect(() =>
@@ -424,41 +431,130 @@ describe('WorkspaceScopedRepository', () => {
});
});
- describe('save', () => {
- it('stamps workspaceId on the entity passed to save', async () => {
- await scoped.save(WORKSPACE_ID, { id: 'a', status: 'queued' });
+ describe('insertAndReturnOne', () => {
+ const mockInsertBuilder = (
+ repo: jest.Mocked<Repository<FakeEntity>>,
+ raw: unknown[],
+ ) => {
+ const builder = {
+ insert: jest.fn().mockReturnThis(),
+ values: jest.fn().mockReturnThis(),
+ returning: jest.fn().mockReturnThis(),
+ execute: jest.fn().mockResolvedValue({ raw }),
+ };
+
+ (repo.createQueryBuilder as jest.Mock).mockReturnValue(builder);
- expect(repository.save).toHaveBeenCalledWith(
- { id: 'a', status: 'queued', workspaceId: WORKSPACE_ID },
- undefined,
- );
+ return builder;
+ };
+
+ it('stamps workspaceId and hydrates the row from RETURNING', async () => {
+ const persistedRow = {
+ id: 'a',
+ status: 'queued',
+ workspaceId: WORKSPACE_ID,
+ };
+ const builder = mockInsertBuilder(repository, [persistedRow]);
+
+ (repository.create as jest.Mock).mockReturnValue(persistedRow);
+
+ const result = await scoped.insertAndReturnOne(WORKSPACE_ID, {
+ id: 'a',
+ status: 'queued',
+ });
+
+ expect(builder.values).toHaveBeenCalledWith({
+ id: 'a',
+ status: 'queued',
+ workspaceId: WORKSPACE_ID,
+ });
+ expect(builder.returning).toHaveBeenCalledWith('*');
+ expect(result).toBe(persistedRow);
});
- it('saveMany stamps workspaceId on each entity', async () => {
- await scoped.saveMany(WORKSPACE_ID, [
- { id: 'a', status: 'queued' },
- { id: 'b', status: 'sent' },
- ]);
+ it('overrides a caller-supplied workspaceId on the entity', async () => {
+ const builder = mockInsertBuilder(repository, [{ id: 'a' }]);
+
+ await scoped.insertAndReturnOne(WORKSPACE_ID, {
+ id: 'a',
+ workspaceId: OTHER_WORKSPACE_ID,
+ });
+
+ expect(builder.values).toHaveBeenCalledWith({
+ id: 'a',
+ workspaceId: WORKSPACE_ID,
+ });
+ });
+ });
- expect(repository.save).toHaveBeenCalledWith(
+ describe('upsert conflict target guard', () => {
+ it('refuses an upsert whose conflict target matches another workspace', async () => {
+ (repository.findOne as jest.Mock).mockResolvedValue({
+ id: 'a',
+ workspaceId: OTHER_WORKSPACE_ID,
+ });
+
+ await expect(
+ scoped.upsert(WORKSPACE_ID, { id: 'a', status: 'queued' }, ['id']),
+ ).rejects.toThrow(/matches a row owned by another workspace/);
+ expect(repository.upsert).not.toHaveBeenCalled();
+ });
+
+ it('looks the conflict target up across workspaces, including soft-deleted rows', async () => {
+ await scoped.upsert(WORKSPACE_ID, { id: 'a', status: 'queued' }, ['id']);
+
+ expect(repository.findOne).toHaveBeenCalledWith({
+ where: [{ id: 'a', workspaceId: Not(WORKSPACE_ID) }],
+ withDeleted: true,
+ });
+ });
+
+ it('checks every entity of a batch', async () => {
+ await scoped.upsert(
+ WORKSPACE_ID,
[
- { id: 'a', status: 'queued', workspaceId: WORKSPACE_ID },
- { id: 'b', status: 'sent', workspaceId: WORKSPACE_ID },
+ { id: 'a', status: 'queued' },
+ { id: 'b', status: 'sent' },
],
- undefined,
+ { conflictPaths: ['id'] },
);
+
+ expect(repository.findOne).toHaveBeenCalledWith({
+ where: [
+ { id: 'a', workspaceId: Not(WORKSPACE_ID) },
+ { id: 'b', workspaceId: Not(WORKSPACE_ID) },
+ ],
+ withDeleted: true,
+ });
});
- it('overrides caller-supplied workspaceId on the entity', async () => {
- await scoped.save(WORKSPACE_ID, {
+ it('skips the lookup when workspaceId is part of the conflict target', async () => {
+ await scoped.upsert(WORKSPACE_ID, { id: 'a', status: 'queued' }, [
+ 'workspaceId',
+ 'id',
+ ]);
+
+ expect(repository.findOne).not.toHaveBeenCalled();
+ expect(repository.upsert).toHaveBeenCalled();
+ });
+
+ it('skips the lookup when the conflict target is not fully populated', async () => {
+ await scoped.upsert(WORKSPACE_ID, { status: 'queued' }, ['id']);
+
+ expect(repository.findOne).not.toHaveBeenCalled();
+ expect(repository.upsert).toHaveBeenCalled();
+ });
+
+ it('guards upsertAndReturnOne as well', async () => {
+ (repository.findOne as jest.Mock).mockResolvedValue({
id: 'a',
workspaceId: OTHER_WORKSPACE_ID,
});
- expect(repository.save).toHaveBeenCalledWith(
- { id: 'a', workspaceId: WORKSPACE_ID },
- undefined,
- );
+ await expect(
+ scoped.upsertAndReturnOne(WORKSPACE_ID, { id: 'a' }, ['id']),
+ ).rejects.toThrow(/matches a row owned by another workspace/);
+ expect(repository.upsert).not.toHaveBeenCalled();
});
});
diff --git a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts
index d5092d652db..364284f7499 100644
--- a/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository.ts
@@ -6,8 +6,8 @@ import {
type FindOneOptions,
type FindOptionsWhere,
type InsertResult,
+ Not,
type Repository,
- type SaveOptions,
type SelectQueryBuilder,
type UpdateResult,
} from 'typeorm';
@@ -17,7 +17,6 @@ import { type UpsertOptions } from 'typeorm/repository/UpsertOptions';
import { type WorkspaceScopedEntity } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-entity.type';
-// Wraps a TypeORM Repository to scope every operation by workspaceId.
// For workspace-data entities, use WorkspaceRepository instead.
export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {
constructor(private readonly repository: Repository<T>) {}
@@ -179,13 +178,13 @@ export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {
);
}
- // softRemove / recover / remove are intentionally absent.
+ // save / saveMany / softRemove / recover / remove are intentionally absent.
// TypeORM's entity-based methods use only the primary key in the WHERE
- // clause — stamping workspaceId on the entity object does not add an
- // AND workspace_id = ? guard to the SQL. A leaked entity id could
- // therefore act on a row from a different workspace.
- // Use softDelete / delete (criteria-based) instead — they always include
- // workspaceId in the WHERE clause.
+ // clause, so stamping workspaceId on the entity object does not add an
+ // AND workspace_id = ? guard to the SQL. A leaked entity id could act on a
+ // row from a different workspace and silently reassign its workspaceId.
+ // The criteria-based methods either cannot target an existing row or
+ // always carry workspaceId in the WHERE clause.
insert(
workspaceId: string,
@@ -198,65 +197,81 @@ export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {
);
}
- upsert(
+ async insertAndReturnOne(
+ workspaceId: string,
+ entity: QueryDeepPartialEntity<T>,
+ ): Promise<T> {
+ this.assertWorkspaceId(workspaceId);
+
+ const { raw } = await this.repository
+ .createQueryBuilder()
+ .insert()
+ .values(
+ this.stampWorkspaceIdOnEntities(
+ workspaceId,
+ entity,
+ ) as QueryDeepPartialEntity<T>,
+ )
+ .returning('*')
+ .execute();
+
+ const [persistedRow] = raw as DeepPartial<T>[];
+
+ if (!isDefined(persistedRow)) {
+ throw new Error(
+ 'WorkspaceScopedRepository.insertAndReturnOne: insert returned no row.',
+ );
+ }
+
+ return this.repository.create(persistedRow);
+ }
+
+ async upsert(
workspaceId: string,
entity: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T>[],
conflictPathsOrOptions: string[] | UpsertOptions<T>,
): Promise<InsertResult> {
this.assertWorkspaceId(workspaceId);
+ await this.assertConflictTargetsBelongToWorkspace(
+ workspaceId,
+ entity,
+ conflictPathsOrOptions,
+ );
+
return this.repository.upsert(
this.stampWorkspaceIdOnEntities(workspaceId, entity),
conflictPathsOrOptions,
);
}
- upsertAndReturnOne(
+ async upsertAndReturnOne(
workspaceId: string,
entity: QueryDeepPartialEntity<T>,
conflictPaths: string[],
): Promise<T> {
this.assertWorkspaceId(workspaceId);
- return this.repository
- .upsert(this.stampWorkspaceIdOnEntities(workspaceId, entity), {
- conflictPaths,
- returning: '*',
- })
- .then(({ generatedMaps }) => {
- const [persistedRow] = generatedMaps;
-
- if (!isDefined(persistedRow)) {
- throw new Error(
- 'WorkspaceScopedRepository.upsertAndReturnOne: upsert returned no row.',
- );
- }
-
- return this.repository.create(persistedRow as DeepPartial<T>);
- });
- }
+ await this.assertConflictTargetsBelongToWorkspace(
+ workspaceId,
+ entity,
+ conflictPaths,
+ );
- save<E extends DeepPartial<T>>(
- workspaceId: string,
- entity: E,
- options?: SaveOptions,
- ): Promise<E & T> {
- this.assertWorkspaceId(workspaceId);
+ const { generatedMaps } = await this.repository.upsert(
+ this.stampWorkspaceIdOnEntities(workspaceId, entity),
+ { conflictPaths, returning: '*' },
+ );
- return this.repository.save({ ...entity, workspaceId } as E, options);
- }
+ const [persistedRow] = generatedMaps;
- saveMany<E extends DeepPartial<T>>(
- workspaceId: string,
- entities: E[],
- options?: SaveOptions,
- ): Promise<(E & T)[]> {
- this.assertWorkspaceId(workspaceId);
+ if (!isDefined(persistedRow)) {
+ throw new Error(
+ 'WorkspaceScopedRepository.upsertAndReturnOne: upsert returned no row.',
+ );
+ }
- return this.repository.save(
- entities.map((entity) => ({ ...entity, workspaceId }) as E),
- options,
- );
+ return this.repository.create(persistedRow as DeepPartial<T>);
}
// Escape hatch. Caller MUST add the workspaceId predicate themselves.
@@ -271,7 +286,7 @@ export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {
}
// TypeORM drops `undefined` values from WHERE, which would emit an
- // unscoped query. Reject falsy workspaceId at the boundary.
+ // unscoped query.
private assertWorkspaceId(workspaceId: string): void {
if (
workspaceId === undefined ||
@@ -321,6 +336,64 @@ export class WorkspaceScopedRepository<T extends WorkspaceScopedEntity> {
return { workspaceId, ...clause } as FindOptionsWhere<T>;
}
+ // ON CONFLICT matches on the conflict target alone. When that target does
+ // not contain workspaceId, a row from another workspace can satisfy it and
+ // the DO UPDATE would overwrite that row and reassign its workspaceId.
+ private async assertConflictTargetsBelongToWorkspace(
+ workspaceId: string,
+ entity: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T>[],
+ conflictPathsOrOptions: string[] | UpsertOptions<T>,
+ ): Promise<void> {
+ const conflictPaths = Array.isArray(conflictPathsOrOptions)
+ ? conflictPathsOrOptions
+ : (conflictPathsOrOptions.conflictPaths ?? []);
+
+ const conflictPathNames = Array.isArray(conflictPaths)
+ ? conflictPaths
+ : Object.keys(conflictPaths);
+
+ if (
+ conflictPathNames.length === 0 ||
+ conflictPathNames.includes('workspaceId')
+ ) {
+ return;
+ }
+
+ const entities = Array.isArray(entity) ? entity : [entity];
+
+ const conflictTargets = entities
+ .map((item) =>
+ conflictPathNames.reduce<FindOptionsWhere<T>>(
+ (target, path) => ({
+ ...target,
+ [path]: (item as Record<string, unknown>)[path],
+ }),
+ {} as FindOptionsWhere<T>,
+ ),
+ )
+ .filter((target) =>
+ Object.values(target).every((value) => isDefined(value)),
+ );
+
+ if (conflictTargets.length === 0) {
+ return;
+ }
+
+ const foreignRow = await this.repository.findOne({
+ where: conflictTargets.map((target) => ({
+ ...target,
+ workspaceId: Not(workspaceId),
+ })),
+ withDeleted: true,
+ });
+
+ if (isDefined(foreignRow)) {
+ throw new Error(
+ `WorkspaceScopedRepository: upsert conflict target (${conflictPathNames.join(', ')}) matches a row owned by another workspace.`,
+ );
+ }
+ }
+
private stampWorkspaceIdOnEntities(
workspaceId: string,
entity: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T>[],
diff --git a/packages/twenty-server/src/modules/emailing/services/unsubscribe-topic.service.ts b/packages/twenty-server/src/modules/emailing/services/unsubscribe-topic.service.ts
index de11e51b22a..f7860913069 100644
--- a/packages/twenty-server/src/modules/emailing/services/unsubscribe-topic.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/unsubscribe-topic.service.ts
@@ -1,5 +1,7 @@
import { Injectable } from '@nestjs/common';
+import { isDefined } from 'twenty-shared/utils';
+
import { UnsubscribeTopicEntity } from 'src/engine/core-modules/emailing-domain/unsubscribe-topic.entity';
import { UnsubscribeTopicVisibility } from 'src/engine/core-modules/emailing-domain/types/unsubscribe-topic-visibility.type';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
@@ -46,7 +48,7 @@ export class UnsubscribeTopicService {
workspaceId: string,
{ name, description = null, visibility }: CreateUnsubscribeTopicArgs,
): Promise<UnsubscribeTopicEntity> {
- return this.unsubscribeTopicRepository.save(workspaceId, {
+ return this.unsubscribeTopicRepository.insertAndReturnOne(workspaceId, {
name,
description,
visibility: visibility ?? UnsubscribeTopicVisibility.PRIVATE,
@@ -57,18 +59,18 @@ export class UnsubscribeTopicService {
workspaceId: string,
{ id, name, description, visibility }: UpdateUnsubscribeTopicArgs,
): Promise<UnsubscribeTopicEntity> {
- const existing = await this.unsubscribeTopicRepository.findOneOrFail(
+ await this.unsubscribeTopicRepository.update(
workspaceId,
- { where: { id } },
+ { id },
+ {
+ ...(name !== undefined ? { name } : {}),
+ ...(description !== undefined ? { description } : {}),
+ ...(isDefined(visibility) ? { visibility } : {}),
+ },
);
- return this.unsubscribeTopicRepository.save(workspaceId, {
- ...existing,
- ...(name !== undefined ? { name } : {}),
- ...(description !== undefined ? { description } : {}),
- ...(visibility !== undefined && visibility !== null
- ? { visibility }
- : {}),
+ return this.unsubscribeTopicRepository.findOneOrFail(workspaceId, {
+ where: { id },
});
}