refactor: remove suffix from field
This field does not indicate that it is specific to TH but any locale
This commit is contained in:
parent
79f844adee
commit
cd76812997
4 changed files with 27 additions and 27 deletions
|
|
@ -23,9 +23,9 @@ type BranchCreate = {
|
|||
code: string;
|
||||
taxNo: string;
|
||||
nameEN: string;
|
||||
nameTH: string;
|
||||
name: string;
|
||||
addressEN: string;
|
||||
addressTH: string;
|
||||
address: string;
|
||||
zipCode: string;
|
||||
email: string;
|
||||
telephoneNo: string;
|
||||
|
|
@ -42,9 +42,9 @@ type BranchUpdate = {
|
|||
code?: string;
|
||||
taxNo?: string;
|
||||
nameEN?: string;
|
||||
nameTH?: string;
|
||||
name?: string;
|
||||
addressEN?: string;
|
||||
addressTH?: string;
|
||||
address?: string;
|
||||
zipCode?: string;
|
||||
email?: string;
|
||||
telephoneNo?: string;
|
||||
|
|
@ -72,7 +72,7 @@ export class BranchController extends Controller {
|
|||
select: {
|
||||
id: true,
|
||||
nameEN: true,
|
||||
nameTH: true,
|
||||
name: true,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ export class BranchController extends Controller {
|
|||
const where = {
|
||||
OR: [
|
||||
{ nameEN: { contains: query }, zipCode },
|
||||
{ nameTH: { contains: query }, zipCode },
|
||||
{ name: { contains: query }, zipCode },
|
||||
{ email: { contains: query }, zipCode },
|
||||
],
|
||||
} satisfies Prisma.BranchWhereInput;
|
||||
|
|
|
|||
|
|
@ -34,9 +34,9 @@ export class BranchUserController extends Controller {
|
|||
) {
|
||||
const where = {
|
||||
OR: [
|
||||
{ user: { firstNameTH: { contains: query }, zipCode }, branchId },
|
||||
{ user: { firstName: { contains: query }, zipCode }, branchId },
|
||||
{ user: { firstNameEN: { contains: query }, zipCode }, branchId },
|
||||
{ user: { lastNameTH: { contains: query }, zipCode }, branchId },
|
||||
{ user: { lastName: { contains: query }, zipCode }, branchId },
|
||||
{ user: { lastNameEN: { contains: query }, zipCode }, branchId },
|
||||
{ user: { email: { contains: query }, zipCode }, branchId },
|
||||
{ user: { telephoneNo: { contains: query }, zipCode }, branchId },
|
||||
|
|
@ -131,7 +131,7 @@ export class UserBranchController extends Controller {
|
|||
) {
|
||||
const where = {
|
||||
OR: [
|
||||
{ branch: { nameTH: { contains: query }, zipCode }, userId },
|
||||
{ branch: { name: { contains: query }, zipCode }, userId },
|
||||
{ branch: { nameEN: { contains: query }, zipCode }, userId },
|
||||
],
|
||||
} satisfies Prisma.BranchUserWhereInput;
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ type UserCreate = {
|
|||
userType: string;
|
||||
userRole: string;
|
||||
|
||||
firstNameTH: string;
|
||||
firstName: string;
|
||||
firstNameEN: string;
|
||||
lastNameTH: string;
|
||||
lastName: string;
|
||||
lastNameEN: string;
|
||||
|
||||
code: string;
|
||||
|
|
@ -49,7 +49,7 @@ type UserCreate = {
|
|||
importNationality: string;
|
||||
trainingPlace: string;
|
||||
|
||||
addressTH: string;
|
||||
address: string;
|
||||
addressEN: string;
|
||||
zipCode: string;
|
||||
email: string;
|
||||
|
|
@ -64,9 +64,9 @@ type UserUpdate = {
|
|||
userType?: string;
|
||||
userRole?: string;
|
||||
|
||||
firstNameTH?: string;
|
||||
firstName?: string;
|
||||
firstNameEN?: string;
|
||||
lastNameTH?: string;
|
||||
lastName?: string;
|
||||
lastNameEN?: string;
|
||||
|
||||
code?: string;
|
||||
|
|
@ -81,7 +81,7 @@ type UserUpdate = {
|
|||
importNationality?: string;
|
||||
trainingPlace?: string;
|
||||
|
||||
addressTH?: string;
|
||||
address?: string;
|
||||
addressEN?: string;
|
||||
zipCode?: string;
|
||||
email?: string;
|
||||
|
|
@ -110,9 +110,9 @@ export class UserController extends Controller {
|
|||
) {
|
||||
const where = {
|
||||
OR: [
|
||||
{ firstNameTH: { contains: query }, zipCode, userType },
|
||||
{ firstName: { contains: query }, zipCode, userType },
|
||||
{ firstNameEN: { contains: query }, zipCode, userType },
|
||||
{ lastNameTH: { contains: query }, zipCode, userType },
|
||||
{ lastName: { contains: query }, zipCode, userType },
|
||||
{ lastNameEN: { contains: query }, zipCode, userType },
|
||||
{ email: { contains: query }, zipCode, userType },
|
||||
{ telephoneNo: { contains: query }, zipCode, userType },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue