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

SDF01 обработка, логи

Browse source
This commit is contained in:
ialbert 2023-06-27 17:32:43 +03:00
parent 6219add3c9
commit 864f64bba3
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java
View file

@ -107,6 +107,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId(); Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId();
result.setGenerationId(generationIdForGroup); result.setGenerationId(generationIdForGroup);
boolean reviseFailed = false; boolean reviseFailed = false;
log.info("SDF01 execution: sdf01 number={}, groupId={}", sdf.size(), sdf.stream().findFirst().map(SDf01::getGenerationId).orElse(null));
for (SDf01 sdf01 : sdf) { for (SDf01 sdf01 : sdf) {
IValidator validator = sDf01Validator.apply(sdf01); IValidator validator = sDf01Validator.apply(sdf01);
Optional<EnumMessage> error = validator.tillFirstError(); Optional<EnumMessage> error = validator.tillFirstError();
@ -121,7 +122,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
log.warn("account {} for sdf01.id={} not found. Can not send request for creation, cause company not found too", sdf01.getAccount(), sdf01.getId()); log.warn("account {} for sdf01.id={} not found. Can not send request for creation, cause company not found too", sdf01.getAccount(), sdf01.getId());
} else { } else {
result.getAccountRequests().add(createAccountRequestPart(sdf01.getId(), sdf01.getAccount(), sdf01.getAcc_type(), company.getId())); result.getAccountRequests().add(createAccountRequestPart(sdf01.getId(), sdf01.getAccount(), sdf01.getAcc_type(), company.getId()));
log.info("account {} for sdf01.id={} not found - send request for creation", sdf01.getAccount(), sdf01.getId()); log.debug("account {} for sdf01.id={} not found - send request for creation", sdf01.getAccount(), sdf01.getId());
} }
continue; continue;
} else if (ClearingErrorInternal.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) { } else if (ClearingErrorInternal.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) {
@ -133,6 +134,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sdf02Imdg.insert(createErrorSdf02(sdf01, error.get(), generationIdForGroup)); sdf02Imdg.insert(createErrorSdf02(sdf01, error.get(), generationIdForGroup));
continue; continue;
} }
log.debug("sdf01.id={} validation passed", sdf01.getId());
Statement stmt = createSdf01Statement(sdf01, company, account); Statement stmt = createSdf01Statement(sdf01, company, account);
@ -140,11 +142,16 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sdf02Imdg.insert(sdf02New); sdf02Imdg.insert(sdf02New);
stmt.setOutSDfId(sdf02New.getId()); stmt.setOutSDfId(sdf02New.getId());
statementImdg.insert(stmt); statementImdg.insert(stmt);
log.debug("sdf01.id={} sdf02 created id {}, statement created id {}", sdf01.getId(), sdf02New.getId(), stmt.getId());
Optional<EnumMessage> err = validateActiveness(company, account); Optional<EnumMessage> err = validateActiveness(company, account);
if (err.isEmpty()) { if (err.isEmpty()) {
Optional<Registry> reg = findReg(stmt); Optional<Registry> reg = findReg(stmt);
Registry rgs; Registry rgs;
log.debug("sdf01.id={}, stmt.id={}: registry {}",
sdf01.getId(),
stmt.getId(),
reg.map(r -> "found id=" + r.getId()).orElse("not found"));
if (reg.isPresent()) { if (reg.isPresent()) {
rgs = reg.get(); rgs = reg.get();
updateReg(stmt, rgs); updateReg(stmt, rgs);
@ -153,14 +160,19 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
rgs = createRegistryByStatement(stmt, company, account); rgs = createRegistryByStatement(stmt, company, account);
registryImdg.insert(rgs); registryImdg.insert(rgs);
} }
//todo
if (!BigDecimal.ZERO.equals(rgs.getDiffBalance())) { if (!BigDecimal.ZERO.equals(rgs.getDiffBalance())) {
log.info("sdf01.id={}, stmt.id={}, registry.id={} diffBalance is not zero: {}",
sdf01.getId(),
stmt.getId(),
rgs.getId(),
rgs.getDiffBalance());
reviseFailed = true; reviseFailed = true;
} }
//2. отправить notification на backend //2. отправить notification на backend
stmt.setOperationStatus(OperationStatus.Executed.getKey()); stmt.setOperationStatus(OperationStatus.Executed.getKey());
statementImdg.update(stmt); statementImdg.update(stmt);
} else { } else {
log.debug("sdf01.id={} activeness checks failed {}", sdf01.getId(), messageResolver.resolve(err.get()));
stmt.setErrorCodeId(err.get().getSubject().getId()); // fixme ErrorText insert stmt.setErrorCodeId(err.get().getSubject().getId()); // fixme ErrorText insert
stmt.setOperationStatus(OperationStatus.Rejected.getKey()); stmt.setOperationStatus(OperationStatus.Rejected.getKey());
statementImdg.update(stmt); statementImdg.update(stmt);
@ -171,6 +183,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
reviseNotification.setComment(reviseFailed ? reviseFailedMessage : reviseSuccessMessage); reviseNotification.setComment(reviseFailed ? reviseFailedMessage : reviseSuccessMessage);
reviseNotification.setPriority(Priority.HIGH.getKey()); reviseNotification.setPriority(Priority.HIGH.getKey());
kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, reviseNotification); kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, reviseNotification);
log.info("revise notification sent (revise {})", reviseFailed ? "error" : "success");
return result; return result;
} }