@chenchaolong/plugin-trade-compliance-workbench 1.0.24 → 1.0.26

package/dist/lib/workbench.service.js

@@ -43,12 +43,9 @@ const SKIPPED_REASON_MESSAGES = {
 };
 const RUNNING_IMPORT_TASK_STATUSES = ['EXTRACTING', 'AI_PARSING', 'VALIDATING', 'PERSISTING'];
 const RECOVERABLE_IMPORT_TASK_STATUSES = ['QUEUED', 'EXTRACTING', 'AI_PARSING', 'VALIDATING', 'PERSISTING'];
+const DELETABLE_IMPORT_TASK_STATUSES = [...RECOVERABLE_IMPORT_TASK_STATUSES, 'AWAITING_REVIEW', 'FAILED', 'TIMED_OUT'];
 const RECOVERABLE_REANALYSIS_STATUSES = ['PENDING', 'RUNNING'];
 const TERMINAL_IMPORT_TASK_STATUSES = ['AWAITING_REVIEW', 'SUCCEEDED', 'FAILED', 'TIMED_OUT', 'CANCELED'];
-const DELETABLE_IMPORT_TASK_STATUSES = [
-    'QUEUED', 'EXTRACTING', 'AI_PARSING', 'VALIDATING',
-    'AWAITING_REVIEW', 'PERSISTING', 'FAILED', 'TIMED_OUT'
-];
 const CATALOG_RISK_RECOMMENDATIONS = {
     DUAL_USE: '建议核验军民两用物项许可要求，并在出口前完成合规审批',
     OVERSEAS_SANCTION: '建议核验海外制裁限制及交易对手风险，并在交易前完成合规审批'
@@ -231,7 +228,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     async listActiveCustomerContractReanalyses(scope) {
         const [contracts, tasks] = await Promise.all([
             this.dataSource.getRepository(CustomerContract).find({ where: { ...activeScope(scope), currentReanalysisRunId: Not(IsNull()), deletedAt: IsNull() } }),
-            this.dataSource.getRepository(ImportTask).find({ where: { ...activeScope(scope), currentReanalysisRunId: Not(IsNull()) } })
+            this.dataSource.getRepository(ImportTask).find({ where: { ...activeScope(scope), currentReanalysisRunId: Not(IsNull()), deletedAt: IsNull() } })
         ]);
         const unconsumedIds = new Set([...contracts, ...tasks].map(item => item.currentReanalysisRunId).filter((id) => Boolean(id)));
         const where = [
@@ -647,7 +644,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async getImportTaskResult(scope, taskId) {
         await this.expireStaleImportTasks(scope);
-        const task = await required(this.dataSource.getRepository(ImportTask).findOne({ where: { ...activeScope(scope), id: taskId } }), '解析任务不存在');
+        const task = await required(this.dataSource.getRepository(ImportTask).findOne({ where: { ...activeScope(scope), id: taskId, deletedAt: IsNull() } }), '解析任务不存在');
         const publicTask = publicImportTaskDto(task);
         if (!task.resultEntityId)
             return { task: publicTask };
@@ -1132,8 +1129,9 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             const task = await required(repo.findOne({
                 where: { ...activeScope(scope), id: taskId }, lock: { mode: 'pessimistic_write' }
             }), '解析任务不存在');
-            if (isCanceledImportTask(task))
+            if (task.deletedAt || TERMINAL_IMPORT_TASK_STATUSES.includes(task.status)) {
                 return task;
+            }
             if (task.observerConversationId && task.observerConversationId !== normalizedConversationId) {
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '观察会话标识不一致');
             }
@@ -1335,7 +1333,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async findNextQueuedImportTaskCandidate(scope) {
         return this.dataSource.getRepository(ImportTask).findOne({
-            where: { ...activeScope(scope), status: 'QUEUED' },
+            where: { ...activeScope(scope), status: 'QUEUED', deletedAt: IsNull() },
             order: { queuedAt: 'ASC', id: 'ASC' }
         });
     }
@@ -1344,7 +1342,8 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             where: {
                 ...activeScope(scope),
                 documentType: In(['CONTROLLED_CATALOG', 'SANCTION_CATALOG']),
-                status: In(['EXTRACTING', 'VALIDATING', 'PERSISTING'])
+                status: In(['EXTRACTING', 'VALIDATING', 'PERSISTING']),
+                deletedAt: IsNull()
             },
             order: { startedAt: 'ASC', id: 'ASC' }
         });
@@ -1358,7 +1357,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 return null;
             const repo = manager.getRepository(ImportTask);
             const task = await repo.findOne({
-                where: { ...activeScope(scope), id, status: 'QUEUED' },
+                where: { ...activeScope(scope), id, status: 'QUEUED', deletedAt: IsNull() },
                 lock: { mode: 'pessimistic_write', onLocked: 'skip_locked' }
             });
             if (!task)
@@ -1381,7 +1380,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (await organizationHasActiveParsing(manager, scope))
                 return null;
             const task = await repo.findOne({
-                where: { ...activeScope(scope), status: 'QUEUED' },
+                where: { ...activeScope(scope), status: 'QUEUED', deletedAt: IsNull() },
                 order: { queuedAt: 'ASC', id: 'ASC' },
                 lock: { mode: 'pessimistic_write', onLocked: 'skip_locked' }
             });
@@ -1410,7 +1409,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const recoveryScope = scope ? activeScope(scope) : {};
         const [tasks, runs] = await Promise.all([
             this.dataSource.getRepository(ImportTask).find({
-                where: { ...recoveryScope, status: In([...RECOVERABLE_IMPORT_TASK_STATUSES]) },
+                where: { ...recoveryScope, status: In([...RECOVERABLE_IMPORT_TASK_STATUSES]), deletedAt: IsNull() },
                 select: {
                     id: true, tenantId: true, organizationId: true, targetAssistantId: true,
                     status: true, claimAttemptToken: true, commandDispatchedAt: true, startedAt: true
@@ -1461,7 +1460,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     async failRecoverableImportWithoutTarget(snapshot) {
         await this.dataSource.transaction(async (manager) => {
             const repo = manager.getRepository(ImportTask);
-            const task = await repo.findOne({ where: { ...activeScope(snapshot), id: snapshot.id }, lock: { mode: 'pessimistic_write' } });
+            const task = await repo.findOne({ where: { ...activeScope(snapshot), id: snapshot.id, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } });
             if (!task || task.targetAssistantId || !RECOVERABLE_IMPORT_TASK_STATUSES.includes(task.status))
                 return;
             await this.applyImportTaskFailure(manager, snapshot, task, 'FAILED', 'TARGET_ASSISTANT_MISSING', '历史解析任务缺少目标智能体，无法自动恢复');
@@ -1607,9 +1606,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 where: { ...activeScope(scope), id },
                 lock: { mode: 'pessimistic_write' }
             }), '解析任务不存在');
-            if (task.status === 'AWAITING_REVIEW' || task.status === 'SUCCEEDED')
-                return task;
-            if (task.status === 'FAILED' || task.status === 'TIMED_OUT')
+            if (TERMINAL_IMPORT_TASK_STATUSES.includes(task.status))
                 return task;
             await this.applyImportTaskFailure(manager, scope, task, 'FAILED', 'AGENT_HANDOFF_RESULT_MISSING', '智能体已结束，但解析工具未保存业务结果');
             return repo.save(task);
@@ -1682,14 +1679,14 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         const targetAssistantId = requiredId(requestedTargetAssistantId, '目标智能体标识');
         return this.dataSource.transaction(async (manager) => {
             const repo = manager.getRepository(ImportTask);
-            const source = await required(repo.findOne({ where: { ...activeScope(scope), id: sourceTaskId }, lock: { mode: 'pessimistic_write' } }), '解析任务不存在');
+            const source = await required(repo.findOne({ where: { ...activeScope(scope), id: sourceTaskId, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } }), '解析任务不存在');
             if (source.status !== 'FAILED' && source.status !== 'TIMED_OUT')
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅失败或超时任务可以重新解析');
             if (!['CONTROLLED_CATALOG', 'SANCTION_CATALOG', 'PURCHASE_CONTRACT', 'CUSTOMER_CONTRACT'].includes(source.documentType))
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅目录和合同任务支持重新解析');
             if (!source.executionInput)
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '原任务缺少可恢复执行参数');
-            const existing = await repo.findOne({ where: { ...activeScope(scope), retryOfTaskId: source.id } });
+            const existing = await repo.findOne({ where: { ...activeScope(scope), retryOfTaskId: source.id, deletedAt: IsNull() } });
             if (existing) {
                 return TERMINAL_IMPORT_TASK_STATUSES.includes(existing.status)
                     ? { kind: 'EXISTING_TERMINAL', task: existing }
@@ -2396,7 +2393,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
         return outcome.run;
     }
     async getSourceFileDescriptor(scope, sourceFileId) {
-        const task = await required(this.dataSource.getRepository(ImportTask).findOne({ where: { ...activeScope(scope), sourceFileId } }), '源文件不存在');
+        const task = await required(this.dataSource.getRepository(ImportTask).findOne({ where: { ...activeScope(scope), sourceFileId, deletedAt: IsNull() } }), '源文件不存在');
         return { sourceFileId: task.sourceFileId, sourceFileName: task.sourceFileName };
     }
     async updateCustomerContractReview(scope, id, input) {
@@ -3368,7 +3365,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async expireStaleImportTasks(scope) {
         const repo = this.dataSource.getRepository(ImportTask);
-        const tasks = await repo.find({ where: { ...activeScope(scope), status: In(['QUEUED', 'EXTRACTING', 'AI_PARSING', 'VALIDATING', 'PERSISTING']) } });
+        const tasks = await repo.find({ where: { ...activeScope(scope), status: In(['QUEUED', 'EXTRACTING', 'AI_PARSING', 'VALIDATING', 'PERSISTING']), deletedAt: IsNull() } });
         const now = new Date();
         for (const task of tasks) {
             const startedAt = task.startedAt ?? task.queuedAt ?? task.createdAt;
@@ -3376,7 +3373,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 continue;
             await this.dataSource.transaction(async (manager) => {
                 const lockedRepo = manager.getRepository(ImportTask);
-                const locked = await lockedRepo.findOne({ where: { ...activeScope(scope), id: task.id }, lock: { mode: 'pessimistic_write' } });
+                const locked = await lockedRepo.findOne({ where: { ...activeScope(scope), id: task.id, deletedAt: IsNull() }, lock: { mode: 'pessimistic_write' } });
                 if (!locked || !RECOVERABLE_IMPORT_TASK_STATUSES.includes(locked.status))
                     return;
                 const lockedStartedAt = locked.startedAt ?? locked.queuedAt ?? locked.createdAt;
@@ -3434,7 +3431,7 @@ async function lockOrganizationTaskClaim(manager, scope) {
 }
 async function organizationHasActiveParsing(manager, scope) {
     const activeImport = await manager.getRepository(ImportTask).findOne({
-        where: { ...activeScope(scope), status: In([...RUNNING_IMPORT_TASK_STATUSES]) },
+        where: { ...activeScope(scope), status: In([...RUNNING_IMPORT_TASK_STATUSES]), deletedAt: IsNull() },
         order: { startedAt: 'ASC', id: 'ASC' },
         lock: { mode: 'pessimistic_write' }
     });
@@ -3448,7 +3445,7 @@ async function organizationHasActiveParsing(manager, scope) {
     return Boolean(activeRun);
 }
 function assertImportTaskResultWritable(task) {
-    if (TERMINAL_IMPORT_TASK_STATUSES.includes(task.status)) {
+    if (task.deletedAt || TERMINAL_IMPORT_TASK_STATUSES.includes(task.status)) {
         throw new DomainError(DomainErrorCodes.INVALID_INPUT, '解析任务状态不允许保存结果');
     }
 }