From d2c2d94a2d239dee29fdafae983998c4a844f43e Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 13 Mar 2025 15:27:55 +0700 Subject: [PATCH] fix: prevent quotation with 0 request from status update --- src/controllers/06-request-list-controller.ts | 19 ++++++++++++++----- src/controllers/07-task-controller.ts | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index 5857be2..4bf6710 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -1020,13 +1020,22 @@ export class RequestListController extends Controller { quotationStatus: { notIn: [QuotationStatus.Canceled, QuotationStatus.ProcessComplete], }, - requestData: { - every: { - requestDataStatus: { - in: [RequestDataStatus.Canceled, RequestDataStatus.Completed], + AND: [ + { + requestData: { + every: { + requestDataStatus: { + in: [RequestDataStatus.Canceled, RequestDataStatus.Completed], + }, + }, }, }, - }, + { + requestData: { + some: {}, + }, + }, + ], }, data: { quotationStatus: QuotationStatus.ProcessComplete, urgent: false }, include: { diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts index d4bcfb8..2da73b2 100644 --- a/src/controllers/07-task-controller.ts +++ b/src/controllers/07-task-controller.ts @@ -819,13 +819,22 @@ export class TaskActionController extends Controller { quotationStatus: { notIn: [QuotationStatus.Canceled, QuotationStatus.ProcessComplete], }, - requestData: { - every: { - requestDataStatus: { - in: [RequestDataStatus.Canceled, RequestDataStatus.Completed], + AND: [ + { + requestData: { + every: { + requestDataStatus: { + in: [RequestDataStatus.Canceled, RequestDataStatus.Completed], + }, + }, }, }, - }, + { + requestData: { + some: {}, + }, + }, + ], }, data: { quotationStatus: QuotationStatus.ProcessComplete, urgent: false }, include: {