From c548386b564f97c3f9937d69f95f2139d58c9898 Mon Sep 17 00:00:00 2001
From: Methapon Metanipat <methapon@frappet.com>
Date: Thu, 22 Aug 2024 11:42:06 +0700
Subject: [PATCH] refactor: drop field

---
 .../migration.sql                                 |  8 ++++++++
 prisma/schema.prisma                              |  2 --
 src/controllers/employee-controller.ts            | 15 ++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 prisma/migrations/20240822043956_drop_uneccessary_field/migration.sql

diff --git a/prisma/migrations/20240822043956_drop_uneccessary_field/migration.sql b/prisma/migrations/20240822043956_drop_uneccessary_field/migration.sql
new file mode 100644
index 0000000..f778525
--- /dev/null
+++ b/prisma/migrations/20240822043956_drop_uneccessary_field/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `zipCode` on the `Employee` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Employee" DROP COLUMN "zipCode";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6842166..5bd46c4 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -516,8 +516,6 @@ model Employee {
   subDistrict   SubDistrict? @relation(fields: [subDistrictId], references: [id], onDelete: SetNull)
   subDistrictId String?
 
-  zipCode String
-
   passportType              String
   passportNumber            String
   passportIssueDate         DateTime @db.Date
diff --git a/src/controllers/employee-controller.ts b/src/controllers/employee-controller.ts
index 7e161f2..c0dfc42 100644
--- a/src/controllers/employee-controller.ts
+++ b/src/controllers/employee-controller.ts
@@ -56,7 +56,6 @@ type EmployeeCreate = {
 
   addressEN: string;
   address: string;
-  zipCode: string;
 
   passportType: string;
   passportNumber: string;
@@ -139,7 +138,6 @@ type EmployeeUpdate = {
 
   addressEN?: string;
   address?: string;
-  zipCode?: string;
 
   passportType?: string;
   passportNumber?: string;
@@ -275,13 +273,16 @@ export class EmployeeController extends Controller {
 
     const where = {
       OR: [
-        { firstName: { contains: query }, zipCode, gender, ...filterStatus(status) },
-        { firstNameEN: { contains: query }, zipCode, gender, ...filterStatus(status) },
-        { lastName: { contains: query }, zipCode, gender, ...filterStatus(status) },
-        { lastNameEN: { contains: query }, zipCode, gender, ...filterStatus(status) },
+        { firstName: { contains: query } },
+        { firstNameEN: { contains: query } },
+        { lastName: { contains: query } },
+        { lastNameEN: { contains: query } },
       ],
       AND: {
-        customerBranch: customerId ? { customerId: customerId } : undefined,
+        ...filterStatus(status),
+        customerBranch: customerId ? { customerId } : undefined,
+        subDistrict: zipCode ? { zipCode } : undefined,
+        gender,
       },
     } satisfies Prisma.EmployeeWhereInput;