chamomind/jws-backend
chamomind/jws-backend
7
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

fix: query condition for get canceled work

Browse source
This commit is contained in:
Methapon2001 2025-02-19 15:09:05 +07:00
parent ee33c7abb3
commit a9cf88d6d4
2 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/controllers/05-quotation-controller.ts
View file

@ -1,4 +1,4 @@
import { PayCondition, Prisma, QuotationStatus, Status } from "@prisma/client";
import { PayCondition, Prisma, QuotationStatus, RequestDataStatus, Status } from "@prisma/client";
import config from "../config.json";
import {
Body,
@ -223,12 +223,22 @@ export class QuotationController extends Controller {
requestData: hasCancel
? {
some: {
requestWork: {
some: {
creditNoteId: null,
stepStatus: { some: { workStatus: RequestWorkStatus.Canceled } },
OR: [
{
requestDataStatus: RequestDataStatus.Canceled,
requestWork: {
some: { creditNoteId: null },
},
},
},
{
requestWork: {
some: {
creditNoteId: null,
stepStatus: { some: { workStatus: RequestWorkStatus.Canceled } },
},
},
},
],
},
}
: undefined,

20
src/controllers/06-request-list-controller.ts
View file

@ -324,12 +324,6 @@ export class RequestListController extends Controller {
};
}
if (cancelOnly) {
statusCondition = {
some: { workStatus: RequestWorkStatus.Canceled },
};
}
if (workStatus && !readyToTask && !cancelOnly) {
statusCondition = {
some: { workStatus },
@ -337,8 +331,18 @@ export class RequestListController extends Controller {
}
const where = {
stepStatus: readyToTask || cancelOnly || workStatus ? statusCondition : undefined,
creditNote: cancelOnly ? null : undefined,
OR: cancelOnly
? [
{
stepStatus: { some: { workStatus: RequestWorkStatus.Canceled } },
},
{
request: { requestDataStatus: RequestDataStatus.Canceled },
},
]
: undefined,
stepStatus: readyToTask || workStatus ? statusCondition : undefined,
creditNoteId: cancelOnly ? null : undefined,
request: {
id: requestDataId,
requestDataStatus: readyToTask