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

http://jira.mfd.msk:8088/browse/BKI-3241 [NO_FID status]

Browse source
This commit is contained in:
etreschenkov 2026-01-21 10:44:37 +03:00
parent ff5e15418e
commit 5b5f96309e
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/component/comparator/DeletePackageStatusComparator.java
View file

@ -15,7 +15,7 @@ public class DeletePackageStatusComparator {
try { try {
Status status = Status.valueOf(str); Status status = Status.valueOf(str);
return switch (status) { return switch (status) {
case ON_MONITORING, PROCESSING_REPEATED -> 1; case ON_MONITORING, PROCESSING_REPEATED, NO_FID -> 1;
case DELETED -> 0; case DELETED -> 0;
default -> -1; default -> -1;
}; };

1
src/main/java/ru/nbch/credit_tracker/enums/Status.java
View file

@ -2,6 +2,7 @@ package ru.nbch.credit_tracker.enums;
public enum Status { public enum Status {
ON_MONITORING, // пакет стоит на мониторинге в оф. сервисе ON_MONITORING, // пакет стоит на мониторинге в оф. сервисе
NO_FID,
REJECTED, // отклонен на стороне НБКИ REJECTED, // отклонен на стороне НБКИ
PROCESSING, // идет поиск телефона и расчет флагов по пакету PROCESSING, // идет поиск телефона и расчет флагов по пакету
PROCESSING_REPEATED, PROCESSING_REPEATED,

12
src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java
View file

@ -215,10 +215,12 @@ public class SignalFacadeV3 {
PackageAll pack = new PackageAll(); PackageAll pack = new PackageAll();
pack.setPackageName(data.getPackageName()); pack.setPackageName(data.getPackageName());
pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null); pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null);
String statusForClient = data.getStatus().equals(Status.ACCEPTED.name()) ? Status.PROCESSING.name() : Status packageStatus = EnumUtil.getEnum(Status.class, data.getStatus());
data.getStatus().equals(Status.PROCESSING_REPEATED.name()) ? Status.ON_MONITORING.name() : data.getStatus(); Status statusForClient = packageStatus == Status.ACCEPTED ? Status.PROCESSING :
pack.setStatus(statusForClient); Arrays.asList(Status.PROCESSING_REPEATED, Status.NO_FID).contains(packageStatus) ? Status.ON_MONITORING : packageStatus;
if (data.getStatus().equals(Status.DELETED.name())) { assert statusForClient != null;
pack.setStatus(statusForClient.name());
if (packageStatus == Status.DELETED) {
pack.setDeactivatedAt(data.getDeactivatedAt() != null ? data.getDeactivatedAt().toString() : null); pack.setDeactivatedAt(data.getDeactivatedAt() != null ? data.getDeactivatedAt().toString() : null);
} }
packages.getPackages().add(pack); packages.getPackages().add(pack);
@ -235,7 +237,7 @@ public class SignalFacadeV3 {
-> clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringPackageDeleteError, packageName)); -> clientExcp(SignalError.ERROR_016, XmlErrorFormat.MonitoringPackageDeleteError, packageName));
Status status = EnumUtil.getEnum(Status.class, packageToDelete.getStatus()); Status status = EnumUtil.getEnum(Status.class, packageToDelete.getStatus());
if (!Status.ON_MONITORING.equals(status)) { if (!Arrays.asList(Status.ON_MONITORING, Status.NO_FID).contains(status)) {
throw clientExcp(deleteStatusError(status), XmlErrorFormat.MonitoringPackageDeleteError, packageName); throw clientExcp(deleteStatusError(status), XmlErrorFormat.MonitoringPackageDeleteError, packageName);
} }

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

@ -56,7 +56,7 @@ public class UserPackageService {
} }
public List<UserPackage> findActivePackages(String userId) { public List<UserPackage> findActivePackages(String userId) {
return userPackageMapper.findUserPackages(userId, Arrays.asList(Status.ON_MONITORING.name())); return userPackageMapper.findUserPackages(userId.substring(0, 6), Arrays.asList(Status.ON_MONITORING.name(), Status.NO_FID.name()));
} }
public void setFidChanged(List<Long> id) { public void setFidChanged(List<Long> id) {

3
src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageOrchestrator.java
View file

@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
import ru.nbch.credit_tracker.enums.RejectedStatus; import ru.nbch.credit_tracker.enums.RejectedStatus;
import ru.nbch.credit_tracker.enums.Status;
import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper;
import ru.nbch.credit_tracker.model.impl.PackageVariable; import ru.nbch.credit_tracker.model.impl.PackageVariable;
import ru.nbch.credit_tracker.model.impl.SignalXmlFilePayload; import ru.nbch.credit_tracker.model.impl.SignalXmlFilePayload;
@ -118,7 +119,7 @@ public class PipelinePackageOrchestrator {
} }
if (res.signalXmlFilePath() == null) { if (res.signalXmlFilePath() == null) {
log.info("No one fid was found by packageId : {}; xml file won't be sent", packageId); log.info("No one fid was found by packageId : {}; xml file won't be sent", packageId);
userPackageMapper.updatePackageOnMonitoringSuccess(packageId, LocalDateTime.now()); userPackageMapper.updatePackageStatus(packageId, Status.NO_FID.name());
return; return;
} }