From d37f527f7d18ad4ee17ba0c41f90e755df9bd7dc Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 9 Jan 2025 10:26:56 +0700 Subject: [PATCH] feat: add cancel only and quotation id filter --- src/controllers/06-request-list-controller.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index c967efd..f8a008c 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -292,6 +292,8 @@ export class RequestListController extends Controller { @Query() requestDataId?: string, @Query() workStatus?: RequestWorkStatus, @Query() readyToTask?: boolean, + @Query() cancelOnly?: boolean, + @Query() quotationId?: string, ) { let statusCondition: Prisma.RequestWorkWhereInput["stepStatus"] = {}; @@ -313,7 +315,15 @@ export class RequestListController extends Controller { ], }, }; - } else { + } + + if (cancelOnly) { + statusCondition = { + some: { workStatus: RequestWorkStatus.Canceled }, + }; + } + + if (workStatus && !readyToTask && !cancelOnly) { statusCondition = { some: { workStatus }, }; @@ -321,8 +331,10 @@ export class RequestListController extends Controller { const where = { stepStatus: readyToTask || workStatus ? statusCondition : undefined, + creditNote: cancelOnly ? null : undefined, request: { id: requestDataId, + quotationId, quotation: { registeredBranch: { OR: permissionCond(req.user) }, },