From 4a79a17a792584613bb10a6febc2013ce0f58197 Mon Sep 17 00:00:00 2001
From: Abdul Rahman Reza <rahman77889@gmail.com>
Date: Mon, 13 Jan 2025 14:55:44 +0700
Subject: [PATCH] update filter common

---
 src/controllers/user_activity.ts | 37 +++++++++++++++++++-------------
 src/helpers/common.ts            |  3 ++-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/controllers/user_activity.ts b/src/controllers/user_activity.ts
index 432a605..efa04c4 100644
--- a/src/controllers/user_activity.ts
+++ b/src/controllers/user_activity.ts
@@ -96,20 +96,26 @@ export class UserActivityController {
                 whereVal['id_user'] = req.auth.data.id;
             }
 
-            const res_count = userRepository.createQueryBuilder()
-                .leftJoinAndMapOne('u.username', User, 'u', 'u.id = id_user')
+            // const res_count = userRepository.createQueryBuilder()
+            //     .leftJoinAndMapOne('u.username', User, 'u', 'u.id = id_user')
+            //     .where(whereAttr, whereVal);
+            const res_count = userRepository.createQueryBuilder('user_activity')
+                .leftJoinAndSelect("user_activity.application", "application")
+                .leftJoinAndSelect("user_activity.user", "user")
                 .where(whereAttr, whereVal);
-            const res_list = userRepository.createQueryBuilder()
-                .select(
-                    'id,\n\
-                    id_user,\n\
-                    module,\n\
-                    description,\n\
-                    action,\n\
-                    url,\n\
-                    application,\n\
-                    created_at')
-                .addSelect('(SELECT u.username FROM users u WHERE u.id = id_user)', 'username')
+            const res_list = userRepository.createQueryBuilder('user_activity')
+                .leftJoinAndSelect("user_activity.application", "application")
+                .leftJoinAndSelect("user_activity.user", "user")
+                // .select(
+                //     'id,\n\
+                //     id_user,\n\
+                //     module,\n\
+                //     description,\n\
+                //     action,\n\
+                //     url,\n\
+                //     application,\n\
+                //     created_at')
+                // .addSelect('(SELECT u.username FROM users u WHERE u.id = id_user)', 'username')
                 // .leftJoinAndMapOne('u.username', User, 'u', 'u.id = id_user')
                 .where(whereAttr, whereVal)
                 .orderBy(param.order_field, param.order_direction)
@@ -123,7 +129,7 @@ export class UserActivityController {
 
             const current_page = param.page;
             const total_count_data = await res_count.getCount();
-            const list_data = await res_list.getRawMany()
+            const list_data = await res_list.getMany()
             const count_data = CommonHelper.countObject(list_data);
 
             return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
@@ -287,9 +293,10 @@ export class UserActivityController {
             const param: UserActivity & { application: string } = await schema.validateAsync(req.body);
 
             const repo_app = OrmHelper.DB.getRepository(Application);
+            const repo_user = OrmHelper.DB.getRepository(User);
 
             const data = new UserActivity()
-            data.id_user = param.id_user
+            data.user = await repo_user.findOneBy({ id: param.id_user })
             data.refresh_token = param.refresh_token
             data.module = param.module
             data.description = param.description
diff --git a/src/helpers/common.ts b/src/helpers/common.ts
index 1322d67..5cff85c 100644
--- a/src/helpers/common.ts
+++ b/src/helpers/common.ts
@@ -110,6 +110,7 @@ export default class CommonHelper {
 
                     if (p != 'any') {
                         if (!validate(f)) {
+                            console.log('ffffff', f, p)
                             let found = false;
                             if (fr['from']) {
                                 whereAttrPre.push(p + " >= :" + p + '_from');
@@ -123,7 +124,7 @@ export default class CommonHelper {
                             }
                             if (fr['like']) {
                                 whereAttrPre.push('LOWER(' + p + ') like :' + p + '_like');
-                                whereVal[p + '_like'] = '%' + fr['like'] + '%';;
+                                whereVal[p + '_like'] = '%' + fr['like'].toLowerCase() + '%';;
                                 found = true;
                             }