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

fix: empty query result in empty array

Browse source
This commit is contained in:
Methapon Metanipat 2024-11-14 17:43:13 +07:00
parent 10a0ed0fc1
commit 927f972a91
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/controllers/00-employment-office-controller.ts
View file

@ -10,25 +10,30 @@ export class EmploymentOfficeController extends Controller {
async getEmploymentOfficeList(@Query() districtId?: string, @Query() query: string = "") { async getEmploymentOfficeList(@Query() districtId?: string, @Query() query: string = "") {
return await prisma.employmentOffice.findMany({ return await prisma.employmentOffice.findMany({
where: { where: {
OR: [ OR:
...(districtId !!districtId || !!query
? [ ? [
{ ...(districtId
province: { ? [
district: { some: { id: districtId } }, {
}, province: {
district: { none: {} }, district: { some: { id: districtId } },
}, },
{ district: { none: {} },
district: { },
some: { districtId }, {
}, district: {
}, some: { districtId },
},
},
]
: []),
...(queryOrNot(query, [
{ name: { contains: query } },
{ nameEN: { contains: query } },
]) ?? []),
] ]
: []), : undefined,
...(queryOrNot(query, [{ name: { contains: query } }, { nameEN: { contains: query } }]) ??
[]),
],
}, },
orderBy: [{ provinceId: "asc" }, { id: "asc" }], orderBy: [{ provinceId: "asc" }, { id: "asc" }],
}); });