platform-messaging http://jira.mfd.msk:8088/browse/CLS-280 переделки, временно отключил проверку на дубликаты, т.к. надо добавить новое поле.

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java

@@ -23,6 +23,7 @@ import ru.spcex.platform.enumeration.RegistryStatus;
 import ru.spcex.platform.enumeration.RegistryUnit;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.api.predicate.specific.SecuritySelector;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidator;
 
@@ -42,7 +43,7 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements
     private final Imdg<AdmittedLiabilitiesRegister> admittedLiabilitiesRegisterMap;
     private final Imdg<Registry> registryMap;
     private final Imdg<Company> companyMap;
-    private final Imdg<Security> securityMap;
+    private final SecuritySelector<Security> securitySelector;
     private final Function<Map<String, ?>, IValidator> fieldValuesValidator;
 
     @Autowired
@@ -54,7 +55,7 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements
         this.admittedLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, AdmittedLiabilitiesRegister.class);
         this.registryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
-        this.securityMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Security, Security.class);
+        this.securitySelector = new SecuritySelector<>(imdgProvider, Security.class);
         this.fieldValuesValidator = fieldValuesValidator;
     }
 
@@ -90,13 +91,12 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements
         log.trace("Started generating AdmittedLiabilitiesRegister entity...");
         AdmittedLiabilitiesRegister admittedLiabilitiesRegister = new AdmittedLiabilitiesRegister();
         Company company = companyMap.getFirstObjectByFieldValues(Map.of("id", 1L));
-        Security security = securityMap.getFirstObjectByFieldValues(Map.of("id", registry.getSecurityId()));
+        Security security = securitySelector.selectSecurityById(registry.getSecurityId());
-        String securitySymbol = security != null ? security.getSecuritySymbol() : null;
+        String securityFullName = security != null ? security.getFullName() : null;
-        String securityFullName = security != null ? security.getShortName() : null;
+        String companyFullName = company != null ? company.getFullName() : null;
-        String companyFullName = security != null ? company.getFullName() : null;
         admittedLiabilitiesRegister.setCompanyFullName(companyFullName);
         admittedLiabilitiesRegister.setSessionId(registry.getSessionId());
-        admittedLiabilitiesRegister.setSecuritySymbol(securitySymbol);
+        admittedLiabilitiesRegister.setSecuritySymbol(registry.getSecuritySymbol());
         admittedLiabilitiesRegister.setSecurityFullName(securityFullName);
         admittedLiabilitiesRegister.setCompanyId(registry.getCompanyId());
         admittedLiabilitiesRegister.setClearingCode(registry.getClearingCode());
@@ -113,7 +113,7 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements
         return String.format("registryDesignation = '%s' and " +
                         "registryInstrumentType  in ('%s','%s') and " +
                         "registryUnit = '%s' and " +
-                        "registryStatus in ('%s','%s','%s','%s','%s')"
+                        "registryStatus in ('%s','%s','%s','%s','%s', '%s')"
                 ,
                 RegistryDesignation.O.getKey(),
                 RegistryInstrumentType.S.getKey(),
@@ -123,19 +123,27 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements
                 RegistryStatus.NACK.getKey(),
                 RegistryStatus.UNCV.getKey(),
                 RegistryStatus.NACC.getKey(),
-                RegistryStatus.FAIL.getKey()
+                RegistryStatus.FAIL.getKey(),
+                RegistryStatus.CLRD.getKey()
         );
     }
 
     @Override
     public Optional<AdmittedLiabilitiesRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of(
-        if (message.isPresent()) {
+//                "companyId", entity.getRegistryCode(),
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//                "sessionId", entity.getSessionId(),
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//                "securitySymbol", entity.getSecuritySymbol(),
-        }
+//                "clearingDate", entity.getClearingDate(),
-        return Optional.ofNullable(admittedLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//                "account", entity.getAccount()
+//        );
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        if (message.isPresent()) {
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//        }
+//        return Optional.ofNullable(admittedLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
 
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java

@@ -23,6 +23,7 @@ import ru.spcex.platform.enumeration.RegistryStatus;
 import ru.spcex.platform.enumeration.RegistryUnit;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.api.predicate.specific.SecuritySelector;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidator;
 
@@ -42,7 +43,7 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements
     private final Imdg<CoveredLiabilitiesRegister> coveredLiabilitiesRegisterMap;
     private final Imdg<Registry> registryMap;
     private final Imdg<Company> companyMap;
-    private final Imdg<Security> securityMap;
+    private final SecuritySelector<Security> securitySelector;
     private final Function<Map<String, ?>, IValidator> fieldValuesValidator;
 
     @Autowired
@@ -54,7 +55,7 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements
         this.coveredLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, CoveredLiabilitiesRegister.class);
         this.registryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
-        this.securityMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Security, Security.class);
+        this.securitySelector = new SecuritySelector<>(imdgProvider, Security.class);
         this.fieldValuesValidator = fieldValuesValidator;
     }
 
@@ -91,13 +92,12 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements
         log.trace("insert CoveredLiabilitiesRegister in map...");
         CoveredLiabilitiesRegister coveredLiabilitiesRegister = new CoveredLiabilitiesRegister();
         Company company = companyMap.getFirstObjectByFieldValues(Map.of("id", 1L));
-        Security security = securityMap.getFirstObjectByFieldValues(Map.of("id", registry.getSecurityId()));
+        Security security = securitySelector.selectSecurityById(registry.getSecurityId());
-        String securitySymbol = security != null ? security.getSecuritySymbol() : null;
+        String securityFullName = security != null ? security.getFullName() : null;
-        String securityFullName = security != null ? security.getShortName() : null;
+        String companyFullName = company != null ? company.getFullName() : null;
-        String companyFullName = security != null ? company.getFullName() : null;
         coveredLiabilitiesRegister.setCompanyFullName(companyFullName);
         coveredLiabilitiesRegister.setSessionId(registry.getSessionId());
-        coveredLiabilitiesRegister.setSecuritySymbol(securitySymbol);
+        coveredLiabilitiesRegister.setSecuritySymbol(registry.getSecuritySymbol());
         coveredLiabilitiesRegister.setSecurityFullName(securityFullName);
         coveredLiabilitiesRegister.setCompanyId(registry.getCompanyId());
         coveredLiabilitiesRegister.setClearingCode(registry.getClearingCode());
@@ -114,22 +114,25 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements
         return String.format("registryDesignation = '%s' and " +
                         "registryInstrumentType  in ('%s','%s') and " +
                         "registryUnit = '%s' and " +
-                        "registryStatus = '%s'",
+                        "registryStatus in ('%s', '%s')",
                 RegistryDesignation.O.getKey(),
                 RegistryInstrumentType.S.getKey(),
                 RegistryInstrumentType.M.getKey(),
                 RegistryUnit.T.getKey(),
-                RegistryStatus.OK.getKey());
+                RegistryStatus.OK.getKey(),
+                RegistryStatus.CLRD.getKey()
+                );
     }
 
     @Override
     public Optional<CoveredLiabilitiesRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(coveredLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//        }
+//        return Optional.ofNullable(coveredLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java

@@ -60,10 +60,6 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
 
     public void depoBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
         log.debug("LauncherCommandRequest received from {}", createRegistry_GRRT.topic());
-        if (userRequest.getRequestPayload().getCompanyId() == null) {
-            log.debug("No companyId in LauncherCommandRequest.id={}", userRequest.getId());
-            return;
-        }
         ImdgPredicate prdctForRegistries = getPredicateForRegistries(userRequest.getRequestPayload().getCompanyId());
         Collection<Registry> registries = registryMap.getCollectionObjectsByPredicate(prdctForRegistries);
         log.trace("Started searching depoBalanceRegister in register by '{}'", prdctForRegistries);
@@ -84,14 +80,12 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
         log.trace("Started generating DepoBalanceRegister entity...");
         DepoBalanceRegister depoBalanceRegister = new DepoBalanceRegister();
         depoBalanceRegister.setUpdated(Instant.now());
-        depoBalanceRegister.setCreated(Instant.now());
+        depoBalanceRegister.setCreated(depoBalanceRegister.getUpdated());
         depoBalanceRegister.setCompanyId(registry.getCompanyId());
         depoBalanceRegister.setSessionId(registry.getSessionId());
         depoBalanceRegister.setDepoCode(registry.getAccountType());
         depoBalanceRegister.setQuantity(registry.getCloseBalance());
         depoBalanceRegister.setSecuritySymbol(registry.getSecuritySymbol());
-        depoBalanceRegister.setCreated(Instant.now());
-        depoBalanceRegister.setUpdated(Instant.now());
         depoBalanceRegisterMap.insert(depoBalanceRegister);
         log.debug("inserted successfully DepoBalanceRegister entity with id: {}", depoBalanceRegister.getId());
     }
