From cd768129977b2c1d8ff0ee49efa6986bc509c580 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:42:46 +0700 Subject: [PATCH 1/5] refactor: remove suffix from field This field does not indicate that it is specific to TH but any locale --- prisma/schema.prisma | 20 ++++++++++---------- src/controllers/branch/branch-controller.ts | 12 ++++++------ src/controllers/branch/user-controller.ts | 6 +++--- src/controllers/user/user-controller.ts | 16 ++++++++-------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index ad90c97..b0f82be 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -9,7 +9,7 @@ datasource db { model Province { id String @id @default(uuid()) - nameTH String + name String nameEN String createdBy String? @@ -27,7 +27,7 @@ model Province { model District { id String @id @default(uuid()) - nameTH String + name String nameEN String provinceId String @@ -47,7 +47,7 @@ model District { model SubDistrict { id String @id @default(uuid()) - nameTH String + name String nameEN String zipCode String @@ -74,9 +74,9 @@ model Branch { id String @id @default(uuid()) code String @default(uuid()) taxNo String - nameTH String + name String nameEN String - addressTH String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) @@ -148,12 +148,12 @@ model User { keycloakId String code String @default(uuid()) - firstNameTH String + firstName String firstNameEN String - lastNameTH String + lastName String lastNameEN String - addressTH String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) @@ -222,7 +222,7 @@ model CustomerBranch { branchNo String legalPersonNo String - nameTH String + name String nameEN String customer Customer @relation(fields: [customerId], references: [id], onDelete: Cascade) @@ -270,7 +270,7 @@ model Employee { gender String nationality String - addressTH String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) diff --git a/src/controllers/branch/branch-controller.ts b/src/controllers/branch/branch-controller.ts index 05e5d01..b4ae109 100644 --- a/src/controllers/branch/branch-controller.ts +++ b/src/controllers/branch/branch-controller.ts @@ -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; diff --git a/src/controllers/branch/user-controller.ts b/src/controllers/branch/user-controller.ts index 1ae434b..483f1c4 100644 --- a/src/controllers/branch/user-controller.ts +++ b/src/controllers/branch/user-controller.ts @@ -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; diff --git a/src/controllers/user/user-controller.ts b/src/controllers/user/user-controller.ts index 09c78c1..30bfa19 100644 --- a/src/controllers/user/user-controller.ts +++ b/src/controllers/user/user-controller.ts @@ -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 }, From 86efb84ceae9abe50d515f3a6640ea00640acd22 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Apr 2024 14:05:07 +0700 Subject: [PATCH 2/5] refactor: recreate migration file --- .../migration.sql | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename prisma/migrations/{20240403022955_init => 20240404070242_init}/migration.sql (98%) diff --git a/prisma/migrations/20240403022955_init/migration.sql b/prisma/migrations/20240404070242_init/migration.sql similarity index 98% rename from prisma/migrations/20240403022955_init/migration.sql rename to prisma/migrations/20240404070242_init/migration.sql index 623aef0..7851f6c 100644 --- a/prisma/migrations/20240403022955_init/migration.sql +++ b/prisma/migrations/20240404070242_init/migration.sql @@ -4,7 +4,7 @@ CREATE TYPE "Status" AS ENUM ('CREATED', 'USED'); -- CreateTable CREATE TABLE "Province" ( "id" TEXT NOT NULL, - "nameTH" TEXT NOT NULL, + "name" TEXT NOT NULL, "nameEN" TEXT NOT NULL, "createdBy" TEXT, "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP, @@ -17,7 +17,7 @@ CREATE TABLE "Province" ( -- CreateTable CREATE TABLE "District" ( "id" TEXT NOT NULL, - "nameTH" TEXT NOT NULL, + "name" TEXT NOT NULL, "nameEN" TEXT NOT NULL, "provinceId" TEXT NOT NULL, "createdBy" TEXT, @@ -31,7 +31,7 @@ CREATE TABLE "District" ( -- CreateTable CREATE TABLE "SubDistrict" ( "id" TEXT NOT NULL, - "nameTH" TEXT NOT NULL, + "name" TEXT NOT NULL, "nameEN" TEXT NOT NULL, "zipCode" TEXT NOT NULL, "districtId" TEXT NOT NULL, @@ -48,9 +48,9 @@ CREATE TABLE "Branch" ( "id" TEXT NOT NULL, "code" TEXT NOT NULL, "taxNo" TEXT NOT NULL, - "nameTH" TEXT NOT NULL, + "name" TEXT NOT NULL, "nameEN" TEXT NOT NULL, - "addressTH" TEXT NOT NULL, + "address" TEXT NOT NULL, "addressEN" TEXT NOT NULL, "provinceId" TEXT, "districtId" TEXT, @@ -103,11 +103,11 @@ CREATE TABLE "User" ( "id" TEXT NOT NULL, "keycloakId" TEXT NOT NULL, "code" TEXT NOT NULL, - "firstNameTH" TEXT NOT NULL, + "firstName" TEXT NOT NULL, "firstNameEN" TEXT NOT NULL, - "lastNameTH" TEXT NOT NULL, + "lastName" TEXT NOT NULL, "lastNameEN" TEXT NOT NULL, - "addressTH" TEXT NOT NULL, + "address" TEXT NOT NULL, "addressEN" TEXT NOT NULL, "provinceId" TEXT, "districtId" TEXT, @@ -158,7 +158,7 @@ CREATE TABLE "CustomerBranch" ( "id" TEXT NOT NULL, "branchNo" TEXT NOT NULL, "legalPersonNo" TEXT NOT NULL, - "nameTH" TEXT NOT NULL, + "name" TEXT NOT NULL, "nameEN" TEXT NOT NULL, "customerId" TEXT NOT NULL, "taxNo" TEXT NOT NULL, @@ -191,7 +191,7 @@ CREATE TABLE "Employee" ( "dateOfBirth" TIMESTAMP(3) NOT NULL, "gender" TEXT NOT NULL, "nationality" TEXT NOT NULL, - "addressTH" TEXT NOT NULL, + "address" TEXT NOT NULL, "addressEN" TEXT NOT NULL, "provinceId" TEXT, "districtId" TEXT, From fff5558701a54d28017250da8690ae2400283f94 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Apr 2024 15:27:57 +0700 Subject: [PATCH 3/5] refactor: update schema and migration --- .../migration.sql | 4 ++-- prisma/schema.prisma | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename prisma/migrations/{20240404070242_init => 20240404082734_init}/migration.sql (99%) diff --git a/prisma/migrations/20240404070242_init/migration.sql b/prisma/migrations/20240404082734_init/migration.sql similarity index 99% rename from prisma/migrations/20240404070242_init/migration.sql rename to prisma/migrations/20240404082734_init/migration.sql index 7851f6c..6991bd0 100644 --- a/prisma/migrations/20240404070242_init/migration.sql +++ b/prisma/migrations/20240404082734_init/migration.sql @@ -141,7 +141,7 @@ CREATE TABLE "Customer" ( "id" TEXT NOT NULL, "code" TEXT NOT NULL, "customerType" TEXT NOT NULL, - "customerNameTH" TEXT NOT NULL, + "customerName" TEXT NOT NULL, "customerNameEN" TEXT NOT NULL, "imageUrl" TEXT, "status" "Status" NOT NULL DEFAULT 'CREATED', @@ -186,7 +186,7 @@ CREATE TABLE "CustomerBranch" ( CREATE TABLE "Employee" ( "id" TEXT NOT NULL, "code" TEXT NOT NULL, - "fullNameTH" TEXT NOT NULL, + "fullName" TEXT NOT NULL, "fullNameEN" TEXT NOT NULL, "dateOfBirth" TIMESTAMP(3) NOT NULL, "gender" TEXT NOT NULL, diff --git a/prisma/schema.prisma b/prisma/schema.prisma index b0f82be..51fd626 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -76,7 +76,7 @@ model Branch { taxNo String name String nameEN String - address String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) @@ -153,7 +153,7 @@ model User { lastName String lastNameEN String - address String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) @@ -203,7 +203,7 @@ model Customer { id String @id @default(uuid()) code String customerType String - customerNameTH String + customerName String customerNameEN String imageUrl String? @@ -264,13 +264,13 @@ model Employee { id String @id @default(uuid()) code String - fullNameTH String + fullName String fullNameEN String dateOfBirth DateTime gender String nationality String - address String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) From 57d2c575bc9316a78e7e197966f60d91305a4a00 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:08:22 +0700 Subject: [PATCH 4/5] refactor: change from required to not required --- .../20240404090554_update/migration.sql | 11 ++++++++++ prisma/schema.prisma | 20 ++++++++--------- src/controllers/user/user-controller.ts | 22 +++++++++---------- 3 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 prisma/migrations/20240404090554_update/migration.sql diff --git a/prisma/migrations/20240404090554_update/migration.sql b/prisma/migrations/20240404090554_update/migration.sql new file mode 100644 index 0000000..09b8f7b --- /dev/null +++ b/prisma/migrations/20240404090554_update/migration.sql @@ -0,0 +1,11 @@ +-- AlterTable +ALTER TABLE "User" ALTER COLUMN "registrationNo" DROP NOT NULL, +ALTER COLUMN "startDate" DROP NOT NULL, +ALTER COLUMN "retireDate" DROP NOT NULL, +ALTER COLUMN "discountCondition" DROP NOT NULL, +ALTER COLUMN "licenseNo" DROP NOT NULL, +ALTER COLUMN "licenseIssueDate" DROP NOT NULL, +ALTER COLUMN "licenseExpireDate" DROP NOT NULL, +ALTER COLUMN "sourceNationality" DROP NOT NULL, +ALTER COLUMN "importNationality" DROP NOT NULL, +ALTER COLUMN "trainingPlace" DROP NOT NULL; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 51fd626..8b98e78 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -170,24 +170,24 @@ model User { email String telephoneNo String - registrationNo String + registrationNo String? - startDate DateTime - retireDate DateTime + startDate DateTime? + retireDate DateTime? userType String userRole String - discountCondition String + discountCondition String? - licenseNo String - licenseIssueDate DateTime - licenseExpireDate DateTime + licenseNo String? + licenseIssueDate DateTime? + licenseExpireDate DateTime? - sourceNationality String - importNationality String + sourceNationality String? + importNationality String? - trainingPlace String + trainingPlace String? status Status @default(CREATED) diff --git a/src/controllers/user/user-controller.ts b/src/controllers/user/user-controller.ts index 30bfa19..f507caf 100644 --- a/src/controllers/user/user-controller.ts +++ b/src/controllers/user/user-controller.ts @@ -37,17 +37,17 @@ type UserCreate = { lastName: string; lastNameEN: string; - code: string; - registrationNo: string; - startDate: Date; - retireDate: Date; - discountCondition: string; - licenseNo: string; - licenseIssueDate: Date; - licenseExpireDate: Date; - sourceNationality: string; - importNationality: string; - trainingPlace: string; + code?: string; + registrationNo?: string; + startDate?: Date; + retireDate?: Date; + discountCondition?: string; + licenseNo?: string; + licenseIssueDate?: Date; + licenseExpireDate?: Date; + sourceNationality?: string; + importNationality?: string; + trainingPlace?: string; address: string; addressEN: string; From 203fd88e66496f21d2fb10e1056a06195404602e Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:42:52 +0700 Subject: [PATCH 5/5] refactor: database fields --- prisma/schema.prisma | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 8b98e78..0a43c92 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -233,6 +233,7 @@ model CustomerBranch { registerDate DateTime authorizedCapital String + address String addressEN String province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull) @@ -252,6 +253,8 @@ model CustomerBranch { latitude String longitude String + status Status @default(CREATED) + createdBy String? createdAt DateTime @default(now()) updateBy String? @@ -264,8 +267,12 @@ model Employee { id String @id @default(uuid()) code String - fullName String - fullNameEN String + nrcNo String + firstName String + firstNameEN String + lastName String + lastNameEN String + dateOfBirth DateTime gender String nationality String @@ -289,7 +296,6 @@ model Employee { arrivalBarricade String arrivalCardNo String - profileImageUrl String customerBranch CustomerBranch? @relation(fields: [customerBranchId], references: [id], onDelete: SetNull) customerBranchId String? @@ -303,7 +309,7 @@ model Employee { employeeCheckup EmployeeCheckup[] employeeWork EmployeeWork[] - EmployeeOtherInfo EmployeeOtherInfo[] + employeeOtherInfo EmployeeOtherInfo[] } model EmployeeCheckup {