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

add mode: "insensitive"

Browse source
This commit is contained in:
Kanjana 2025-04-09 11:54:52 +07:00
parent 7e937333dc
commit 743fde5493
20 changed files with 145 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/00-notification-controller.ts
View file

@ -36,8 +36,8 @@ export class NotificationController extends Controller {
AND: [ AND: [
{ {
OR: queryOrNot<(typeof where)[]>(query, [ OR: queryOrNot<(typeof where)[]>(query, [
{ title: { contains: query } }, { title: { contains: query, mode: "insensitive" } },
{ detail: { contains: query } }, { detail: { contains: query, mode: "insensitive" } },
]), ]),
}, },
{ {

24
src/controllers/01-branch-controller.ts
View file

@ -265,20 +265,20 @@ export class BranchController extends Controller {
}, },
OR: queryOrNot<Prisma.BranchWhereInput[]>(query, [ OR: queryOrNot<Prisma.BranchWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ nameEN: { contains: query } }, { nameEN: { contains: query, mode: "insensitive" } },
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ email: { contains: query } }, { email: { contains: query, mode: "insensitive" } },
{ telephoneNo: { contains: query } }, { telephoneNo: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
{ {
branch: { branch: {
some: { some: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ nameEN: { contains: query } }, { nameEN: { contains: query, mode: "insensitive" } },
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ email: { contains: query } }, { email: { contains: query, mode: "insensitive" } },
{ telephoneNo: { contains: query } }, { telephoneNo: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
], ],
}, },
@ -309,10 +309,10 @@ export class BranchController extends Controller {
where: { where: {
AND: { OR: permissionCond(req.user) }, AND: { OR: permissionCond(req.user) },
OR: [ OR: [
{ nameEN: { contains: query } }, { nameEN: { contains: query, mode: "insensitive" } },
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ email: { contains: query } }, { email: { contains: query, mode: "insensitive" } },
{ telephoneNo: { contains: query } }, { telephoneNo: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
], ],
}, },

16
src/controllers/01-branch-user-controller.ts
View file

@ -104,8 +104,8 @@ export class UserBranchController extends Controller {
userId, userId,
}, },
OR: queryOrNot<Prisma.BranchUserWhereInput[]>(query, [ OR: queryOrNot<Prisma.BranchUserWhereInput[]>(query, [
{ branch: { name: { contains: query } } }, { branch: { name: { contains: query, mode: "insensitive" } } },
{ branch: { nameEN: { contains: query } } }, { branch: { nameEN: { contains: query, mode: "insensitive" } } },
]), ]),
} satisfies Prisma.BranchUserWhereInput; } satisfies Prisma.BranchUserWhereInput;
@ -157,12 +157,12 @@ export class BranchUserController extends Controller {
branchId, branchId,
}, },
OR: [ OR: [
{ user: { firstName: { contains: query } } }, { user: { firstName: { contains: query, mode: "insensitive" } } },
{ user: { firstNameEN: { contains: query } } }, { user: { firstNameEN: { contains: query, mode: "insensitive" } } },
{ user: { lastName: { contains: query } } }, { user: { lastName: { contains: query, mode: "insensitive" } } },
{ user: { lastNameEN: { contains: query } } }, { user: { lastNameEN: { contains: query, mode: "insensitive" } } },
{ user: { email: { contains: query } } }, { user: { email: { contains: query, mode: "insensitive" } } },
{ user: { telephoneNo: { contains: query } } }, { user: { telephoneNo: { contains: query, mode: "insensitive" } } },
], ],
} satisfies Prisma.BranchUserWhereInput; } satisfies Prisma.BranchUserWhereInput;

12
src/controllers/02-user-controller.ts
View file

@ -324,12 +324,12 @@ export class UserController extends Controller {
const where = { const where = {
OR: queryOrNot<Prisma.UserWhereInput[]>(query, [ OR: queryOrNot<Prisma.UserWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
{ email: { contains: query } }, { email: { contains: query, mode: "insensitive" } },
{ telephoneNo: { contains: query } }, { telephoneNo: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]), ]),
AND: { AND: {

26
src/controllers/03-customer-branch-controller.ts
View file

@ -198,15 +198,15 @@ export class CustomerBranchController extends Controller {
) { ) {
const where = { const where = {
OR: queryOrNot<Prisma.CustomerBranchWhereInput[]>(query, [ OR: queryOrNot<Prisma.CustomerBranchWhereInput[]>(query, [
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ registerName: { contains: query } }, { registerName: { contains: query, mode: "insensitive" } },
{ registerNameEN: { contains: query } }, { registerNameEN: { contains: query, mode: "insensitive" } },
{ email: { contains: query } }, { email: { contains: query, mode: "insensitive" } },
{ code: { contains: query } }, { code: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]), ]),
AND: { AND: {
@ -288,10 +288,10 @@ export class CustomerBranchController extends Controller {
) { ) {
const where = { const where = {
OR: queryOrNot<Prisma.EmployeeWhereInput[]>(query, [ OR: queryOrNot<Prisma.EmployeeWhereInput[]>(query, [
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]), ]),
AND: { AND: {

16
src/controllers/03-customer-controller.ts
View file

@ -168,14 +168,14 @@ export class CustomerController extends Controller {
) { ) {
const where = { const where = {
OR: queryOrNot<Prisma.CustomerWhereInput[]>(query, [ OR: queryOrNot<Prisma.CustomerWhereInput[]>(query, [
{ branch: { some: { namePrefix: { contains: query } } } }, { branch: { some: { namePrefix: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { customerName: { contains: query } } } }, { branch: { some: { customerName: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { registerName: { contains: query } } } }, { branch: { some: { registerName: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { registerNameEN: { contains: query } } } }, { branch: { some: { registerNameEN: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { firstName: { contains: query } } } }, { branch: { some: { firstName: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { firstNameEN: { contains: query } } } }, { branch: { some: { firstNameEN: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { lastName: { contains: query } } } }, { branch: { some: { lastName: { contains: query, mode: "insensitive" } } } },
{ branch: { some: { lastNameEN: { contains: query } } } }, { branch: { some: { lastNameEN: { contains: query, mode: "insensitive" } } } },
]), ]),
AND: { AND: {
customerType, customerType,

20
src/controllers/03-employee-controller.ts
View file

@ -163,13 +163,13 @@ export class EmployeeController extends Controller {
OR: queryOrNot<Prisma.EmployeeWhereInput[]>(query, [ OR: queryOrNot<Prisma.EmployeeWhereInput[]>(query, [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]), ]),
AND: { AND: {
@ -252,13 +252,13 @@ export class EmployeeController extends Controller {
...(queryOrNot<Prisma.EmployeeWhereInput[]>(query, [ ...(queryOrNot<Prisma.EmployeeWhereInput[]>(query, [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]) ?? []), ]) ?? []),
...(queryOrNot<Prisma.EmployeeWhereInput[]>(!!body, [ ...(queryOrNot<Prisma.EmployeeWhereInput[]>(!!body, [

4
src/controllers/04-flow-template-controller.ts
View file

@ -61,10 +61,10 @@ export class FlowTemplateController extends Controller {
) { ) {
const where = { const where = {
OR: queryOrNot(query, [ OR: queryOrNot(query, [
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ {
step: { step: {
some: { name: { contains: query } }, some: { name: { contains: query, mode: "insensitive" } },
}, },
}, },
]), ]),

2
src/controllers/04-institution-controller.ts
View file

@ -131,7 +131,7 @@ export class InstitutionController extends Controller {
...filterStatus(activeOnly ? Status.ACTIVE : status), ...filterStatus(activeOnly ? Status.ACTIVE : status),
group: body?.group ? { in: body.group } : group, group: body?.group ? { in: body.group } : group,
OR: queryOrNot<Prisma.InstitutionWhereInput[]>(query, [ OR: queryOrNot<Prisma.InstitutionWhereInput[]>(query, [
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
]), ]),
} satisfies Prisma.InstitutionWhereInput; } satisfies Prisma.InstitutionWhereInput;

16
src/controllers/04-invoice-controller.ts
View file

@ -99,19 +99,19 @@ export class InvoiceController extends Controller {
const where: Prisma.InvoiceWhereInput = { const where: Prisma.InvoiceWhereInput = {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ quotation: { workName: { contains: query } } }, { quotation: { workName: { contains: query, mode: "insensitive" } } },
{ {
quotation: { quotation: {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ registerName: { contains: query } }, { registerName: { contains: query, mode: "insensitive" } },
{ registerNameEN: { contains: query } }, { registerNameEN: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },

4
src/controllers/04-product-controller.ts
View file

@ -154,8 +154,8 @@ export class ProductController extends Controller {
const where = { const where = {
OR: queryOrNot<Prisma.ProductWhereInput[]>(query, [ OR: queryOrNot<Prisma.ProductWhereInput[]>(query, [
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ detail: { contains: query } }, { detail: { contains: query, mode: "insensitive" } },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
]), ]),
AND: { AND: {

4
src/controllers/04-product-group-controller.ts
View file

@ -93,8 +93,8 @@ export class ProductGroup extends Controller {
) { ) {
const where = { const where = {
OR: queryOrNot<Prisma.ProductGroupWhereInput[]>(query, [ OR: queryOrNot<Prisma.ProductGroupWhereInput[]>(query, [
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ detail: { contains: query } }, { detail: { contains: query, mode: "insensitive" } },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
]), ]),
AND: [ AND: [

5
src/controllers/04-properties-controller.ts
View file

@ -51,7 +51,10 @@ export class PropertiesController extends Controller {
@Query() activeOnly?: boolean, @Query() activeOnly?: boolean,
) { ) {
const where = { const where = {
OR: queryOrNot(query, [{ name: { contains: query } }, { nameEN: { contains: query } }]), OR: queryOrNot(query, [
{ name: { contains: query, mode: "insensitive" } },
{ nameEN: { contains: query, mode: "insensitive" } },
]),
AND: { AND: {
...filterStatus(activeOnly ? Status.ACTIVE : status), ...filterStatus(activeOnly ? Status.ACTIVE : status),
registeredBranch: { registeredBranch: {

4
src/controllers/04-service-controller.ts
View file

@ -179,8 +179,8 @@ export class ServiceController extends Controller {
const where = { const where = {
OR: queryOrNot<Prisma.ServiceWhereInput[]>(query, [ OR: queryOrNot<Prisma.ServiceWhereInput[]>(query, [
{ name: { contains: query } }, { name: { contains: query, mode: "insensitive" } },
{ detail: { contains: query } }, { detail: { contains: query, mode: "insensitive" } },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
]), ]),
AND: { AND: {

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

@ -210,16 +210,16 @@ export class QuotationController extends Controller {
const where = { const where = {
OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [ OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ workName: { contains: query } }, { workName: { contains: query, mode: "insensitive" } },
{ {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },

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

@ -91,13 +91,13 @@ export class RequestDataController extends Controller {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ registerName: { contains: query } }, { registerName: { contains: query, mode: "insensitive" } },
{ registerNameEN: { contains: query } }, { registerNameEN: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },
@ -105,14 +105,14 @@ export class RequestDataController extends Controller {
OR: [ OR: [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },

12
src/controllers/07-task-controller.ts
View file

@ -121,9 +121,9 @@ export class TaskController extends Controller {
code: body?.code ? { in: body.code } : undefined, code: body?.code ? { in: body.code } : undefined,
OR: queryOrNot(query, [ OR: queryOrNot(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ taskName: { contains: query } }, { taskName: { contains: query, mode: "insensitive" } },
{ contactName: { contains: query } }, { contactName: { contains: query, mode: "insensitive" } },
{ contactTel: { contains: query } }, { contactTel: { contains: query, mode: "insensitive" } },
]), ]),
} satisfies Prisma.TaskOrderWhereInput; } satisfies Prisma.TaskOrderWhereInput;
@ -1021,9 +1021,9 @@ export class UserTaskController extends Controller {
: undefined, : undefined,
OR: queryOrNot(query, [ OR: queryOrNot(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ taskName: { contains: query } }, { taskName: { contains: query, mode: "insensitive" } },
{ contactName: { contains: query } }, { contactName: { contains: query, mode: "insensitive" } },
{ contactTel: { contains: query } }, { contactTel: { contains: query, mode: "insensitive" } },
]), ]),
} satisfies Prisma.TaskOrderWhereInput; } satisfies Prisma.TaskOrderWhereInput;

22
src/controllers/08-credit-note-controller.ts
View file

@ -153,17 +153,17 @@ export class CreditNoteController extends Controller {
request: { request: {
OR: queryOrNot<Prisma.RequestDataWhereInput[]>(query, [ OR: queryOrNot<Prisma.RequestDataWhereInput[]>(query, [
{ quotation: { code: { contains: query, mode: "insensitive" } } }, { quotation: { code: { contains: query, mode: "insensitive" } } },
{ quotation: { workName: { contains: query } } }, { quotation: { workName: { contains: query, mode: "insensitive" } } },
{ {
quotation: { quotation: {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },
@ -171,14 +171,14 @@ export class CreditNoteController extends Controller {
OR: [ OR: [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },

12
src/controllers/09-debit-note-controller.ts
View file

@ -200,16 +200,16 @@ export class DebitNoteController extends Controller {
const where = { const where = {
OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [ OR: queryOrNot<Prisma.QuotationWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ workName: { contains: query } }, { workName: { contains: query, mode: "insensitive" } },
{ {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },

53
src/controllers/09-line-controller.ts
View file

@ -58,13 +58,13 @@ export class LineController extends Controller {
...(queryOrNot<Prisma.EmployeeWhereInput[]>(query, [ ...(queryOrNot<Prisma.EmployeeWhereInput[]>(query, [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
...whereAddressQuery(query), ...whereAddressQuery(query),
]) ?? []), ]) ?? []),
] ]
@ -178,19 +178,19 @@ export class LineController extends Controller {
OR: queryOrNot<Prisma.RequestDataWhereInput[]>(query, [ OR: queryOrNot<Prisma.RequestDataWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ quotation: { code: { contains: query, mode: "insensitive" } } }, { quotation: { code: { contains: query, mode: "insensitive" } } },
{ quotation: { workName: { contains: query } } }, { quotation: { workName: { contains: query, mode: "insensitive" } } },
{ {
quotation: { quotation: {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ registerName: { contains: query } }, { registerName: { contains: query, mode: "insensitive" } },
{ registerNameEN: { contains: query } }, { registerNameEN: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },
@ -198,14 +198,14 @@ export class LineController extends Controller {
OR: [ OR: [
{ {
employeePassport: { employeePassport: {
some: { number: { contains: query } }, some: { number: { contains: query, mode: "insensitive" } },
}, },
}, },
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },
@ -611,16 +611,16 @@ export class LineController extends Controller {
? [ ? [
...(queryOrNot<Prisma.QuotationWhereInput[]>(query, [ ...(queryOrNot<Prisma.QuotationWhereInput[]>(query, [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ workName: { contains: query } }, { workName: { contains: query, mode: "insensitive" } },
{ {
customerBranch: { customerBranch: {
OR: [ OR: [
{ code: { contains: query, mode: "insensitive" } }, { code: { contains: query, mode: "insensitive" } },
{ customerName: { contains: query } }, { customerName: { contains: query, mode: "insensitive" } },
{ firstName: { contains: query } }, { firstName: { contains: query, mode: "insensitive" } },
{ firstNameEN: { contains: query } }, { firstNameEN: { contains: query, mode: "insensitive" } },
{ lastName: { contains: query } }, { lastName: { contains: query, mode: "insensitive" } },
{ lastNameEN: { contains: query } }, { lastNameEN: { contains: query, mode: "insensitive" } },
], ],
}, },
}, },
@ -1383,7 +1383,6 @@ export class PaymentFileLineController extends Controller {
}, },
where: { id }, where: { id },
}); });
console.log("data", data);
if (!data) throw notFoundError("Payment"); if (!data) throw notFoundError("Payment");
return { paymentId: id, quotationId: data.invoice.quotationId }; return { paymentId: id, quotationId: data.invoice.quotationId };
@ -1392,11 +1391,7 @@ export class PaymentFileLineController extends Controller {
@Get() @Get()
@Security("line") @Security("line")
async listAttachment(@Request() req: RequestWithUser, @Path() paymentId: string) { async listAttachment(@Request() req: RequestWithUser, @Path() paymentId: string) {
console.log("req", req);
const { quotationId } = await this.checkPermission(req.user, paymentId); const { quotationId } = await this.checkPermission(req.user, paymentId);
console.log("quotationId", quotationId);
return await listFile(fileLocation.quotation.payment(quotationId, paymentId)); return await listFile(fileLocation.quotation.payment(quotationId, paymentId));
} }