http://jira.mfd.msk:8088/browse/BKI-3246 Get rid of update duplicate
This commit is contained in:
parent
ddc4418b1f
commit
60cb6e9e8c
6 changed files with 9 additions and 13 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -70,9 +70,9 @@
|
|||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
<update id="updateMonitoringAt">
|
||||
<update id="updatePackageOnMonitoringSuccess">
|
||||
UPDATE signals_user_packages
|
||||
SET monitoring_at = #{monitoringAt}
|
||||
SET monitoring_at = #{monitoringAt}, status = 'ON_MONITORING'
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue