From 72f7f6e2ac84da7924db75bdbda344d65953784c Mon Sep 17 00:00:00 2001
From: Mikhail Trofimov <mtrofimov@mfd.ru>
Date: Fri, 27 Jun 2025 13:14:36 +0300
Subject: [PATCH] Return active packages only with on_monitoring status

---
 .../java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java | 2 +-
 src/main/java/ru/nbch/credit_tracker/service/SignalService.java | 2 +-
 src/main/resources/mybatis/mapper/signal/SignalMapper.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java
index b99ed04..eafd1aa 100644
--- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java
+++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java
@@ -36,7 +36,7 @@ public interface SignalMapper {
 
     PackageData findPackageData(@Param("id") Integer id);
 
-    List<PackageData> findPackageDataList(@Param("userId") String userId);
+    List<PackageData> findPackageDataList(@Param("userId") String userId, @Param("status") String status);
 
     List<PackageData> findPackagesByStatus(@Param("status")  String status);
 
diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java
index dc195ca..3911df3 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java
@@ -152,7 +152,7 @@ public class SignalService {
         activePackages.setStatus("OK");
         activePackages.setMembercode(memberCode);
         Packages packages = new Packages();
-        mapper.findPackageDataList(memberCode).forEach(data -> {
+        mapper.findPackageDataList(memberCode, Status.ON_MONITORING.name()).forEach(data -> {
             Package pack = new Package();
             pack.setPackageName(data.getPackageName());
             pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null);
diff --git a/src/main/resources/mybatis/mapper/signal/SignalMapper.xml b/src/main/resources/mybatis/mapper/signal/SignalMapper.xml
index aa53c20..d4f614d 100644
--- a/src/main/resources/mybatis/mapper/signal/SignalMapper.xml
+++ b/src/main/resources/mybatis/mapper/signal/SignalMapper.xml
@@ -109,7 +109,7 @@
     <select id="findPackageDataList" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData">
         SELECT package_name, created_at
         FROM signals_user_packages
-        WHERE membercode IS NOT NULL AND  LEFT(membercode, 6) = #{userId}
+        WHERE membercode IS NOT NULL AND  LEFT(membercode, 6) = #{userId} AND status = #{status}
     </select>
 
     <select id="findPackagesByStatus" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData">