diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env
index d684e15..e1e7f7e 100644
--- a/docker_compose/credit_tracker_config.env
+++ b/docker_compose/credit_tracker_config.env
@@ -1,5 +1,5 @@
#commons
-APP_VERSION=1.8
+APP_VERSION=1.9
REGISTRY_URL=rh8-vm3.nbki.msk:5000
JMX_PORT=
JMX_HOSTNAME=
diff --git a/pom.xml b/pom.xml
index 5d022df..57fbe20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
ru.nbch
credit-tracker
- 1.8
+ 1.9
credit_tracker
Credit Tracker Application
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 8e4c95a..df80c2b 100644
--- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
+++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
@@ -222,7 +222,7 @@ public class SignalFacade {
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
return;
}
- if (signalRestService.setupMonitoring(packageId, null)) {
+ if (signalRestService.setupMonitoring(packageId)) {
log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {
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 8efae3c..ebe29ec 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java
@@ -204,7 +204,7 @@ public class SignalService {
* Формирует файл запроса в официальный сервис сигналов, выгружая паспортные данные пачками и сразу записывая их в файл
* @return Путь к файлу запроса к официальному сервису сигналов на постановку на мониторинг
*/
- public String writeSignals(Integer packageId, Predicate filter) {
+ public String writeSignals(Integer packageId) {
String folderPath = config.getLoadDir() + File.separator + "tmp_folder" + File.separator + packageId + File.separator;
String filePath = folderPath + UUID.randomUUID() + "_output.xml";
@@ -216,7 +216,7 @@ public class SignalService {
signalsStaxXmlWriter.writeWithStax(filePath,
signals,
- writer -> buildPersons(packageId, filter, writer));
+ writer -> buildPersons(packageId, writer));
return filePath;
}
@@ -237,17 +237,12 @@ public class SignalService {
* Обрабатывает все PhoneFidMap по packageId, выгружая их пачками и фильтруя по переданному фильтру.
* writer записывает пачку сразу в файл
*/
- private void buildPersons(Integer packageId, Predicate filter, Consumer> writer) {
+ private void buildPersons(Integer packageId, Consumer> writer) {
int offset = 0;
List batch;
do {
batch = phoneFidMapService.findFullPhoneFidMap(packageId, offset, batchSize);
- List persons;
- if (filter != null) {
- persons = findPersons(batch.stream().filter(filter).toList());
- } else {
- persons = findPersons(batch);
- }
+ List persons = findPersons(batch);
if (!persons.isEmpty()) {
writer.accept(persons); // записывает пачку Persons в файл
}
diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java
index f649e18..9f4191c 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java
@@ -42,7 +42,7 @@ public class UpdateProcessingPackagesService {
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
return;
}
- if (signalRestService.setupMonitoring(packageId, null)) {
+ if (signalRestService.setupMonitoring(packageId)) {
log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {
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 b610771..954d7a0 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java
@@ -60,7 +60,7 @@ public class UpdatingFlagsService {
Predicate filter = subject -> subject.getCalculatedAt() != null && hasDaysPassed(subject.getCalculatedAt());
SignalService.UpdateResult updateResult = signalService.updateSubjects(packageId, filter);
if (updateResult.isUpdated()) {
- if (signalRestService.setupMonitoring(packageId, filter)) {
+ if (signalRestService.setupMonitoring(packageId)) {
log.info("Flags were updated successfully. PackageId: {} PackageName: {}. Package status changed to ON_MONITORING", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {
diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java
index 908c229..6c633b0 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java
@@ -11,7 +11,6 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
-import ru.nbch.credit_tracker.entities.dto.PhoneFidMap;
import ru.nbch.credit_tracker.entities.external_response.errors.SgnlReport;
import ru.nbch.credit_tracker.entities.external_response.online_report.SgnlOnlineReport;
import ru.nbch.credit_tracker.service.SignalService;
@@ -25,7 +24,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.util.Base64;
-import java.util.function.Predicate;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -63,8 +61,8 @@ public class SignalRestService {
* Ставит пакет на мониторинг в официальный сервис сигналов
* @return true - если пакет успешно поставился на мониторинг. false - в противном случае
*/
- public boolean setupMonitoring(Integer packageId, Predicate filter) throws Exception {
- String path = signalService.writeSignals(packageId, filter);
+ public boolean setupMonitoring(Integer packageId) throws Exception {
+ String path = signalService.writeSignals(packageId);
Resource request = compressFile(path);
MultiValueMap body = new LinkedMultiValueMap<>();