@@ -99,6 +93,9 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
     private ImdgPredicate getPredicateForRegistries(Long companyId) {
         ImdgPredicateBuilder pb = registryMap.predicateBuilder();
         RegistryCodeSqlBuilder codeSql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T);
+        if (companyId == null) // default use case
+            return pb.sql(codeSql.build());
+        else
             return pb.and(
                     pb.equals("companyId", companyId),
                     pb.sql(codeSql.build())
@@ -107,12 +104,13 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial
 
     @Override
     public Optional<DepoBalanceRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(depoBalanceRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//        }
+//        return Optional.ofNullable(depoBalanceRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java

@@ -89,34 +89,38 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme
     private void insertDepoPaymentInstructionRegister(PaymentInstruction paymentInstruction) {
         log.trace("Started generating DepoPaymentInstructionRegister entity...");
         DepoPaymentInstructionRegister depoPaymentInstructionRegister = new DepoPaymentInstructionRegister();
-        TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryMap.getFirstObjectByFieldValues(Map.of("depoAccountId", paymentInstruction.getCreditLeg_accountId()));
+        TradingClearingRegistry tradingClearingRegistry = paymentInstruction.getSenderId() == null ? null : tradingClearingRegistryMap.getFirstObjectByFieldValues(Map.of("companyId", paymentInstruction.getSenderId()));
         InOutDirectionDictionary inOutDirectionDictionary = InOutDirectionDictionaryMap.getFirstObjectByFieldValues(Map.of("code", paymentInstruction.getCreditLeg_direction()));
         depoPaymentInstructionRegister.setCreated(Instant.now());
         depoPaymentInstructionRegister.setUpdated(Instant.now());
         depoPaymentInstructionRegister.setCompanyId(paymentInstruction.getSenderId());
+        if (tradingClearingRegistry == null) {
+            log.warn("For paymentInstruction[{}].CreditLeg_accountId={} can not find TradingClearingRegistry.",
+                    paymentInstruction.getId(), paymentInstruction.getCreditLeg_accountId());
+        } else {
             depoPaymentInstructionRegister.setTradingClearingRegistryType(tradingClearingRegistry.getTradingClearingRegistryType());
             depoPaymentInstructionRegister.setTradingClearingRegistry(tradingClearingRegistry.getCode());
+        }
         depoPaymentInstructionRegister.setCbCode("RNCB-BE-01");
         depoPaymentInstructionRegister.setQuantity(paymentInstruction.getCreditLeg_amount());
         depoPaymentInstructionRegister.setDirection(inOutDirectionDictionary.getId());
         depoPaymentInstructionRegister.setSessionId(paymentInstruction.getSessionId());
-        depoPaymentInstructionRegister.setCreated(Instant.now());
-        depoPaymentInstructionRegister.setUpdated(Instant.now());
         depoPaymentInstructionRegisterMap.insert(depoPaymentInstructionRegister);
         log.debug("inserted successfully DepoBalanceRegister entity with id: {}", depoPaymentInstructionRegister.getId());
     }
 
     @Override
     public Optional<DepoPaymentInstructionRegister> isDuplicateInMap(PaymentInstruction entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of(
+        return Optional.empty();
-                "companyId", entity.getSenderId(),
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of(
-                "sessionId", entity.getSessionId()
+//                "companyId", entity.getSenderId(),
-        );
+//                "sessionId", entity.getSessionId()
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        );
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(depoPaymentInstructionRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//        }
+//        return Optional.ofNullable(depoPaymentInstructionRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java

@@ -7,10 +7,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
 import ru.clearing.classes.statics.data.misc.Session;
 import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
+import ru.clearing.classes.statics.data.security.Security;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -20,6 +22,7 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.api.predicate.specific.SecuritySelector;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.time.TimeUtil;
 import ru.spcex.platform.utils.validation.IValidator;
@@ -42,7 +45,7 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements
     private final Imdg<Registry> registryMap;
     private final Imdg<Session> sessionMap;
     private final Imdg<ru.clearing.classes.statics.data.company.CompanySymbols> companySymbolMap;
-    private final Imdg<MoneyMarketSecurity> moneyMarketSecurityMap;
+    private final SecuritySelector<Security> securitySelector;
     private final Function<Map<String, ?>, IValidator> fieldValuesValidator;
 
     @Autowired
@@ -55,7 +58,7 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements
         this.registryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         this.sessionMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Session, Session.class);
         this.companySymbolMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, ru.clearing.classes.statics.data.company.CompanySymbols.class);
-        this.moneyMarketSecurityMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class);
+        this.securitySelector = new SecuritySelector<>(imdgProvider, Security.class);
         this.fieldValuesValidator = fieldValuesValidator;
     }
 
