From a5b57f287d9f5301a69724127e659d35bd158464 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Mon, 30 Sep 2024 17:01:31 +0700
Subject: [PATCH] fix

---
 src/controllers/PortfolioController.ts | 61 ++++++++++++++++----------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/controllers/PortfolioController.ts b/src/controllers/PortfolioController.ts
index 7eac17d..c690fa1 100644
--- a/src/controllers/PortfolioController.ts
+++ b/src/controllers/PortfolioController.ts
@@ -42,31 +42,44 @@ export class PortfolioController extends Controller {
    *
    */
   @Get()
-  async GetResult(@Request() request: RequestWithUser, @Query("keyword") keyword?: string) {
-   const _portfolio = await this.portfolioRepository
-     .createQueryBuilder("portfolio")
-     .select([
-       "portfolio.id",
-       "portfolio.name",
-       "portfolio.detail",
-       "portfolio.createdAt",
-       "portfolio.lastUpdatedAt",
-       "portfolio.createdFullName",
-       "portfolio.lastUpdateFullName",
-     ])
-     .where("portfolio.createdUserId = :userId", { userId: request.user.sub })
-     .andWhere(
-       new Brackets((qb) => {
-         qb.where(keyword != null && keyword != "" ? "portfolio.name LIKE :keyword" : "1=1", {
-           keyword: `%${keyword}%`,
-         }).orWhere(keyword != null && keyword != "" ? "portfolio.detail LIKE :keyword" : "1=1", {
-           keyword: `%${keyword}%`,
-         });
-       }),
-     )
-    .getMany();
-    
+  async GetResult(@Request() request: RequestWithUser) {
+    const _portfolio = await this.portfolioRepository.find({
+      where: { createdUserId: request.user.sub },
+      select: [
+        "id",
+        "name",
+        "detail",
+        "createdAt",
+        "lastUpdatedAt",
+        "createdFullName",
+        "lastUpdateFullName",
+      ],
+      order: { name: "ASC" },
+    });
     
+    //  const _portfolio = await this.portfolioRepository
+    //    .createQueryBuilder("portfolio")
+    //    .select([
+    //      "portfolio.id",
+    //      "portfolio.name",
+    //      "portfolio.detail",
+    //      "portfolio.createdAt",
+    //      "portfolio.lastUpdatedAt",
+    //      "portfolio.createdFullName",
+    //      "portfolio.lastUpdateFullName",
+    //    ])
+    //    .where("portfolio.createdUserId = :userId", { userId: request.user.sub })
+    //    .andWhere(
+    //      new Brackets((qb) => {
+    //        qb.where(keyword != null && keyword != "" ? "portfolio.name LIKE :keyword" : "1=1", {
+    //          keyword: `%${keyword}%`,
+    //        }).orWhere(keyword != null && keyword != "" ? "portfolio.detail LIKE :keyword" : "1=1", {
+    //          keyword: `%${keyword}%`,
+    //        });
+    //      }),
+    //    )
+    //   .getMany();
+
     return new HttpSuccess(_portfolio);
   }