treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/BKI-3246 Get rid of update duplicate

Browse source
This commit is contained in:
Mikhail Trofimov 2025-10-14 15:42:17 +03:00
parent ddc4418b1f
commit 60cb6e9e8c
6 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
View file

@ -242,8 +242,7 @@ public class SignalFacade {
if (signalRestService.setupMonitoring(packageId)) { if (signalRestService.setupMonitoring(packageId)) {
LocalDateTime monitoringAt = LocalDateTime.now(); LocalDateTime monitoringAt = LocalDateTime.now();
log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}, MonitoringAt: {}", packageId, packageName, monitoringAt); log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}, MonitoringAt: {}", packageId, packageName, monitoringAt);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING); signalService.updatePackageOnMonitoringSuccess(packageId, monitoringAt);
signalService.updatePackageMonitoringAt(packageId, monitoringAt);
monitoringErrorProcesingService.findErrors(packageId); monitoringErrorProcesingService.findErrors(packageId);
} else { } else {
log.info("Package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName); log.info("Package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName);

2
src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java
View file

@ -24,7 +24,7 @@ public interface UserPackageMapper {
void updatePackageLastDownloadedReport(@Param("id") Integer id, @Param("fileName") String fileName); 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); UserPackage findPackage(@Param("id") Integer id);

4
src/main/java/ru/nbch/credit_tracker/service/SignalService.java
View file

@ -201,8 +201,8 @@ public class SignalService {
userPackageService.updatePackageStatus(packageId, status); userPackageService.updatePackageStatus(packageId, status);
} }
public void updatePackageMonitoringAt(Integer packageId, LocalDateTime monitoringAt) { public void updatePackageOnMonitoringSuccess(Integer packageId, LocalDateTime monitoringAt) {
userPackageService.updateMonitoringAt(packageId, monitoringAt); userPackageService.updatePackageOnMonitoringSuccess(packageId, monitoringAt);
} }
/** /**

5
src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java
View file

@ -71,10 +71,7 @@ public class UpdatingFlagsService {
if (signalRestService.setupMonitoring(packageId)) { if (signalRestService.setupMonitoring(packageId)) {
LocalDateTime monitoringAt = userPackage.getMonitoringAt() != null ? userPackage.getMonitoringAt() : LocalDateTime.now(); 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); log.info("Flags were updated successfully. PackageId: {} PackageName: {} MonitoringAt: {}. Package status changed to ON_MONITORING", packageId, packageName, monitoringAt);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING); signalService.updatePackageOnMonitoringSuccess(packageId, monitoringAt);
if (userPackage.getMonitoringAt() == null) { // пакет еще не был поставлен на мониторинг в оф. сервис сигналов
signalService.updatePackageMonitoringAt(packageId, monitoringAt);
}
monitoringErrorProcesingService.findErrors(packageId); monitoringErrorProcesingService.findErrors(packageId);
} else { } else {
log.info("Updated package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName); log.info("Updated package registration was rejected by signal service. PackageId: {} PackageName: {}", packageId, packageName);

4
src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java
View file

@ -46,8 +46,8 @@ public class UserPackageService {
mapper.updatePackageLastDownloadedReport(id, fileName); mapper.updatePackageLastDownloadedReport(id, fileName);
} }
public void updateMonitoringAt(Integer id, LocalDateTime monitoringAt) { public void updatePackageOnMonitoringSuccess(Integer id, LocalDateTime monitoringAt) {
mapper.updateMonitoringAt(id, monitoringAt); mapper.updatePackageOnMonitoringSuccess(id, monitoringAt);
} }
public UserPackage findPackage(Integer id) { public UserPackage findPackage(Integer id) {

4
src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml
View file

@ -70,9 +70,9 @@
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="updateMonitoringAt"> <update id="updatePackageOnMonitoringSuccess">
UPDATE signals_user_packages UPDATE signals_user_packages
SET monitoring_at = #{monitoringAt} SET monitoring_at = #{monitoringAt}, status = 'ON_MONITORING'
WHERE id = #{id} WHERE id = #{id}
</update> </update>