From deac68b9aeec5cacec9b65ef3856eaaa9a54fa44 Mon Sep 17 00:00:00 2001
From: Mikhail Trofimov <mtrofimov@mfd.ru>
Date: Thu, 26 Jun 2025 09:25:07 +0300
Subject: [PATCH] Fix calculating flag 5000; Set package status to Error if
 some errors occures

---
 src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java   | 1 +
 .../java/ru/nbch/credit_tracker/service/indic/FlagsService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 73762e8..b7b96c6 100644
--- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
+++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
@@ -237,6 +237,7 @@ public class SignalFacade {
                     }
                 }
             } catch (Exception e) {
+                signalService.setPackageStatus(packageId, Status.ERROR);
                 log.error("Ошибка при поиске фидов или расчете флагов просрочек. Package_id {}", packageId, e);
             }
         });
diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java
index 1aab3de..6401f6f 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/indic/FlagsService.java
@@ -45,7 +45,7 @@ public class FlagsService {
                 .map(Optional::get)
                 .toList();
 
-        if (!dataList.isEmpty() && dataList.stream().anyMatch(item -> item != null && item.getAmountPastDue().compareTo(BigDecimal.valueOf(5000)) > 0)) {
+        if (!dataList.isEmpty() && dataList.stream().anyMatch(item -> item != null && item.getAmountPastDue() != null && item.getAmountPastDue().compareTo(BigDecimal.valueOf(5000)) > 0)) {
             return 1;
         } else {
             return 0;