From 60cb6e9e8c98e9fbc025a4f97f5dcd3ee88c42ea Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Tue, 14 Oct 2025 15:42:17 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/BKI-3246 Get rid of update duplicate --- .../java/ru/nbch/credit_tracker/facade/SignalFacade.java | 3 +-- .../nbch/credit_tracker/mapper/signal/UserPackageMapper.java | 2 +- .../java/ru/nbch/credit_tracker/service/SignalService.java | 4 ++-- .../ru/nbch/credit_tracker/service/UpdatingFlagsService.java | 5 +---- .../credit_tracker/service/signal/UserPackageService.java | 4 ++-- .../resources/mybatis/mapper/signal/UserPackageMapper.xml | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index bbbe855..3afb7a4 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -242,8 +242,7 @@ public class SignalFacade { if (signalRestService.setupMonitoring(packageId)) { LocalDateTime monitoringAt = LocalDateTime.now(); log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}, MonitoringAt: {}", packageId, packageName, monitoringAt); - signalService.updatePackageStatus(packageId, Status.ON_MONITORING); - signalService.updatePackageMonitoringAt(packageId, monitoringAt); + signalService.updatePackageOnMonitoringSuccess(packageId, monitoringAt); monitoringErrorProcesingService.findErrors(packageId); } else { log.info("Package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName); diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java index 92b2091..73dda8f 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java @@ -24,7 +24,7 @@ public interface UserPackageMapper { void updatePackageLastDownloadedReport(@Param("id") Integer id, @Param("fileName") String fileName); - void updateMonitoringAt(@Param("id")Integer id, @Param("monitoringAt") LocalDateTime monitoringAt); + void updatePackageOnMonitoringSuccess(@Param("id")Integer id, @Param("monitoringAt") LocalDateTime monitoringAt); UserPackage findPackage(@Param("id") Integer id); 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 363b87f..010a5bf 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -201,8 +201,8 @@ public class SignalService { userPackageService.updatePackageStatus(packageId, status); } - public void updatePackageMonitoringAt(Integer packageId, LocalDateTime monitoringAt) { - userPackageService.updateMonitoringAt(packageId, monitoringAt); + public void updatePackageOnMonitoringSuccess(Integer packageId, LocalDateTime monitoringAt) { + userPackageService.updatePackageOnMonitoringSuccess(packageId, monitoringAt); } /** diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java index 1afe512..f9874a3 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -71,10 +71,7 @@ public class UpdatingFlagsService { if (signalRestService.setupMonitoring(packageId)) { LocalDateTime monitoringAt = userPackage.getMonitoringAt() != null ? userPackage.getMonitoringAt() : LocalDateTime.now(); log.info("Flags were updated successfully. PackageId: {} PackageName: {} MonitoringAt: {}. Package status changed to ON_MONITORING", packageId, packageName, monitoringAt); - signalService.updatePackageStatus(packageId, Status.ON_MONITORING); - if (userPackage.getMonitoringAt() == null) { // пакет еще не был поставлен на мониторинг в оф. сервис сигналов - signalService.updatePackageMonitoringAt(packageId, monitoringAt); - } + signalService.updatePackageOnMonitoringSuccess(packageId, monitoringAt); monitoringErrorProcesingService.findErrors(packageId); } else { log.info("Updated package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName); diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java index 4f4a2a7..a390521 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java @@ -46,8 +46,8 @@ public class UserPackageService { mapper.updatePackageLastDownloadedReport(id, fileName); } - public void updateMonitoringAt(Integer id, LocalDateTime monitoringAt) { - mapper.updateMonitoringAt(id, monitoringAt); + public void updatePackageOnMonitoringSuccess(Integer id, LocalDateTime monitoringAt) { + mapper.updatePackageOnMonitoringSuccess(id, monitoringAt); } public UserPackage findPackage(Integer id) { diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml index 05d875d..7abd858 100644 --- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml @@ -70,9 +70,9 @@ WHERE id = #{id} - + UPDATE signals_user_packages - SET monitoring_at = #{monitoringAt} + SET monitoring_at = #{monitoringAt}, status = 'ON_MONITORING' WHERE id = #{id}