@@ -97,17 +100,30 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements
         Map<String, ? extends Comparable<?>> innPredicates = Map.of("companySymbol", CompanySymbol.INN.getKey(),
                 "companyId", registry.getCompanyId());
         ru.clearing.classes.statics.data.company.CompanySymbols companySymbol = companySymbolMap.getFirstObjectByFieldValues(innPredicates);
-        MoneyMarketSecurity moneyMarketSecurity = moneyMarketSecurityMap.getFirstObjectByFieldValues(Map.of("securityId", registry.getSecurityId()));
+        Security security = securitySelector.selectSecurityById(registry.getSecurityId());
 
         excludeLiabilitiesRegister.setSessionId(registry.getSessionId());
         excludeLiabilitiesRegister.setValidFromDate(sessionBySessionId.getClearingDate());
         excludeLiabilitiesRegister.setValidToDate(validToDate);
         excludeLiabilitiesRegister.setCompanyId(registry.getCompanyId());
+        excludeLiabilitiesRegister.setCompanyFullName(registry.getFullName());
         excludeLiabilitiesRegister.setInn(companySymbol.getCompanySymbolValue());
         excludeLiabilitiesRegister.setRegistryCode(registry.getRegistryCode());
         excludeLiabilitiesRegister.setAccount(registry.getAccount());
         excludeLiabilitiesRegister.setRegistryStatus(registry.getRegistryStatus());
-        excludeLiabilitiesRegister.setCurrency(moneyMarketSecurity.getNominalCurrency());
+        if (security == null) {
+            log.warn("Security id={} not found for registry id={}", registry.getSecurityId(), registry.getId());
+        } else {
+            if (InstrumentType.RATE.equalsByKey(security.getInstrumentType())) {
+                excludeLiabilitiesRegister.setCurrency(((MoneyMarketSecurity) security).getNominalCurrency());
+            } else if (InstrumentType.BOND.equalsByKey(security.getInstrumentType())) {
+                excludeLiabilitiesRegister.setCurrency(((FixedIncomeSecurity) security).getNominalCurrency());
+            } else if (InstrumentType.EQTY.equalsByKey(security.getInstrumentType())) {
+                // не заполняется Currency
+            } else { // never
+                log.warn("Unexpected security[{}] type {}", security.getId(), security.getInstrumentType());
+            }
+        }
         excludeLiabilitiesRegister.setSumLiabilities(registry.getBalance());
         excludeLiabilitiesRegister.setSettlementDate(registry.getSettlementDate());
         excludeLiabilitiesRegister.setCreated(Instant.now());
