From 0c10ac97483a65732d5f09f2fbbbca19b9c5001a Mon Sep 17 00:00:00 2001
From: Mathias Rothenhaeusler <mathias.rothenhaeusler@remira.com>
Date: Wed, 6 May 2026 08:25:36 +0200
Subject: [PATCH] fix some issues with use command

---
 src/entity/filter_uses.rs     | 2 +-
 src/repository/filter_repo.rs | 7 +++----
 src/service/filter_service.rs | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/entity/filter_uses.rs b/src/entity/filter_uses.rs
index 94bc469..d19fead 100644
--- a/src/entity/filter_uses.rs
+++ b/src/entity/filter_uses.rs
@@ -5,7 +5,7 @@ pub struct FilterUses {
     pub filter_module_no: String,
     pub filter_user: usize,
     pub filter_id: usize,
-    pub active: String,
+    pub active: usize,
     pub merchant: String,
     pub ep_id: usize,
     pub ep_no: String,
diff --git a/src/repository/filter_repo.rs b/src/repository/filter_repo.rs
index d222d33..d3b5efe 100644
--- a/src/repository/filter_repo.rs
+++ b/src/repository/filter_repo.rs
@@ -106,8 +106,7 @@ impl FilterRepo {
                     t3.ep_id,
                     t4.m_name as merchant,
                     t2.filter_no,
-                    t3.ep_no,
-                    t2.filter_is_active as active
+                    t3.ep_no
                 FROM global_data.filter_modules t1
                 JOIN filter t2 ON t1.filter_module_id = t2.filter_module_id
                 JOIN exchange_point t3 ON t3.ep_id = t2.ep_id
@@ -115,13 +114,13 @@ impl FilterRepo {
                 WHERE
                     t4.is_deleted = 0
                 AND t2.is_deleted = 0
-                AND t1.file_name LIKE :search_like
+                AND (t1.file_name LIKE :search_like or t1.filter_module_id = :module_id)
                 ",
         )?;
 
         let search_like = format!("%{}%", filter_file);
 
-        let params = params! {"search_like" => search_like};
+        let params = params! {"search_like" => search_like, "module_id" => filter_file};
 
         connection.exec_map(
             stat,
diff --git a/src/service/filter_service.rs b/src/service/filter_service.rs
index d481e0d..91f5727 100644
--- a/src/service/filter_service.rs
+++ b/src/service/filter_service.rs
@@ -24,7 +24,7 @@ impl FilterService {
             println!("No use for file/module found!");
         } else {
             uses.into_iter().for_each(|filter_use: FilterUses| {
-                let is_active = if filter_use.active.eq("1") {
+                let is_active = if filter_use.active == 1 {
                     "true".to_string()
                 } else {
                     "false".to_string()
@@ -35,6 +35,7 @@ impl FilterService {
                 println!("ModuleNo:     {}", filter_use.filter_module_no);
                 println!("FilterUser:   {}", filter_use.filter_user);
                 println!("Description:  {}", filter_use.description);
+                println!("EP_NO:        {}", filter_use.ep_no);
                 println!("FilterId:     {}", filter_use.filter_id);
                 println!("FilterNo:     {}", filter_use.filter_no);
                 println!("Merchant:     {}", filter_use.merchant);