fix(api): guard unmoved deals before pipeline merge delete

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-10-12 21:32:21 +03:30
co-authored by Cursor
parent fd6e79c15d
commit 9bed6cac03
3 changed files with 92 additions and 59 deletions
+17
View File
@@ -0,0 +1,17 @@
# Task 5 report
Status: DONE
- shared build: OK
- pipeline-merge.test.ts: 5/5 pass
- api typecheck: OK
- vue-tsc: see VUE_EXIT in controller log
- graphify: attempted (may crash)
No commit required for verification-only task.
## Follow-up fix: final review important findings
Status: DONE
- I-1: Added in-transaction unmoved-deal count guard before deleting the source pipeline.
- I-3: Added 30000ms timeout to the interactive merge transaction.
- M-1: Added `@IsIn(['retarget_all'])` validation to `MergePipelineDto.leadFormMode`.
- graphify update: OK
- `cd apps/api; npx tsx --test test/pipeline-merge.test.ts`: OK, 5/5 pass
- `npm run typecheck -w @mento/api`: OK
+2
View File
@@ -4,6 +4,7 @@ import {
IsArray, IsArray,
IsBoolean, IsBoolean,
IsDateString, IsDateString,
IsIn,
IsInt, IsInt,
IsNumber, IsNumber,
IsObject, IsObject,
@@ -362,5 +363,6 @@ export class MergePipelineDto {
@IsOptional() @IsOptional()
@IsString() @IsString()
@IsIn(['retarget_all'])
leadFormMode?: 'retarget_all'; leadFormMode?: 'retarget_all';
} }
+17 -3
View File
@@ -416,11 +416,14 @@ export class PipelinesService {
); );
} }
const targetStagesById = new Map(target.stages.map((stage) => [stage.id, stage])); const targetStagesById = new Map(
target.stages.map((stage) => [stage.id, stage]),
);
let movedDeals = 0; let movedDeals = 0;
let retargetedLeadForms = 0; let retargetedLeadForms = 0;
await this.prisma.$transaction(async (tx) => { await this.prisma.$transaction(
async (tx) => {
const closedAt = new Date(); const closedAt = new Date();
for (const sourceStage of source.stages) { for (const sourceStage of source.stages) {
const targetStageId = dto.stageMap[sourceStage.id]; const targetStageId = dto.stageMap[sourceStage.id];
@@ -495,8 +498,19 @@ export class PipelinesService {
}); });
} }
await tx.pipeline.delete({ where: { id: source.id } }); const remaining = await tx.deal.count({
where: { organizationId, pipelineId: source.id },
}); });
if (remaining > 0) {
throw new BadRequestException(
'برخی معامله‌ها منتقل نشدند؛ ادغام لغو شد.',
);
}
await tx.pipeline.delete({ where: { id: source.id } });
},
{ timeout: 30000 },
);
return { return {
ok: true, ok: true,