@@ -120,22 +136,25 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements
         return String.format("registryDesignation = '%s' and " +
                         "registryInstrumentType  in ('%s','%s') and " +
                         "registryUnit = '%s' and " +
-                        "registryStatus = '%s'",
+                        "registryStatus in ('%s', '%s')",
                 RegistryDesignation.O.getKey(),
                 RegistryInstrumentType.S.getKey(),
                 RegistryInstrumentType.M.getKey(),
                 RegistryUnit.T.getKey(),
-                RegistryStatus.FAIL.getKey());
+                RegistryStatus.FAIL.getKey(),
+                RegistryStatus.UNCV.getKey()
+        );
     }
 
     @Override
     public Optional<ExcludeLiabilitiesRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(excludeLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//        }
+//        return Optional.ofNullable(excludeLiabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java

@@ -283,14 +283,15 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ
 
     @Override
     public Optional<ExecutionRegister> isDuplicateInMap(ExecutionCommon entity) {
-        Map<String, ? extends Comparable<?>> map = Map.of("exchangeExecutionId", entity.getExchangeExecutionId(),
+        return Optional.empty();
-                "tradingDate", LocalDate.now()); //clarify timezone
+//        Map<String, ? extends Comparable<?>> map = Map.of("exchangeExecutionId", entity.getExchangeExecutionId(),
-        Optional<EnumMessage> message = fieldValuesValidator.apply(map).tillFirstError();
+//                "tradingDate", LocalDate.now()); //clarify timezone
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(map).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(executionRegisterMap.getSingleObjectByFieldValues(map));
+//        }
+//        return Optional.ofNullable(executionRegisterMap.getSingleObjectByFieldValues(map));
     }
 
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java

@@ -150,12 +150,13 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial
 
     @Override
     public Optional<LiabilitiesRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValues = Map.of("companyId", entity.getCompanyId(), "sessionId", entity.getSessionId());
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(liabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
+//        }
+//        return Optional.ofNullable(liabilitiesRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java

@@ -28,6 +28,7 @@ import ru.spcex.platform.utils.validation.IValidator;
 import java.text.MessageFormat;
 import java.time.Instant;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
@@ -69,10 +70,6 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
 
     public void moneyBalanceRegisterNew(BaseRequest<LauncherCommandRequest> userRequest) {
         log.debug("LauncherCommandRequest received from {}", createRegistry_GBRR.topic());
-        if (userRequest.getRequestPayload().getCompanyId() == null) {
-            log.warn("LauncherCommandRequest.id={} without companyId", userRequest.getId());
-            return;
-        }
         ImdgPredicate sqlConditionForRegistry = getSqlForRegistries(userRequest.getRequestPayload().getCompanyId());
         Collection<Registry> registries = registryMap.getCollectionObjectsByPredicate(sqlConditionForRegistry);
         if (registries == null) {
@@ -128,10 +125,15 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
 
     private ImdgPredicate getSqlForRegistries(Long companyId) {
         ImdgPredicateBuilder pb = registryMap.predicateBuilder();
-        ImdgPredicate prdct = pb.and(
+        ImdgPredicate prdct;
+        if (companyId == null) {
+            prdct = pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AM__).build());
+        } else {
+            prdct = pb.and(
                     pb.equals("companyId", companyId),
                     pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AM__).build())
             );
+        }
         log.trace("sql predicate for registries {}", prdct);
         return prdct;
     }
@@ -171,17 +173,15 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
 
     @Override
     public Optional<MoneyBalanceRegister> isDuplicateInMap(Registry entity) {
-        Map<String, ? extends Comparable<?>> fieldValues = Map.of(
+        return Optional.empty();
-                "companyId",
+//        Map<String, Long> fieldValues = new HashMap<>();
-                entity.getCompanyId(),
+//        fieldValues.put("companyId", entity.getCompanyId());
-                "sessionId",
+//        fieldValues.put("sessionId", entity.getSessionId());
-                entity.getSessionId()
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
-        );
+//        if (message.isPresent()) {
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValues).tillFirstError();
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        if (message.isPresent()) {
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        }
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//        return Optional.ofNullable(moneyBalanceRegisterMap.getFirstObjectByFieldValues(fieldValues));
-        }
-        return Optional.ofNullable(moneyBalanceRegisterMap.getFirstObjectByFieldValues(fieldValues));
     }
 }

clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java

