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

Merge branch 'refactor/db' into dev

Browse source
This commit is contained in:
Methapon2001 2024-04-05 08:53:17 +07:00
commit e3de7ed8e9
6 changed files with 82 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

24
prisma/migrations/20240403022955_init/migration.sql → prisma/migrations/20240404082734_init/migration.sql
View file

@ -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,
@ -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',
@ -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,
@ -186,12 +186,12 @@ 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,
"nationality" TEXT NOT NULL,
"addressTH" TEXT NOT NULL,
"address" TEXT NOT NULL,
"addressEN" TEXT NOT NULL,
"provinceId" TEXT,
"districtId" TEXT,

11
prisma/migrations/20240404090554_update/migration.sql Normal file
View file

@ -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;

56
prisma/schema.prisma
View file

@ -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)
@ -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)
@ -203,7 +203,7 @@ model Customer {
id String @id @default(uuid())
code String
customerType String
customerNameTH String
customerName String
customerNameEN String
imageUrl String?
@ -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)
@ -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,13 +267,17 @@ model Employee {
id String @id @default(uuid())
code String
fullNameTH String
fullNameEN String
nrcNo String
firstName String
firstNameEN String
lastName String
lastNameEN String
dateOfBirth DateTime
gender String
nationality String
addressTH String
address String
addressEN String
province Province? @relation(fields: [provinceId], references: [id], onDelete: SetNull)
@ -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 {

12
src/controllers/branch/branch-controller.ts
View file

@ -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;

6
src/controllers/branch/user-controller.ts
View file

@ -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;

38
src/controllers/user/user-controller.ts
View file

@ -32,24 +32,24 @@ type UserCreate = {
userType: string;
userRole: string;
firstNameTH: string;
firstName: string;
firstNameEN: string;
lastNameTH: string;
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;
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 },