Preserve claims board stages on evaluate; reopen to first column only after cancel.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-11-18 16:41:36 +03:30
co-authored by Cursor
parent 0e961e48e6
commit 2788103488
@@ -561,32 +561,17 @@ export class BalanceClaimsService {
}, },
}); });
const title = `مطالبه: ${input.person.fullName}`;
if (matched) { if (matched) {
if (existing) { if (!existing) {
const alreadyOpen =
existing.status === 'open' && existing.stageId === input.openStageId;
await this.prisma.activity.update({
where: { id: existing.id },
data: {
status: 'open',
stageId: input.openStageId,
completedAt: null,
assigneeId: input.person.assigneeId,
assignees: { set: [{ id: input.person.assigneeId }] },
title: `مطالبه: ${input.person.fullName}`,
},
});
return alreadyOpen && existing.assigneeId === input.person.assigneeId
? 'matched-unchanged'
: 'reopened';
}
await this.prisma.activity.create({ await this.prisma.activity.create({
data: { data: {
organizationId: input.organizationId, organizationId: input.organizationId,
boardId: input.boardId, boardId: input.boardId,
stageId: input.openStageId, stageId: input.openStageId,
status: 'open', status: 'open',
title: `مطالبه: ${input.person.fullName}`, title,
type: input.baseType, type: input.baseType,
typeDefId: input.typeDefId, typeDefId: input.typeDefId,
personId: input.person.personId, personId: input.person.personId,
@@ -602,6 +587,40 @@ export class BalanceClaimsService {
return 'created'; return 'created';
} }
// فقط بعد از خروج از بازه (لغو) دوباره از ستون اول بیاید؛
// ستون‌های میانی / انجام‌شده حفظ می‌شوند.
if (existing.status === 'canceled') {
await this.prisma.activity.update({
where: { id: existing.id },
data: {
status: 'open',
stageId: input.openStageId,
completedAt: null,
completedByIds: [],
assigneeId: input.person.assigneeId,
assignees: { set: [{ id: input.person.assigneeId }] },
title,
},
});
return 'reopened';
}
// هنوز داخل بازه: ستون و وضعیت (در حال انجام / انجام‌شده) حفظ شود
await this.prisma.activity.update({
where: { id: existing.id },
data: {
title,
...(existing.assigneeId !== input.person.assigneeId
? {
assigneeId: input.person.assigneeId,
assignees: { set: [{ id: input.person.assigneeId }] },
}
: {}),
},
});
return 'matched-unchanged';
}
if (existing && existing.status !== 'canceled') { if (existing && existing.status !== 'canceled') {
await this.prisma.activity.update({ await this.prisma.activity.update({
where: { id: existing.id }, where: { id: existing.id },