@@ -92,12 +92,13 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem
 
     @Override
     public Optional<MoneyPaymentInstructionRegister> isDuplicateInMap(PaymentInstruction entity) {
-        Map<String, ? extends Comparable<?>> fieldValuesCompanyIdSessionId = Map.of("senderId", entity.getSenderId(), "date", entity.getClearingDate());
+        return Optional.empty();
-        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValuesCompanyIdSessionId).tillFirstError();
+//        Map<String, ? extends Comparable<?>> fieldValuesCompanyIdSessionId = Map.of("senderId", entity.getSenderId(), "date", entity.getClearingDate());
-        if (message.isPresent()) {
+//        Optional<EnumMessage> message = fieldValuesValidator.apply(fieldValuesCompanyIdSessionId).tillFirstError();
-            log.warn("Illegal value in map for request to imdg: {}", message.get());
+//        if (message.isPresent()) {
-            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
+//            log.warn("Illegal value in map for request to imdg: {}", message.get());
-        }
+//            throw new IllegalArgumentException(MessageFormat.format("Illegal value in request to imdg: {0}", message.get()));
-        return Optional.ofNullable(moneyPaymentInstructionRegisterMap.getFirstObjectByFieldValues(fieldValuesCompanyIdSessionId));
+//        }
+//        return Optional.ofNullable(moneyPaymentInstructionRegisterMap.getFirstObjectByFieldValues(fieldValuesCompanyIdSessionId));
     }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java

@@ -1,215 +0,0 @@
-package ru.spcex.clearing.platform.messaging.domain.cud.registry;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer;
-import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
-import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer;
-import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
-
-import java.time.Instant;
-import java.time.LocalDate;
-
-@Deprecated // Не используется. Возможно артефакт мёржа.
-public class ContractRegisterNewRequest {
-
-    @JsonProperty
-    private String name;
-
-    @JsonProperty
-    private String number;
-
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonProperty
-    private LocalDate issueDate;
-
-    @JsonProperty
-    private String companyFullName;
-
-    @JsonProperty
-    private Long companyId;
-
-    @JsonProperty
-    private String documentType;
-
-    @JsonProperty
-    private String issuePlace;
-
-    @JsonProperty
-    private String issuer;
-
-    @JsonProperty
-    private String issuerCode;
-
-    @JsonProperty
-    private String place;
-
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonProperty
-    private LocalDate validFromDate;
-
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonProperty
-    private LocalDate validToDate;
-
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    @JsonProperty
-    private LocalDate closeDate;
-
-    @JsonProperty
-    private String comment;
-
-    @JsonProperty
-    private Long id;
-
-    @JsonSerialize(using = InstantDateTimeSerializer.class)
-    @JsonDeserialize(using = InstantDateTimeDeserializer.class)
-    @JsonProperty
-    private Instant createdAt;
-
-    @JsonSerialize(using = InstantDateTimeSerializer.class)
-    @JsonDeserialize(using = InstantDateTimeDeserializer.class)
-    @JsonProperty
-    private Instant updatedAt;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public LocalDate getCloseDate() {
-        return closeDate;
-    }
-
-    public void setCloseDate(LocalDate closeDate) {
-        this.closeDate = closeDate;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Instant getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public LocalDate getIssueDate() {
-        return issueDate;
-    }
-
-    public void setIssueDate(LocalDate issueDate) {
-        this.issueDate = issueDate;
-    }
-
-    public String getCompanyFullName() {
-        return companyFullName;
-    }
-
-    public void setCompanyFullName(String companyFullName) {
-        this.companyFullName = companyFullName;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getDocumentType() {
-        return documentType;
-    }
-
-    public void setDocumentType(String documentType) {
-        this.documentType = documentType;
-    }
-
-    public String getIssuePlace() {
-        return issuePlace;
-    }
-
-    public void setIssuePlace(String issuePlace) {
-        this.issuePlace = issuePlace;
-    }
-
-    public String getIssuer() {
-        return issuer;
-    }
-
-    public void setIssuer(String issuer) {
-        this.issuer = issuer;
-    }
-
-    public String getIssuerCode() {
-        return issuerCode;
-    }
-
-    public void setIssuerCode(String issuerCode) {
-        this.issuerCode = issuerCode;
-    }
-
-    public String getPlace() {
-        return place;
-    }
-
-    public void setPlace(String place) {
-        this.place = place;
-    }
-
-    public LocalDate getValidFromDate() {
-        return validFromDate;
-    }
-
-    public void setValidFromDate(LocalDate validFromDate) {
-        this.validFromDate = validFromDate;
-    }
-
-    public LocalDate getValidToDate() {
-        return validToDate;
-    }
-
-    public void setValidToDate(LocalDate validToDate) {
-        this.validToDate = validToDate;
-    }
-}