From 14f5a082caf7272a96f98ce7c3042a4fca7beaff Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 5 Apr 2024 10:19:28 +0700
Subject: [PATCH] list

---
 .../DevelopmentScholarshipController.ts       | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts
index ad7543f..7f7abe9 100644
--- a/src/controllers/DevelopmentScholarshipController.ts
+++ b/src/controllers/DevelopmentScholarshipController.ts
@@ -144,8 +144,8 @@ export class DevelopmentScholarshipController extends Controller {
     @Query("pageSize") pageSize: number = 10,
     @Query("keyword") keyword?: string,
     @Query("year") year?: number,
+    @Query("scholarshipType") scholarshipType?: string,
   ) {
-    const type = "OFFICER";
     const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship)
       .createQueryBuilder("developmentScholarship")
       .leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
@@ -154,30 +154,14 @@ export class DevelopmentScholarshipController extends Controller {
         year != 0 && year != null && year != undefined
           ? "developmentScholarship.scholarshipYear = :scholarshipYear"
           : "1=1",
-        { year: year },
+        { scholarshipYear: year },
       )
-      .andWhere("developmentScholarship.type = :type", { type: type })
+      .andWhere("developmentScholarship.scholarshipType = :scholarshipType", { scholarshipType: scholarshipType })
       .andWhere(
-        new Brackets((qb) => {
-          qb.where(
-            keyword != null && keyword != ""
-              ? "developmentScholarship.prefix LIKE :keyword"
-              : "1=1",
-            {
-              keyword: `%${keyword}%`,
-            },
-          )
-            .orWhere(
+          new Brackets((qb) => {
+            qb.where(
               keyword != null && keyword != ""
-                ? "developmentScholarship.firstName LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${keyword}%`,
-              },
-            )
-            .orWhere(
-              keyword != null && keyword != ""
-                ? "developmentScholarship.lastName LIKE :keyword"
+                ? `CONCAT(developmentScholarship.prefix, developmentScholarship.firstName," ",developmentScholarship.lastName)  like '%${keyword}%'`
                 : "1=1",
               {
                 keyword: `%${keyword}%`,
@@ -193,7 +177,7 @@ export class DevelopmentScholarshipController extends Controller {
             )
             .orWhere(
               keyword != null && keyword != ""
-                ? "developmentScholarship.position LIKE :keyword"
+                ? "developmentScholarship.posExecutive LIKE :keyword"
                 : "1=1",
               {
                 keyword: `%${keyword}%`,