From 20ec6871d54d0deddbfc774eeab1be9e6f787636 Mon Sep 17 00:00:00 2001
From: Mikhail Trofimov <mtrofimov@mfd.ru>
Date: Sun, 5 Jul 2026 12:22:55 +0300
Subject: [PATCH] get rid of InnRegnumPair record

---
 .../service/signal/PackageRecordsService.java | 21 ++++++++++---------
 .../mapper/signal/PackageRecordsMapper.xml    | 12 +++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
index 182da34..05c959f 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
@@ -125,12 +125,13 @@ public class PackageRecordsService {
 
     public List<Long> selectLpUniquePackageIds(List<LegalsMap> legalsMaps) {
         try {
-            List<InnRegnumPair> pairs = legalsMaps.stream()
+            String json = entityToJsonMapper.writeValueAsString(legalsMaps.stream()
                     .filter(Objects::nonNull)
-                    .map(legalMap -> new InnRegnumPair(legalMap.getInn(), legalMap.getRegNum()))
-                    .toList();
+                    .map(s -> new HashMap<String, Object>() {{
+                        put("inn", s.getInn());
+                        put("reg_num", s.getRegNum());
+                    }}).toList());
 
-            String json = entityToJsonMapper.writeValueAsString(pairs);
             return packagesRecordsMapper.uniquePackageIdByInnAndRegNum(json);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
@@ -225,11 +226,13 @@ public class PackageRecordsService {
 
     public List<UserPackageLegalData> selectUserPackageLegalData(Set<Pair<Long, Long>> uniqueInnRegnumPairs) {
         try {
-            List<InnRegnumPair> pairs = uniqueInnRegnumPairs.stream()
-                    .map(pair -> new InnRegnumPair(pair.getKey(), pair.getValue()))
-                    .toList();
+            String json = entityToJsonMapper.writeValueAsString(uniqueInnRegnumPairs.stream()
+                    .filter(Objects::nonNull)
+                    .map(s -> new HashMap<String, Object>() {{
+                        put("inn", s.getKey());
+                        put("reg_num", s.getValue());
+                    }}).toList());
 
-            String json = entityToJsonMapper.writeValueAsString(pairs);
             return packagesRecordsMapper.selectUserPackageLegalData(json);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
@@ -250,6 +253,4 @@ public class PackageRecordsService {
         }
     }
 
-    public record InnRegnumPair(Long inn, Long regNum) {
-    }
 }
diff --git a/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml
index 75257f0..36a1591 100644
--- a/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml
+++ b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml
@@ -54,15 +54,15 @@
     </select>
 
     <select id="uniquePackageIdByInnAndRegNum" resultType="java.lang.Long">
-        WITH src AS (SELECT inn, regNum
+        WITH src AS (SELECT inn, reg_num
                      FROM json_to_recordset(#{json}::json) AS t(
                                                                 inn bigint,
-                                                                regNum bigint
+                                                                reg_num bigint
                          ))
         select distinct (package_id)
         FROM signals_legal_fid_map slfm
                  JOIN signals_user_packages sup ON sup.id = slfm.package_id
-        WHERE (slfm.inn, slfm.reg_num) IN (SELECT inn, regNum FROM src)
+        WHERE (slfm.inn, slfm.reg_num) IN (SELECT inn, reg_num FROM src)
           AND sup.status = 'ON_MONITORING'
     </select>
 
@@ -78,17 +78,17 @@
     </select>
 
     <select id="selectUserPackageLegalData" resultType="ru.nbch.credit_tracker.model.UserPackageLegalData">
-        WITH src AS (SELECT inn, regNum
+        WITH src AS (SELECT inn, reg_num
                      FROM json_to_recordset(#{json}::json) AS t(
                                                                 inn bigint,
-                                                                regNum bigint
+                                                                reg_num bigint
                          ))
         SELECT sup.id AS packageId, sup.signal_types AS signalTypes, sup.membercode AS userId,
                sup.package_name AS packageName, slfm.inn AS inn, slfm.reg_num AS regNum,
                slfm.subject_id AS subjectId
         FROM signals_legal_fid_map slfm
                  JOIN signals_user_packages sup ON sup.id = slfm.package_id
-        WHERE (slfm.inn, slfm.reg_num) IN (SELECT inn, regNum FROM src)
+        WHERE (slfm.inn, slfm.reg_num) IN (SELECT inn, reg_num FROM src)
           AND sup.status = 'ON_MONITORING'
     </select>