imdg http://git.mfd.msk/mfd/clearing/-/issues/24 Убрал использование мапы Map_Security. Требует перетестирования многого, мёрж отложен до написания тестов

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountSymbolsValidationConfig.java

@@ -1,101 +0,0 @@
-package ru.spcex.clearing.account.config.validation;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.account.AccountSymbols;
-import ru.spcex.clearing.account.errors.AccountError;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountSymbolsNewRequest;
-import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
-import ru.spcex.clearing.validation.common.rules.IdPresentRule;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.imdg.validation.ImdgValidationContext;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.validation.IValidationRule;
-import ru.spcex.platform.utils.validation.IValidator;
-import ru.spcex.platform.utils.validation.ValidatorImpl;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-@Configuration
-public class AccountSymbolsValidationConfig {
-
-    @Bean("accountSymbolsDepoNewRequest")
-    public Function<AccountSymbolsNewRequest, IValidator> accountSymbolsDepoNewRequestValidator(
-            Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation
-    ) {
-        return accountSymbolsNewRequest -> {
-            ImdgValidationContext<AccountSymbolsNewRequest> context = new ImdgValidationContext<>();
-            context.setValidatedObject(accountSymbolsNewRequest);
-            Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
-            addImdg.accept(IMDGDistributedNames.Map_Account);
-            addImdg.accept(IMDGDistributedNames.Map_AccountSymbols);
-            return new ValidatorImpl<>(context,
-                    IdPresentRule.instance("accountId",
-                            AccountSymbolsNewRequest::getAccountId,
-                            IMDGDistributedNames.Map_Account,
-                            Account.class,
-                            AccountError.RequiredFieldEmpty,
-                            AccountError.AccountNotFound,
-                            true,
-                            (Account account) -> {
-                                if (AccountType.Depo.equalsByKey(account.getAccountType())) {
-                                    return null;
-                                } else {
-                                    return AccountError.AccountDepoTypeRequired;
-                                }
-                            }
-                    ),
-                    FieldNotBlankRequiredRule.instance("accountSymbolValue",
-                            AccountSymbolsNewRequest::getAccountSymbolValue,
-                            AccountError.RequiredFieldEmpty, true),
-                    new DuplicateAccountSymbolsRule()
-            );
-        };
-    }
-
-    static class DuplicateAccountSymbolsRule implements IValidationRule<ImdgValidationContext<AccountSymbolsNewRequest>> {
-        @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<AccountSymbolsNewRequest> context) {
-            AccountSymbolsNewRequest validatedObject = context.getValidatedObject();
-            Imdg<AccountSymbols> accountSymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class);
-
-            ImdgPredicateBuilder pb = accountSymbolsImdg.predicateBuilder();
-            ImdgPredicate query = pb.or(
-                    pb.equals("accountId", validatedObject.getAccountId()),
-                    pb.equals("accountSymbolValue", validatedObject.getAccountSymbolValue())
-            );
-            Collection<AccountSymbols> existAccSymbols = accountSymbolsImdg.getCollectionObjectsByPredicate(query);
-
-            if (existAccSymbols.isEmpty()) {
-                return empty();
-            } else {
-                AccountSymbols existAS = existAccSymbols.iterator().next();
-                String duplicateMsg = "";
-                if (validatedObject.getAccountId() != null && validatedObject.getAccountId().equals(existAS.getAccountId())) {
-                    Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
-                    Account linkedAccount = accountImdg.getSingleObjectByID(existAS.getAccountId());
-                    if (linkedAccount != null) {
-                        duplicateMsg = linkedAccount.getAccount();
-                    } else {
-                        duplicateMsg = "" + existAS.getAccountId();
-                    }
-                }
-                if (validatedObject.getAccountSymbolValue() != null &&
-                        validatedObject.getAccountSymbolValue().equals(existAS.getAccountSymbolValue())) {
-                    if (!duplicateMsg.isEmpty())
-                        duplicateMsg += ", ";
-                    duplicateMsg += existAS.getAccountSymbolValue();
-                }
-                return of(AccountError.AccountAlreadyExist, duplicateMsg);
-            }
-        }
-    }
-}

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/AccountValidationConfig.java

@@ -18,12 +18,12 @@ import ru.spcex.clearing.validation.common.rules.specific.IdPresentSpecificRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.AccountStatus;
 import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.ServiceStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
 
@@ -59,14 +59,8 @@ public class AccountValidationConfig {
                     ),
                     FieldRequiredSpecificRule.instance("account",
                             CorrespondentAccountNewRequest::getAccount,
-                            AccountError.AccountFieldNotSet,
+                            AccountError.RequiredFieldEmpty,
-                            false,
                             accountValue -> {
-                                if ((accountValue == null || accountValue.isBlank()) && AccountType.Info.equalsByKey(context.getValidatedObject().getAccountType())) {
-                                    return null;
-                                }
-                                if (accountValue == null || accountValue.isBlank())
-                                    return new EnumMessage(AccountError.AccountFieldNotSet, "account");
                                 Imdg<Account> accountImdg = context.obtainMap(
                                         IMDGDistributedNames.Map_Account, Account.class
                                 );
@@ -83,30 +77,22 @@ public class AccountValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
-                            false
+                            false,
-//                           , statusValue -> {
+                            statusValue -> {
-//                                if (ServiceStatus.Active.equalsByKey(statusValue.getCode())) return null;
+                                if (ServiceStatus.Active.equalsByKey(statusValue.getCode())) return null;
-//                                return AccountError.WrongFieldValue;
+                                return AccountError.WrongFieldValue;
-//                            }
+                            }),
-                    ),
                     DictionaryPresentRule.instance("accountType",
                             CorrespondentAccountNewRequest::getAccountType,
                             IMDGDistributedNames.Map_AccountTypeDictionary,
                             AccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             accountType -> {
-                                if (IEnumKey.contains(accountType.getCode(), AccountType.Corr, AccountType.Info)) return null;
+                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
                                 return AccountError.WrongFieldValue;
-                            }).withMessageDecorator((causeEmpty, errorCode, fieldName, fieldValue) -> {
+                            })
-                                if (errorCode == AccountError.WrongFieldValue)
-                                    return DictionaryPresentRule.FIELD_NOT_FOUND_DECORATOR_1.decorator(causeEmpty, errorCode, fieldName, fieldValue);
-                                else
-                                    return DictionaryPresentRule.DICTIONARY_NOT_FOUND_DECORATOR_2.decorator(causeEmpty, errorCode, fieldName, fieldValue);
-                            }
-                            ),
-                    new SameAccountValidationRule<>(AccountType.Corr, CorrespondentAccountNewRequest::getAccount)
             );
         };
     }
@@ -147,20 +133,18 @@ public class AccountValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false),
                     DictionaryPresentRule.instance("accountType",
                             CorrespondentAccountUpdateRequest::getAccountType,
                             IMDGDistributedNames.Map_AccountTypeDictionary,
                             AccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
-                            false
+                            accountType -> {
-//                            accountType -> {
+                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
-//                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
+                                return AccountError.WrongFieldValue;
-//                                return AccountError.WrongFieldValue;
+                            })
-//                            }
-                    )
             );
         };
     }

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/BankAccountValidationConfig.java

@@ -13,7 +13,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountNewReq
 import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
 import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
-import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
 import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
 import ru.spcex.clearing.validation.common.rules.specific.FieldRequiredSpecificRule;
@@ -21,7 +20,10 @@ import ru.spcex.clearing.validation.common.rules.specific.IdPresentSpecificRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.AccountStatus;
 import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.ServiceStatus;
 import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidator;
@@ -56,17 +58,30 @@ public class BankAccountValidationConfig {
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
                             false),
-                    FieldNotBlankRequiredRule.instance("account",
+                    FieldRequiredSpecificRule.instance("account",
                             BankAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty
+                            AccountError.RequiredFieldEmpty,
-                    ),
+                            accountValue -> {
-                    new SameAccountValidationRule<>(AccountType.Bank, BankAccountNewRequest::getAccount),
+                                Imdg<Account> accountImdg = context.obtainMap(
+                                        IMDGDistributedNames.Map_Account, Account.class
+                                );
+                                ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
+                                ImdgPredicate accountValuePredicate = pb.equals("account", accountValue);
+                                ImdgPredicate accountStatusPredicate = pb.equals("status", ServiceStatus.Active.getKey());
+                                ImdgPredicate accountTypePredicate = pb.equals("accountType", AccountType.Bank.getKey());
+                                ImdgPredicate finalPredicate = pb.and(accountValuePredicate,
+                                        accountStatusPredicate,
+                                        accountTypePredicate);
+                                Collection<Account> accounts = accountImdg.getCollectionObjectsByPredicate(finalPredicate);
+                                if (accounts.isEmpty()) return null;
+                                return new EnumMessage(AccountError.AccountAlreadyExist, accounts.stream().findFirst().get().getAccount());
+                            }),
                     DictionaryPresentRule.instance("currency",
                             BankAccountNewRequest::getCurrency,
                             IMDGDistributedNames.Map_CurrencyCodeDictionary,
                             CurrencyCodeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound),
+                            AccountError.WrongFieldValue),
                     FieldRequiredRule.instance("bankIdentificationCode",
                             BankAccountNewRequest::getBankIdentificationCode,
                             AccountError.RequiredFieldEmpty),
@@ -78,7 +93,7 @@ public class BankAccountValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false)
             );
         };
@@ -118,7 +133,7 @@ public class BankAccountValidationConfig {
                             IMDGDistributedNames.Map_CurrencyCodeDictionary,
                             CurrencyCodeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false)
             );
         };

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClearingAccountValidationConfig.java

@@ -11,7 +11,6 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClearingAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClearingAccountUpdateRequest;
 import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
-import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
 import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
 import ru.spcex.clearing.validation.common.rules.specific.FieldRequiredSpecificRule;
@@ -22,6 +21,7 @@ import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
 
@@ -55,22 +55,36 @@ public class ClearingAccountValidationConfig {
                             AccountError.CompanyNotFound
 //                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null
                     ),
-                    FieldNotBlankRequiredRule.instance("account",
+                    FieldRequiredSpecificRule.instance("account",
                             ClearingAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty),
+                            AccountError.RequiredFieldEmpty,
-                    new SameAccountValidationRule<>(AccountType.Clrn, ClearingAccountNewRequest::getAccount),
+                            accountValue -> {
+                                Imdg<Account> accountImdg = context.obtainMap(
+                                        IMDGDistributedNames.Map_Account, Account.class
+                                );
+                                ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
+                                ImdgPredicate accountValuePredicate = pb.equals("account", accountValue);
+                                ImdgPredicate accountStatusPredicate = pb.equals("status", ServiceStatus.Active.getKey());
+                                ImdgPredicate accountTypePredicate = pb.equals("accountType", AccountType.Clrn.getKey());
+                                ImdgPredicate finalPredicate = pb.and(accountValuePredicate,
+                                        accountStatusPredicate,
+                                        accountTypePredicate);
+                                Collection<Account> accounts = accountImdg.getCollectionObjectsByPredicate(finalPredicate);
+                                if (accounts.isEmpty()) return null;
+                                return new EnumMessage(AccountError.AccountAlreadyExist, accounts.stream().findFirst().get().getAccount());
+                            }),
                     DictionaryPresentRule.instance("clearingAccountType",
                             ClearingAccountNewRequest::getClearingAccountType,
                             IMDGDistributedNames.Map_ClearingAccountTypeDictionary,
                             ClearingAccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound),
+                            AccountError.WrongFieldValue),
                     DictionaryPresentRule.instance("status",
                             ClearingAccountNewRequest::getStatus,
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false)
             );
         };
@@ -94,8 +108,6 @@ public class ClearingAccountValidationConfig {
                             ClearingAccountUpdateRequest::getAccount,
                             AccountError.RequiredFieldEmpty,
                             accountValue -> {
-                                if (accountValue.isBlank())
-                                    return AccountError.RequiredFieldEmpty;
                                 Imdg<Account> accountImdg = context.obtainMap(
                                         IMDGDistributedNames.Map_Account, Account.class
                                 );

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/DepoAccountValidationConfig.java

@@ -9,14 +9,17 @@ import ru.spcex.clearing.account.errors.AccountError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.DepoAccountNewRequest;
 import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
-import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
 import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
 import ru.spcex.clearing.validation.common.rules.specific.FieldRequiredSpecificRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.ServiceStatus;
 import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
+import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
 
@@ -49,10 +52,24 @@ public class DepoAccountValidationConfig {
                             AccountError.CompanyNotFound
 //                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null
                     ),
-                    FieldNotBlankRequiredRule.instance("account",
+                    FieldRequiredSpecificRule.instance("account",
                             DepoAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty),
+                            AccountError.RequiredFieldEmpty,
-                    new SameAccountValidationRule<>(AccountType.Depo, DepoAccountNewRequest::getAccount),
+                            accountValue -> {
+                                Imdg<Account> accountImdg = context.obtainMap(
+                                        IMDGDistributedNames.Map_Account, Account.class
+                                );
+                                ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
+                                ImdgPredicate accountValuePredicate = pb.equals("account", accountValue);
+                                ImdgPredicate accountStatusPredicate = pb.equals("status", ServiceStatus.Active.getKey());
+                                ImdgPredicate accountTypePredicate = pb.equals("accountType", AccountType.Clrn.getKey());
+                                ImdgPredicate finalPredicate = pb.and(accountValuePredicate,
+                                        accountStatusPredicate,
+                                        accountTypePredicate);
+                                Collection<Account> accounts = accountImdg.getCollectionObjectsByPredicate(finalPredicate);
+                                if (accounts.isEmpty()) return null;
+                                return new EnumMessage(AccountError.AccountAlreadyExist, accounts.stream().findFirst().get().getAccount());
+                            }),
                     FieldRequiredRule.instance("depoAccountType",
                             DepoAccountNewRequest::getDepoAccountType,
                             AccountError.RequiredFieldEmpty),
@@ -61,7 +78,7 @@ public class DepoAccountValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false)
             );
         };

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/InformationAccountValidationConfig.java

@@ -2,23 +2,20 @@ package ru.spcex.clearing.account.config.validation;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import ru.clearing.classes.statics.data.account.InformationAccount;
 import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.platform.dictionary.AccountTypeDictionary;
-import ru.clearing.platform.dictionary.ServiceStatusDictionary;
 import ru.spcex.clearing.account.errors.AccountError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.InformationAccountNewRequest;
-import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
-import ru.spcex.clearing.validation.common.rules.FieldNotBlankRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.enumeration.AccountType;
 import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.utils.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -36,9 +33,6 @@ public class InformationAccountValidationConfig {
             Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_InformationAccount);
-            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
-            addImdg.accept(IMDGDistributedNames.Map_AccountTypeDictionary);
-            addImdg.accept(IMDGDistributedNames.Map_Account);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("companyId",
                             InformationAccountNewRequest::getCompanyId,
@@ -49,17 +43,16 @@ public class InformationAccountValidationConfig {
                             company -> {
                                 if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()))
                                     return AccountError.CompanyNotActive;
-                                return null;
+                                Long companyId = company.getId();
-                            }),
+                                Imdg<InformationAccount> informationAccountImdg = context.obtainMap(
-                    FieldNotBlankRequiredRule.instance("account", InformationAccountNewRequest::getAccount,
+                                        IMDGDistributedNames.Map_InformationAccount, InformationAccount.class
-                            AccountError.RequiredFieldEmpty),
+                                );
-                    DictionaryPresentRule.instance("status", InformationAccountNewRequest::getStatus,
+                                Collection<InformationAccount> infoAccounts = informationAccountImdg.getCollectionObjectsByFieldValues(
-                            IMDGDistributedNames.Map_ServiceStatusDictionary, ServiceStatusDictionary.class,
+                                        Map.of("companyId", companyId)
-                            AccountError.RequiredFieldEmpty, AccountError.DictionaryNotFound, false),
+                                );
-                    DictionaryPresentRule.instance("accountType", InformationAccountNewRequest::getAccountType,
+                                if (infoAccounts.isEmpty()) return null;
-                            IMDGDistributedNames.Map_AccountTypeDictionary, AccountTypeDictionary.class,
+                                return AccountError.InfoAccountAlreadyExist;
-                            AccountError.RequiredFieldEmpty, AccountError.DictionaryNotFound, false),
+                            })
-                    new SameAccountValidationRule<>(AccountType.Info, InformationAccountNewRequest::getAccount)
             );
         };
     }

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/SameAccountValidationRule.java

@@ -1,46 +0,0 @@
-package ru.spcex.clearing.account.config.validation;
-
-import ru.clearing.classes.statics.data.account.Account;
-import ru.spcex.clearing.account.errors.AccountError;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.enumeration.ServiceStatus;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.imdg.validation.ImdgValidationContext;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.validation.IValidationRule;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-
-class SameAccountValidationRule<R> implements IValidationRule<ImdgValidationContext<R>> {
-    final String accountType;
-    final Function<R, String> accountGetter;
-
-    public SameAccountValidationRule(AccountType accountType, Function<R, String> accountGetter) {
-        this.accountType = accountType.getKey(); // or req.getAccountType()
-        this.accountGetter = accountGetter;
-        Objects.requireNonNull(accountGetter);
-    }
-
-    @Override
-    public Optional<EnumMessage> validate(ImdgValidationContext<R> context) {
-        R req = context.getValidatedObject();
-        Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
-        ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
-        ImdgPredicate query = pb.and(
-                pb.equals("account", accountGetter.apply(req)), // req.getAccount()
-//                pb.equals("accountType", accountType), имена всех счетов уникальны, вне зависимости от типа
-                pb.in("status", ServiceStatus.Active.getKey(), ServiceStatus.Reopened.getKey(), ServiceStatus.Appl.getKey())
-        );
-        Account existAccount = accountImdg.getFirstObjectByPredicate(query);
-        if (existAccount != null) {
-            return of(AccountError.AccountAlreadyExist, existAccount.getAccount());
-        }
-        return empty();
-    }
-
-}

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java

@@ -124,7 +124,7 @@ public class TradingClearingRegistryValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false),
                     new newTCRDuplicateCheck()
             );
@@ -189,7 +189,7 @@ public class TradingClearingRegistryValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.DictionaryNotFound,
+                            AccountError.WrongFieldValue,
                             false)
             );
         };

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ValidationConfig.java

@@ -41,7 +41,6 @@ public class ValidationConfig {
         addImdg.accept(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
         addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary, ServiceStatusDictionary.class);
         addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
-        addImdg.accept(IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class);
 
         //for ClientCodeValidationConfig
         addImdg.accept(IMDGDistributedNames.Map_ClientCode, ClientCode.class);

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/errors/AccountError.java

@@ -21,8 +21,6 @@ public enum AccountError implements IErrorEnumId {
     ClearingCategoryNotFound(5019L),
     ClearingCompanySymbolNotFound(5022L), // Для компании %s отсутствует клиринговый код».
     AccountForTradingClearingRegistryAlreadyUsed(5023L),
-    AccountFieldNotSet(5024L),
-    AccountDepoTypeRequired(5025L),
     TradingClearingRegistryNotFound(3022L),
     ;
 

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountHelper.java

@@ -1,106 +0,0 @@
-package ru.spcex.clearing.account.service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
-import ru.clearing.classes.statics.data.company.relation.Relation;
-import ru.spcex.clearing.account.errors.AccountError;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.platform.messaging.service.Status;
-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.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.enumeration.IEnumKey;
-import ru.spcex.platform.utils.enumeration.IMessageResolver;
-
-import java.util.Collection;
-
-@Service
-public class AccountHelper {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<ClearingMemberCategory> clearingMemberCategoryMap;
-    private final Imdg<Relation> relationMap;
-    private final IMessageResolver messageResolver;
-
-    @Autowired
-    public AccountHelper(ImdgProvider imdgProvider,
-                         IMessageResolver messageResolver) {
-        this.clearingMemberCategoryMap = imdgProvider.getImdg(
-                IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class
-        );
-        this.relationMap = imdgProvider.getImdg(
-                IMDGDistributedNames.Map_Relation, Relation.class
-        );
-        this.messageResolver = messageResolver;
-    }
-
-    /**
-     * Заполняет поля relationId и companyId из соответствующей записи Relation
-     *
-     * @param requestId Идентификатор запроса для вывода лога
-     */
-    public RequestInfoUpdate fillAccountFromRelation(Account account, Long requestId, boolean checkClearingMemberCategory) {
-        Long companyId = account.getCompanyId();
-        Collection<Relation> relations;
-        ImdgPredicateBuilder relationPredicateBuilder = relationMap.predicateBuilder();
-        ImdgPredicate finalRelationPredicate;
-        if (checkClearingMemberCategory) {
-            ImdgPredicateBuilder clearingMemberCategoryPredicateBuilder = clearingMemberCategoryMap.predicateBuilder();
-            ImdgPredicate companyIdEquals = clearingMemberCategoryPredicateBuilder.equals("companyId", companyId);
-            Collection<ClearingMemberCategory> clearingMemberCategories = clearingMemberCategoryMap.getCollectionObjectsByPredicate(companyIdEquals);
-
-            if (clearingMemberCategories.isEmpty())
-                return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, "(any)");
-            if (clearingMemberCategories.size() > 1)
-                log.warn("ClearingMemberCategory for companyId {} contains multiply elements, use first", companyId);
-            ClearingMemberCategory clearingMemberCategory = clearingMemberCategories.iterator().next();
-
-            ImdgPredicate consumerIdPredicate = relationPredicateBuilder.equals("consumerId", companyId);
-            ImdgPredicate servicePredicate;
-            String clearingCategoryValue = clearingMemberCategory.getClearingMemberCategory();
-            if (IEnumKey.contains(clearingCategoryValue, ClearingCategory.B, ClearingCategory.I, ClearingCategory.V)) {
-                servicePredicate = relationPredicateBuilder.equals("service", ru.spcex.platform.enumeration.Service.MKR.getKey());
-            } else if (IEnumKey.contains(clearingCategoryValue, ClearingCategory.F, ClearingCategory.C)) {
-                servicePredicate = relationPredicateBuilder.equals("service", ru.spcex.platform.enumeration.Service.FOND.getKey());
-            } else {
-                log.info("ClearingCategoryNotFound with clearingCategoryValue={} not implemented. Do not search Relation.", clearingCategoryValue);
-                return null;
-                //return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, clearingCategoryValue + " (case not implemented)");
-            }
-            finalRelationPredicate = relationPredicateBuilder.and(consumerIdPredicate, servicePredicate);
-            relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate);
-        } else {
-            finalRelationPredicate = relationPredicateBuilder.equals("consumerId", companyId);
-            relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate);
-        }
-
-        if (relations.isEmpty()) {
-            //return makeError(requestId, AccountError.WrongFieldValue, "companyId", finalRelationPredicate.toString());
-            log.info("Relation not found: {}", finalRelationPredicate.toString());
-            return null;
-        }
-        if (relations.size() > 1)
-            log.warn("Relation for consumerId {} contains multiply elements, use first", companyId);
-        Relation relation = relations.iterator().next();
-        account.setRelationId(relation.getId());
-
-        return null;
-    }
-
-    public RequestInfoUpdate makeError(Long reqId, AccountError accountError, Object... args) {
-        String errMsg = messageResolver.resolve(new EnumMessage(accountError, args));
-        return new RequestInfoUpdate()
-                .setId(reqId)
-                .setStatus(Status.Error)
-                .setMessage(errMsg);
-    }
-
-}

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountService.java

@@ -9,9 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.account.ClearingAccount;
-import ru.clearing.classes.statics.data.account.DepoAccount;
-import ru.clearing.classes.statics.data.account.InformationAccount;
 import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
 import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.spcex.clearing.account.errors.AccountError;
@@ -20,15 +17,22 @@ import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountTerminationRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.AccountSdfToStatementRequestPart;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
+import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.ClearingCategory;
+import ru.spcex.platform.enumeration.ServiceStatus;
+import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.ImdgTransaction;
@@ -40,8 +44,9 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Map;
+import java.util.List;
 import java.util.function.Function;
 
 @Service
@@ -55,8 +60,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
     private final IMessageResolver messageResolver;
     private final UserRoleVerification userRoleVerification;
     private final ValidationHelper validationHelper;
-    private final AccountHelper accountHelper;
-    private final InformationAccountService informationAccountService;
     private final Function<CorrespondentAccountNewRequest, IValidator> accountNewRequestValidator;
     private final Function<CorrespondentAccountUpdateRequest, IValidator> accountUpdateRequestValidator;
     private final Function<CommonIdRequest, IValidator> accountBlockRequestValidator;
@@ -69,8 +72,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
                           IMessageResolver messageResolver,
                           UserRoleVerification userRoleVerification,
                           ValidationHelper validationHelper,
-                          AccountHelper accountHelper,
-                          InformationAccountService informationAccountService,
                           @Qualifier("correspondentAccountNewRequestValidator")
                                   Function<CorrespondentAccountNewRequest, IValidator> accountNewRequestValidator,
                           @Qualifier("correspondentAccountUpdateRequestValidator")
@@ -78,7 +79,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
                           @Qualifier("correspondentAccountBlockRequestValidator")
                                   Function<CommonIdRequest, IValidator> accountBlockRequestValidator) {
         super(kafkaQueue, kafkaProducer);
-        this.accountHelper = accountHelper;
         this.imdgProvider = imdgProvider;
         this.accountMap = imdgProvider.getImdg(
                 IMDGDistributedNames.Map_Account, Account.class
@@ -93,7 +93,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         this.messageResolver = messageResolver;
         this.userRoleVerification = userRoleVerification;
         this.validationHelper = validationHelper;
-        this.informationAccountService = informationAccountService;
         this.accountNewRequestValidator = accountNewRequestValidator;
         this.accountUpdateRequestValidator = accountUpdateRequestValidator;
         this.accountBlockRequestValidator = accountBlockRequestValidator;
@@ -134,12 +133,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         Account account = new Account();
         account.setCompanyId(req.getCompanyId());
         account.setAccount(req.getAccount());
-        if (AccountType.Info.equalsByKey(req.getAccountType())) {
-            Long infoSequenceId = informationAccountService.accountNextId();
-            String accountValue = informationAccountService.generateInfoAccount(infoSequenceId);
-            log.trace("New info-account SequenceId={} account={}", infoSequenceId, accountValue);
-            account.setAccount(accountValue);
-        }
         account.setAccountType(req.getAccountType());
         if (req.getStatus() == null) {
             account.setStatus(WorkflowStatus.Active.getKey());
@@ -150,89 +143,14 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         account.setCreated(now);
         account.setUpdated(now);
 
-        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), false);
+        requestInfoUpdate = fillAccountFromRelation(account, userRequest.getId(), false);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
-        Long newId = null;
+        Long newId = accountMap.insert(account);
-        if (AccountType.Corr.equalsByKey(account.getAccountType())) {
-            // default, дополнительные таблицы не требуются
-            newId = accountMap.insert(account);
-        } else {
-            // Транзакцией
-            ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
-            imdgTransaction.beginTransaction();
-            boolean txOk = false;
-            try {
-                Imdg<Account> accountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-                newId = accountMap.insert(account);
-
-                if (AccountType.Corr.equalsByKey(account.getAccountType())) {
-                    // default, дополнительные таблицы не требуются
-                } else if (AccountType.Info.equalsByKey(account.getAccountType()))
-                    makeInfoPart(imdgTransaction, account);
-                else if (AccountType.Depo.equalsByKey(account.getAccountType()))
-                    makeDepoPart(imdgTransaction, account, req);
-                else if (AccountType.Clrn.equalsByKey(account.getAccountType()))
-                    makeClrnPart(imdgTransaction, account);
-                else {
-                    log.warn("Unexpected AccountType={}. Do not create additional record to other table's", account.getAccountType());
-                }
-                txOk = true;
-            } finally {
-                if (txOk) {
-                    imdgTransaction.commitTransaction();
-                } else {
-                    log.debug("failed insert, new account id {} rollback", newId);
-                    imdgTransaction.rollbackTransaction();
-                }
-            }
-        }
-
         log.debug("successfully processed, new account id {}", newId);
         return null;
     }
 
-    protected void makeInfoPart(ImdgTransaction imdgTransaction, Account account) {
-        Imdg<InformationAccount> informationAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class);
-        InformationAccount infoAcc = new InformationAccount();
-        infoAcc.setAccountId(account.getId());
-        Account firstAccountAntl = accountMap.getFirstObjectByFieldValues(Map.of(
-                "companyId", Sender.One.getId(),
-                "accountType", AccountType.Anlt.getKey()
-        ));
-        if (firstAccountAntl == null) {
-            log.warn("Can not find 1 ANTL account for fill information ClearingAccountId.");
-        } else {
-            infoAcc.setClearingAccountId(firstAccountAntl.getId());
-        }
-        infoAcc.setCompanyId(account.getCompanyId());
-        Long infoId = informationAccountMap.insert(infoAcc);
-        log.debug("For account id={} make InformationAccount id={}", account.getId(), infoId);
-    }
-
-    protected void makeDepoPart(ImdgTransaction imdgTransaction, Account account, CorrespondentAccountNewRequest req) {
-        Imdg<DepoAccount> depoAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
-        DepoAccount depoAcc = new DepoAccount();
-        depoAcc.setAccountId(account.getId());
-        depoAcc.setCompanyId(account.getCompanyId());
-        if (account.getAccount() != null && account.getAccount().contains("BC")) {
-            depoAcc.setDepoAccountType(DepoAccountType.C.getKey());
-        } else {
-            //todo в реквесте нет поля depoAcc.setDepoAccountType(req.getDepoAccountType());
-        }
-        Long depoId = depoAccountMap.insert(depoAcc);
-        log.debug("For account id={} make DepoAccount id={}", account.getId(), depoId);
-    }
-
-    protected void makeClrnPart(ImdgTransaction imdgTransaction, Account account) {
-        Imdg<ClearingAccount> clearingAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
-        ClearingAccount clnrAcc = new ClearingAccount();
-        clnrAcc.setAccountId(account.getId());
-        clnrAcc.setCompanyId(account.getCompanyId());
-        Long clrnId = clearingAccountMap.insert(clnrAcc);
-        log.debug("For account id={} make ClearingAccount id={}", account.getId(), clrnId);
-    }
-
     public RequestInfoUpdate correspondentAccountUpdate(BaseRequest<CorrespondentAccountUpdateRequest> userRequest) {
         log.debug("CorrespondentAccountUpdateRequest received");
 
@@ -245,10 +163,6 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         CorrespondentAccountUpdateRequest request = userRequest.getRequestPayload();
 
         Account account = accountMap.getSingleObjectByID(request.getId());
-        if (request.getAccountType() != null && !request.getAccountType().equals(account.getAccountType())) {
-            requestInfoUpdate = makeError(userRequest.getId(), AccountError.WrongFieldValue, "accountType");
-            return requestInfoUpdate;
-        }
 
         if (request.getStatus() != null) account.setStatus(request.getStatus());
 
@@ -323,6 +237,60 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         return null;
     }
 
+
+    /**
+     * Заполняет поля relationId и companyId из соответствующей записи Relation
+     *
+     * @param requestId Идентификатор запроса для вывода лога
+     */
+    public RequestInfoUpdate fillAccountFromRelation(Account account, Long requestId, boolean checkClearingMemberCategory) {
+        Long companyId = account.getCompanyId();
+        Collection<Relation> relations;
+        ImdgPredicateBuilder relationPredicateBuilder = relationMap.predicateBuilder();
+        ImdgPredicate finalRelationPredicate;
+        if (checkClearingMemberCategory) {
+            ImdgPredicateBuilder clearingMemberCategoryPredicateBuilder = clearingMemberCategoryMap.predicateBuilder();
+            ImdgPredicate companyIdEquals = clearingMemberCategoryPredicateBuilder.equals("companyId", companyId);
+            Collection<ClearingMemberCategory> clearingMemberCategories = clearingMemberCategoryMap.getCollectionObjectsByPredicate(companyIdEquals);
+
+            if (clearingMemberCategories.isEmpty())
+                return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, "(any)");
+            if (clearingMemberCategories.size() > 1)
+                log.warn("ClearingMemberCategory for companyId {} contains multiply elements, use first", companyId);
+            ClearingMemberCategory clearingMemberCategory = clearingMemberCategories.iterator().next();
+
+            ImdgPredicate consumerIdPredicate = relationPredicateBuilder.equals("consumerId", companyId);
+            ImdgPredicate servicePredicate;
+            String clearingCategoryValue = clearingMemberCategory.getClearingMemberCategory();
+            if (IEnumKey.contains(clearingCategoryValue, ClearingCategory.B, ClearingCategory.I, ClearingCategory.V)) {
+                servicePredicate = relationPredicateBuilder.equals("service", ru.spcex.platform.enumeration.Service.MKR.getKey());
+            } else if (IEnumKey.contains(clearingCategoryValue, ClearingCategory.F, ClearingCategory.C)) {
+                servicePredicate = relationPredicateBuilder.equals("service", ru.spcex.platform.enumeration.Service.FOND.getKey());
+            } else {
+                log.info("ClearingCategoryNotFound with clearingCategoryValue={} not implemented. Do not search Relation.", clearingCategoryValue);
+                return null;
+                //return makeError(requestId, AccountError.ClearingCategoryNotFound, companyId, clearingCategoryValue + " (case not implemented)");
+            }
+            finalRelationPredicate = relationPredicateBuilder.and(consumerIdPredicate, servicePredicate);
+            relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate);
+        } else {
+            finalRelationPredicate = relationPredicateBuilder.equals("consumerId", companyId);
+            relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate);
+        }
+
+        if (relations.isEmpty()) {
+            //return makeError(requestId, AccountError.WrongFieldValue, "companyId", finalRelationPredicate.toString());
+            log.info("Relation not found: {}", finalRelationPredicate.toString());
+            return null;
+        }
+        if (relations.size() > 1)
+            log.warn("Relation for consumerId {} contains multiply elements, use first", companyId);
+        Relation relation = relations.iterator().next();
+        account.setRelationId(relation.getId());
+
+        return null;
+    }
+
     private RequestInfoUpdate makeError(Long reqId, AccountError accountError, Object... args) {
         String errMsg = messageResolver.resolve(new EnumMessage(accountError, args));
         return new RequestInfoUpdate()

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/AccountSymbolsService.java

@@ -1,122 +0,0 @@
-package ru.spcex.clearing.account.service;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.account.*;
-import ru.spcex.clearing.account.errors.AccountError;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountSymbolsNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
-import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.clearing.util.security.UserRoleVerification;
-import ru.spcex.clearing.util.services.RequestHelper;
-import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.utils.enumeration.IMessageResolver;
-import ru.spcex.platform.utils.validation.IValidator;
-
-import java.util.function.Function;
-
-@Service
-public class AccountSymbolsService extends QueueConsumer implements InitializingBean {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-
-    private final ValidationHelper validationHelper;
-    private final UserRoleVerification userRoleVerification;
-
-    private final ImdgProvider imdgProvider;
-    private final Imdg<AccountSymbols> accountSymbolsImdg;
-
-    private final RequestHelper requestHelper;
-    private final Function<AccountSymbolsNewRequest, IValidator> accountSymbolsNewRequestValidator;
-
-    private final IMessageResolver messageResolver;
-    private final Producer<String, Object> kafkaProducer;
-    private final KafkaSender kafkaSender;
-
-    public AccountSymbolsService(Consumer<String, Object> kafkaQueue,
-                                 Producer<String, Object> kafkaProducer,
-                                 KafkaSender kafkaSender,
-                                 ImdgProvider imdgProvider,
-                                 ValidationHelper validationHelper,
-                                 UserRoleVerification userRoleVerification,
-                                 IMessageResolver messageResolver,
-                                 RequestHelper requestHelper,
-                                 @Qualifier("accountSymbolsDepoNewRequest")
-                                         Function<AccountSymbolsNewRequest, IValidator> accountSymbolsNewRequestValidator
-    ) {
-        super(kafkaQueue, kafkaProducer);
-        this.kafkaProducer = kafkaProducer;
-        this.kafkaSender = kafkaSender;
-        this.validationHelper = validationHelper;
-        this.userRoleVerification = userRoleVerification;
-        this.requestHelper = requestHelper;
-        this.imdgProvider = imdgProvider;
-        this.accountSymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class);
-        this.accountSymbolsNewRequestValidator = accountSymbolsNewRequestValidator;
-        this.messageResolver = messageResolver;
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        imdgProvider.waitAvailable();
-        callback(AccountSymbolsNewRequest.class)
-                .setFunction(this::accountSymbolsNew)
-                .forDestination(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_NEW, callbacks::put);
-        callback(CommonIdRequest.class)
-                .setFunction(this::accountSymbolsDelete)
-                .forDestination(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_DELETE, callbacks::put);
-        init();
-    }
-
-    protected RequestInfoUpdate accountSymbolsNew(BaseRequest<AccountSymbolsNewRequest> userRequest) {
-        log.debug("AccountSymbolsNewRequest received, id={}", userRequest.getId());
-        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
-
-        requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, accountSymbolsNewRequestValidator);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
-
-        AccountSymbolsNewRequest req = userRequest.getRequestPayload();
-
-        Long id = accountSymbolsImdg.nextIDSequenceFor();
-        AccountSymbols accountSymbols = new AccountSymbols();
-        accountSymbols.setId(id);
-        accountSymbols.setAccountId(req.getAccountId());
-        accountSymbols.setAccountSymbolValue(req.getAccountSymbolValue());
-
-        accountSymbolsImdg.insert(accountSymbols);
-
-        log.debug("successfully processed, id {}. New accountSymbols.id={} was created", id, accountSymbols.getId());
-        return null;
-    }
-
-    protected RequestInfoUpdate accountSymbolsDelete(BaseRequest<CommonIdRequest> userRequest) {
-        log.debug("AccountSymbolsDeleteRequest(CommonIdRequest) received, id={}", userRequest.getId());
-        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
-
-        CommonIdRequest req = userRequest.getRequestPayload();
-
-        AccountSymbols accountSymbols = accountSymbolsImdg.getSingleObjectByID(req.getId());
-        if (accountSymbols == null) {
-            return requestHelper.makeErrorResponse(userRequest, AccountError.AccountNotFound, req.getId());
-        }
-
-        accountSymbolsImdg.delete(accountSymbols);
-
-        log.debug("successfully processed, id {}. New accountSymbols.id={} was deleted", userRequest.getId(), accountSymbols.getId());
-        return null;
-    }
-
-}

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java

@@ -41,7 +41,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
     private final UserRoleVerification userRoleVerification;
     private final ValidationHelper validationHelper;
 
-    private final AccountHelper accountService;
+    private final AccountService accountService;
 
     private final Function<BankAccountNewRequest, IValidator> bankAccountNewRequestValidator;
     private final Function<BankAccountUpdateRequest, IValidator> bankAccountUpdateRequestValidator;
@@ -53,7 +53,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
                               ImdgProvider imdgProvider,
                               UserRoleVerification userRoleVerification,
                               ValidationHelper validationHelper,
-                              AccountHelper accountService,
+                              AccountService accountService,
                               @Qualifier("bankAccountNewRequestValidator")
                                       Function<BankAccountNewRequest, IValidator> bankAccountNewRequestValidator,
                               @Qualifier("bankAccountUpdateRequestValidator")

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/ClearingAccountService.java

@@ -15,10 +15,7 @@ import ru.clearing.classes.statics.data.account.ClearingAccount;
 import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.relation.Relation;
-import ru.clearing.classes.statics.data.misc.Notification;
-import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.classes.statics.data.sdf.SDf52;
-import ru.clearing.platform.dictionary.ClearingCategoryDictionary;
 import ru.spcex.clearing.account.errors.AccountError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
@@ -29,9 +26,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf0
 import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.AccountSdfToStatementRequestPart;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryUpdateRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationFeedbackRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest;
 import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
@@ -46,21 +40,19 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.collection.Pair;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.enumeration.IErrorEnumId;
+import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-
 @Service
 public class ClearingAccountService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final KafkaSender kafkaSender;
-    private final AccountHelper accountService;
+    private final AccountService accountService;
     private final SDFProcessService sdfProcessService;
     private final ValidationHelper validationHelper;
     private final ImdgProvider imdgProvider;
@@ -70,19 +62,15 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
     private final Function<ClearingAccountUpdateRequest, IValidator> clearingAccountUpdateRequestValidator;
 
     private final Imdg<Account> accountImdg;
-    private final Imdg<ClearingAccount> clearingAccountImdg;
     private final Imdg<Company> companyImdg;
     private final Imdg<Relation> relationImdg;
     private final Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
-    private final Imdg<ClearingCategoryDictionary> clearingCategoryImdg;
-    private final Imdg<TradingClearingRegistry> tradingClearingRegistryImdg;
-    private final Imdg<Notification> notificationImdg;
 
     @Autowired
     public ClearingAccountService(Consumer<String, Object> kafkaQueue,
                                   Producer<String, Object> kafkaResponseQueue,
                                   KafkaSender kafkaSender,
-                                  AccountHelper accountService,
+                                  AccountService accountService,
                                   SDFProcessService sdfProcessService,
                                   ValidationHelper validationHelper,
                                   ImdgProvider imdgProvider,
@@ -104,13 +92,9 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         this.clearingAccountUpdateRequestValidator = clearingAccountUpdateRequestValidator;
 
         this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        this.clearingAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
         this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
         this.clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
-        this.clearingCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingCategoryDictionary, ClearingCategoryDictionary.class);
-        this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
-        this.notificationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Notification, Notification.class);
     }
 
     @Override
@@ -124,13 +108,9 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         callback(AccountSdf01Request.class)
                 .setFunction(this::accountNewSdf01)
                 .forDestination(Consts.ACCOUNT_NEW_SDF01, callbacks::put);
-
         callback(StatementRequest.class)
                 .setFunction(this::accountUpdateSdf52)
                 .forDestination(Consts.ACCOUNT_PROCESS_SDF52, callbacks::put);
-        callback(NotificationFeedbackRequest.class)
-                .setFunction(this::accountUpdateSdf52_part2Notification)
-                .forDestination(Consts.ACCOUNT_NOTIFICATION_FEEDBACK, callbacks::put);
 
         init();
     }
@@ -273,7 +253,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
                     }
                 }
 
-                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
+                if (accountImdg.getFirstObjectBySQL("accountType = '%s' and account = '%s'".formatted(AccountType.Clrn.getKey(), accountReq.getAccount())) != null) {
                     log.debug("Account {} already exists", accountReq.getAccount());
                     {
                         AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
@@ -322,6 +302,21 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         return null;
     }
 
+    String serviceTypeByCMCOfCompany(Long companyId) {
+        Collection<ClearingMemberCategory> cmCategorys = clearingMemberCategoryImdg.getCollectionObjectsByFieldValues(
+                Map.of("companyId", companyId));
+        String serviceType = null;
+        for (ClearingMemberCategory cmc : cmCategorys) {
+            if (IEnumKey.contains(cmc.getClearingMemberCategory(), ClearingCategory.B, ClearingCategory.I, ClearingCategory.V)) {
+                serviceType = ru.spcex.platform.enumeration.Service.MKR.getKey();
+            }
+            if (IEnumKey.contains(cmc.getClearingMemberCategory(), ClearingCategory.F, ClearingCategory.C)) {
+                serviceType = ru.spcex.platform.enumeration.Service.MKR.getKey();
+            }
+        }
+        return serviceType;
+    }
+
     public RequestInfoUpdate accountUpdateSdf52(BaseRequest<StatementRequest> systemRequest) {
         log.debug("accountUpdateSdf52 StatementRequest received, id={}", systemRequest.getId());
 
@@ -345,159 +340,84 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
                 if (sdfProcessService.parseSdf52Status(sDf52.getStatus()) == null) {
                     String msg = messageResolver.resolve(new EnumMessage(AccountError.WrongFieldValue, "status"));
                     log.warn("By generationId={} s_df52[{}] error: {}", groupId, sDf52.getId(), msg);
-                    toProcessSDF53.add(new MutableTriple<>(sDf52, null,
+                    toProcessSDF53.add(new MutableTriple<>(sDf52, null, SDFProcessService.SDF_STATUS_ERROR));
-                            makeSdfErrorText(AccountError.WrongFieldValue, SDFProcessService.SDF_STATUS_ERROR)));
                     continue;
                 }
                 Company company = sDf52.getDeal() == null ? null : companyImdg.getSingleObjectByFieldValues(Map.of("tradingCode", sDf52.getDeal()));
                 if (company == null) {
                     String msg = messageResolver.resolve(new EnumMessage(AccountError.CompanyNotFound, sDf52.getDeal()));
                     log.warn("By generationId={} s_df52[{}] error: {}", groupId, sDf52.getId(), msg);
-                    toProcessSDF53.add(new MutableTriple<>(sDf52, null,
+                    toProcessSDF53.add(new MutableTriple<>(sDf52, null, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
-                            makeSdfErrorText(AccountError.CompanyNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND)));
                     continue;
                 }
-                Map<String, Comparable<?>> accountQuery = Map.of(
+                String serviceType = serviceTypeByCMCOfCompany(company.getId());
+                Relation relation = serviceType == null ? null : relationImdg.getSingleObjectByFieldValues(Map.of(
+                        "consumerId", company.getId(),
+                        "service", serviceType
+                ));
+                if (relation == null) {
+                    String msg = messageResolver.resolve(new EnumMessage(AccountError.ClearingCategoryNotFound, company.getTradingCode(), serviceType));
+                    log.warn("By generationId={} s_df52[{}] error: {}", groupId, sDf52.getId(), msg);
+                    toProcessSDF53.add(new MutableTriple<>(sDf52, null, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
+                    continue;
+                }
+                Account account = sDf52.getAccount() == null ? null : accountImdg.getFirstObjectByFieldValues(Map.of(
                         "accountType", AccountType.Clrn.getKey(),
                         "account", sDf52.getAccount(),
-                        "companyId", company.getId()
+                        "relationId", relation.getId()
-                );
+                ));
-                Account account = sDf52.getAccount() == null ? null : accountImdg.getFirstObjectByFieldValues(accountQuery);
                 if (account == null) {
-                    if (SDFProcessService.SDF52_STATUS_3Open.equals(sDf52.getStatus())) {
+                    String msg = messageResolver.resolve(new EnumMessage(AccountError.AccountNotFound, sDf52.getAccount()));
-                        log.debug("By generationId={} s_df52[{}].status={}, but account not found (query: {}). COntinuse with result OK for status 3",
+                    log.warn("By generationId={} s_df52[{}] error: {}", groupId, sDf52.getId(), msg);
-                                groupId, sDf52.getId(), sDf52.getStatus(), accountQuery);
+                    toProcessSDF53.add(new MutableTriple<>(sDf52, null, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
-                    } else {
+                    continue;
-                        String msg = messageResolver.resolve(new EnumMessage(AccountError.AccountNotFound, sDf52.getAccount()));
-                        log.warn("By generationId={} s_df52[{}] (query: {}) error: {}", groupId, sDf52.getId(), accountQuery, msg);
-                        toProcessSDF53.add(new MutableTriple<>(sDf52, null,
-                                makeSdfErrorText(AccountError.AccountNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND)));
-                        continue;
-                    }
                 }
-                toProcessSDF53.add(new MutableTriple<>(sDf52, account, SDFProcessService.SDF_STATUS_OK));
                 toUpdate.add(new Pair<>(sDf52, account));
             }
         }
         log.debug("Selected to update {} account's", toUpdate.size());
-
-        // 4. to notification
-        List<Long> notificationAccountIds = new ArrayList<>();
-        for (Pair<SDf52, Account> item : toUpdate) {
-            SDf52 sdf = item.getFirst();
-            Account account = item.getSecond();
-            AccountStatus newStatus = sdfProcessService.parseSdf52Status(sdf.getStatus());
-            if (newStatus == null) { // never
-                throw new IllegalArgumentException("Can not parse sdf status " + sdf.getStatus());
-            }
-            if (newStatus.equalsByKey(account.getStatus())) {
-                // одинаковых обычно не бывает.
-                continue;
-            }
-            if (AccountStatus.BLOCKED == newStatus || AccountStatus.CLOSE == newStatus) { // статус 0/2
-                sendNotificationRequest(ObjectType.account_block, account, newStatus);
-                notificationAccountIds.add(account.getId());
-                putNotificationWaiting(systemRequest, item.getFirst(), item.getSecond());
-            }
-            if (AccountStatus.ACTIVE == newStatus) { // статус 1/3
-                sendNotificationRequest(ObjectType.account_active, account, newStatus);
-                notificationAccountIds.add(account.getId());
-                putNotificationWaiting(systemRequest, item.getFirst(), item.getSecond());
-            }
-        }
-        sdfProcessService.process(req, toProcessSDF53);
-
-        log.info("{} account's need wait accept over notification. GroupId={}", notificationAccountIds.size(), groupId);
-
-        log.debug("successfully processed, grouping id={} with {} accounts.",
-                groupId, toUpdate.size());
-        return null;
-    }
-
-    protected RequestInfoUpdate accountUpdateSdf52_part2Notification(BaseRequest<NotificationFeedbackRequest> secondSystemRequest2) {
-        log.debug("accountUpdateSdf52 NotificationFeedbackRequest received, id={}", secondSystemRequest2.getId());
-        SDF52WaitingData trigger = onNotificationResponse(secondSystemRequest2.getRequestPayload());
-        if (trigger == null) {
-            log.trace("Not triggered, continue waiting");
-            return null;
-        } else {
-            log.debug("Triggered, groupId={}, notification's status: {}, last notification user id={}",
-                    trigger.getGroupId(), trigger.globalStatus, secondSystemRequest2.getUserId());
-            if (NotificationStatus.ACPT.equalsByKey(trigger.globalStatus)) {
-                return accountUpdateSdf52_part2(trigger.systemRequest, trigger.sdf, trigger.account, secondSystemRequest2);
-            } else if (NotificationStatus.CNCL.equalsByKey(trigger.globalStatus)) {
-                log.debug("groupId={} rejected by user {}.", trigger.getGroupId(), secondSystemRequest2.getUserId());
-                return null;
-            } else {
-                log.warn("Unknown waiting group status \"{}\"", trigger.globalStatus);
-                return null;
-            }
-        }
-    }
-
-    protected RequestInfoUpdate accountUpdateSdf52_part2(BaseRequest<StatementRequest> systemRequest1,
-                                                         SDf52 sdf, Account account,
-                                                         BaseRequest<NotificationFeedbackRequest> secondSystemRequest2) {
-        // 5. from notification:
-        StatementRequest req = systemRequest1.getRequestPayload();
-        Long groupId = req.getGroupId();
-        log.info("Continue Sdf52 groupId={}, first request id={}, second request id={}",
-                groupId, systemRequest1 == null ? null : systemRequest1.getId(), secondSystemRequest2 == null ? null : secondSystemRequest2.getId());
-
         int countOfUpdated = 0;
-
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
-        // 2. обновление данных
+        boolean txOk = false;
-        Instant now = Instant.now();
+        imdgTransaction.beginTransaction();
-        AccountStatus newStatus = sdfProcessService.parseSdf52Status(sdf.getStatus());
+        try { // 2. обновление данных, в транзакции
-        if (newStatus == null) {
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-            throw new IllegalArgumentException("Can not parse sdf status " + sdf.getStatus());
+            Instant now = Instant.now();
-        }
+            accountsLoop:
-        // За долгое время ожидания пользователя счёт мог быть обновлён, прочитать его ещё раз
+            for (Pair<SDf52, Account> item : toUpdate) {
-        account = accountImdg.getSingleObjectByID(account.getId());
+                SDf52 sdf = item.getFirst();
-        if (!newStatus.equalsByKey(account.getStatus())) {
+                Account account = item.getSecond();
-            // Обновление счёта
+                AccountStatus newStatus = sdfProcessService.parseSdf52Status(sdf.getStatus());
-            String oldStatus = account.getStatus();
+                if (newStatus == null) {
-            account.setStatus(newStatus.getKey());
+                    throw new IllegalArgumentException("Can not parse sdf status " + sdf.getStatus());
-            account.setUpdated(now);
+                }
-            accountImdg.update(account);
+                toProcessSDF53.add(new MutableTriple<>(sdf, account, SDFProcessService.SDF_STATUS_OK));
-            log.trace("S_DF52[{}] do update status to {} for account[{}]",
+                if (!newStatus.equalsByKey(account.getStatus())) {
-                    sdf.getId(), newStatus.getKey(), account.getId());
+                    // Обновление счёта
-            if (AccountStatus.ACTIVE.equalsByKey(oldStatus) && AccountStatus.ACTIVE != newStatus) { // счёт заблокировали - значит блокируем ТКР, наоборот не надо.
+                    account.setStatus(newStatus.getKey());
-                // Отправка в ТКР
+                    account.setUpdated(now);
-                TradingClearingRegistryUpdateRequest tcrReq = new TradingClearingRegistryUpdateRequest();
+                    accountImdg.update(account);
-                tcrReq.setMoneyAccountId(account.getId());
+                    log.trace("S_DF52[{}] do update status to {} for account[{}]", sdf.getId(), newStatus.getKey(), account.getId());
-                tcrReq.setCompanyId(account.getCompanyId());
+                    countOfUpdated++;
-                tcrReq.setStatus(account.getStatus());
-                Map<String, Long> queryTCR = new HashMap<>();
-                queryTCR.put("moneyAccountId", tcrReq.getMoneyAccountId());
-                if (tcrReq.getCompanyId() != null)
-                    queryTCR.put("companyId", tcrReq.getCompanyId());
-                TradingClearingRegistry tcr = tradingClearingRegistryImdg.getFirstObjectByFieldValues(queryTCR);
-                if (tcr == null) {
-                    log.warn("TradingClearingRegistry by {} not found, do not send update TCR.", queryTCR);
-                } else {
-                    tcrReq.setId(tcr.getId());
-                    String destination = Consts.DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE;
-                    log.debug("Send message to kafka \"{}\": {}", destination, LogFormatter.toStringWrapper(tcrReq));
-                    kafkaSender.sendRequestToQueue(destination, tcrReq);
                 }
             }
-            countOfUpdated++;
+            txOk = true;
-        } else {
+        } finally {
-            log.info("Account[{}] \"{}\" do not updated - same status \"{}\"", account.getId(), account.getAccount(), newStatus);
+            if (txOk) {
+                imdgTransaction.commitTransaction();
+            } else {
+                log.debug("failed update, clearing accounts, rollback transaction. Request id={}; sdf52 groupId={}", systemRequest.getId(), groupId);
+                imdgTransaction.rollbackTransaction();
+            }
         }
 
-        log.debug("successfully processed, grouping id={}. Updated {} accounts.",
+        if (txOk) {
-                groupId, countOfUpdated);
+            sdfProcessService.process(req, toProcessSDF53);
-        return null;
+        }
-    }
 
-    protected String makeSdfErrorText(IErrorEnumId clrError, String sdfCode) {
+        log.debug("successfully processed, grouping id={}. Updated {} of {} accounts.",
-        if (clrError == null) return sdfCode;
+                groupId, countOfUpdated, toUpdate.size());
-        sdfCode = clrError.getId().toString();
+        return null;
-        if (sdfCode.length() > 3)
-            sdfCode = sdfCode.substring(sdfCode.length() - 3);
-        return sdfCode;
     }
 
     public void sendStatementRequestBack(Long groupingSdf01Id, Long groupSdf02Id, List<AccountSdfToStatementRequestPart> results) {
@@ -511,107 +431,4 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         log.debug("Send message to kafka \"{}\": {}", destination, LogFormatter.toStringWrapper(request));
         kafkaSender.sendRequestToQueue(destination, request);
     }
-
-    public Long sendNotificationRequest(ObjectType objectType, Account account, AccountStatus requestToStatus) {
-        String statusText = AccountStatus.BLOCKED == requestToStatus ? "Заблокирован"
-                : AccountStatus.CLOSE == requestToStatus ? "Закрыт"
-                : AccountStatus.ACTIVE == requestToStatus ? "Разблокирован" :
-                requestToStatus.getKey();
-        String message = String.format("Для счета %s будет изменен статус на «%s»", account.getAccount(), statusText);
-        final String destination = Consts.NOTIFICATION_NEW;
-        NotificationNewRequest request = new NotificationNewRequest();
-        request.setObjectType(objectType.getKey());
-        request.setObjectId(account.getId());
-        request.setPriority(Priority.HIGH.getKey());
-        request.setComment(message);
-        log.debug("Send message to kafka \"{}\": {}", destination, LogFormatter.toStringWrapper(request));
-        Long rKey = kafkaSender.sendRequestToQueue(destination, request);
-        log.trace("About account.id={} send notification request id={}", account.getId(), rKey);
-        return rKey;
-    }
-
-
-    // --------- notification apply system -----------
-    public static class SDF52WaitingData {
-        public BaseRequest<StatementRequest> systemRequest;
-        public SDf52 sdf;
-        public Account account;
-        public Long notAnsweredAccountId;
-        public String globalStatus;
-
-        public SDF52WaitingData(BaseRequest<StatementRequest> systemRequest, SDf52 sdf, Account account) {
-            this.systemRequest = systemRequest;
-            this.sdf = sdf;
-            this.account = account;
-            this.notAnsweredAccountId = account.getId();
-        }
-
-        public Long getGroupId() {
-            if (systemRequest != null && systemRequest.getRequestPayload() != null)
-                return systemRequest.getRequestPayload().getGroupId();
-            return null;
-        }
-    }
-
-    protected ConcurrentHashMap<Long, SDF52WaitingData> waitingList = new ConcurrentHashMap<>();
-
-    public boolean putNotificationWaiting(BaseRequest<StatementRequest> systemRequest, SDf52 sdf, Account account) {
-        SDF52WaitingData data = new SDF52WaitingData(systemRequest, sdf, account);
-        if (waitingList.contains(data.notAnsweredAccountId)) {
-            log.warn("groupId={} accountId={} already waiting", data.getGroupId(), data.notAnsweredAccountId);
-        }
-        data.globalStatus = null;
-        waitingList.put(data.notAnsweredAccountId, data);
-        return true;
-    }
-
-    /**
-     * @return triggered SDF52WaitingData or null
-     */
-    public SDF52WaitingData onNotificationResponse(NotificationFeedbackRequest onNotification) {
-        if (onNotification.getNotificationId() == null) {
-            log.trace("notificationId was empty");
-            return null;
-        }
-        Notification notification = notificationImdg.getSingleObjectByID(onNotification.getNotificationId());
-        if (notification == null) {
-            log.warn("Notification with id={} not exist", onNotification.getNotificationId());
-            return null;
-        }
-        if (!ObjectType.account_active.equalsByKey(notification.getObjectType()) && !ObjectType.account_block.equalsByKey(notification.getObjectType())) {
-            log.warn("Notification[{}].objectType={} not supported", notification.getId(), notification.getObjectType());
-            return null;
-        }
-        if (notification.getObjectId() == null) {
-            log.warn("Notification[{}] with empty objectId", notification.getId());
-            return null;
-        }
-        final Long accountId = notification.getObjectId();
-        log.trace("Match accountId={} by notificationId={}", accountId, notification.getId());
-        SDF52WaitingData inWaitingLst = waitingList.get(accountId);
-        if (inWaitingLst == null) {
-            log.debug("SDF52 waiting list (count {}) not found for accountId={}", waitingList.size(), accountId);
-            return null;
-        }
-        boolean returnTrigger = false;
-        if (NotificationStatus.ACPT.equalsByKey(onNotification.getNotificationStatus())) {
-            log.trace("Triggered ACPT, by accountId={}", accountId);
-            inWaitingLst.globalStatus = onNotification.getNotificationStatus();
-            returnTrigger = true;
-        } else if (NotificationStatus.CNCL.equalsByKey(onNotification.getNotificationStatus())) {
-            log.trace("Triggered CNCL, by accountId={}", accountId);
-            inWaitingLst.globalStatus = onNotification.getNotificationStatus();
-            returnTrigger = true;
-        } else {
-            log.warn("Unknown notification[{}] status={}", onNotification.getNotificationId(), onNotification.getNotificationStatus());
-        }
-        if (returnTrigger) {
-            log.debug("Remove from waiting list accountId={} (list groupId={})", accountId, inWaitingLst.getGroupId());
-            waitingList.remove(inWaitingLst);
-        }
-        if (returnTrigger)
-            return inWaitingLst;
-        else
-            return null;
-    }
 }

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/DepoAccountService.java

@@ -23,7 +23,10 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.SdfTable;
+import ru.spcex.platform.enumeration.ServiceStatus;
+import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.ImdgTransaction;
@@ -41,7 +44,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
     private final KafkaSender kafkaSender;
     private final ValidationHelper validationHelper;
     private final ImdgProvider imdgProvider;
-    private final AccountHelper accountService;
+    private final AccountService accountService;
     private final Function<DepoAccountNewRequest, IValidator> depoAccountNewRequestValidator;
 
     public DepoAccountService(Consumer<String, Object> kafkaQueue,
@@ -49,7 +52,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
                               KafkaSender kafkaSender,
                               ValidationHelper validationHelper,
                               ImdgProvider imdgProvider,
-                              AccountHelper accountService,
+                              AccountService accountService,
                               @Qualifier("depoAccountNewRequestValidator")
                                       Function<DepoAccountNewRequest, IValidator> depoAccountNewRequestValidator) {
         super(kafkaQueue, kafkaProducer);
@@ -111,11 +114,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
             depoAccount = new DepoAccount();
             depoAccount.setCompanyId(req.getCompanyId());
             depoAccount.setAccountId(accountId);
-            if (account.getAccount() != null && account.getAccount().contains("BC")) {
+            depoAccount.setDepoAccountType(req.getDepoAccountType());
-                depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
-            } else {
-                depoAccount.setDepoAccountType(req.getDepoAccountType());
-            }
             depoAccountId = depoAccountImdg.insert(depoAccount);
             txOk = true;
         } finally {
@@ -169,7 +168,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
                         continue accountsLoop;
                     }
                 }
-                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
+                if (accountImdg.getFirstObjectBySQL("accountType = '%s' and account = '%s'".formatted(AccountType.Depo.getKey(), accountReq.getAccount())) != null) {
                     log.debug("Account {} already exists", accountReq.getAccount());
                     {
                         AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
@@ -189,11 +188,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
                 DepoAccount depoAccount = new DepoAccount();
                 depoAccount.setCompanyId(accountReq.getCompanyId());
                 depoAccount.setAccountId(accountId);
-                if (account.getAccount() != null && account.getAccount().contains("BC")) {
+                depoAccount.setDepoAccountType(accountReq.getAccountType());
-                    depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
-                } else {
-                    depoAccount.setDepoAccountType(accountReq.getAccountType());
-                }
                 depoAccountId = depoAccountImdg.insert(depoAccount);
 
 

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/InformationAccountService.java

@@ -22,7 +22,6 @@ import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 import ru.spcex.platform.enumeration.AccountType;
@@ -51,10 +50,9 @@ public class InformationAccountService extends QueueConsumer implements Initiali
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final KafkaSender kafkaSender;
     private final IMessageResolver messageResolver;
-    private final UserRoleVerification userRoleVerification;
     private final ImdgProvider imdgProvider;
     private final ValidationHelper validationHelper;
-    private final AccountHelper accountHelper;
+    private final AccountService accountService;
     private final RequestHelper requestHelper;
     private final Function<InformationAccountNewRequest, IValidator> infoAccountNewRequestValidator;
     private final Imdg<InformationAccount> informationAccountImdg;
@@ -70,20 +68,18 @@ public class InformationAccountService extends QueueConsumer implements Initiali
                                      Producer<String, Object> kafkaResponseQueue,
                                      KafkaSender kafkaSender,
                                      IMessageResolver messageResolver,
-                                     UserRoleVerification userRoleVerification,
                                      ImdgProvider imdgProvider,
                                      ValidationHelper validationHelper,
-                                     AccountHelper accountHelper,
+                                     AccountService accountService,
                                      RequestHelper requestHelper,
                                      @Qualifier("informationAccountNewRequestValidator")
                                              Function<InformationAccountNewRequest, IValidator> infoAccountNewRequestValidator) {
         super(kafkaQueue, kafkaResponseQueue);
         this.kafkaSender = kafkaSender;
         this.messageResolver = messageResolver;
-        this.userRoleVerification = userRoleVerification;
         this.imdgProvider = imdgProvider;
         this.validationHelper = validationHelper;
-        this.accountHelper = accountHelper;
+        this.accountService = accountService;
         this.requestHelper = requestHelper;
         this.infoAccountNewRequestValidator = infoAccountNewRequestValidator;
         this.informationAccountImdg = imdgProvider.getImdg(
@@ -105,13 +101,10 @@ public class InformationAccountService extends QueueConsumer implements Initiali
         init();
     }
 
-    @Deprecated
     public RequestInfoUpdate informationAccountNew(BaseRequest<InformationAccountNewRequest> userRequest) {
         log.debug("InformationAccountNewRequest received");
 
-        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
+        RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, infoAccountNewRequestValidator);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
-        requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, infoAccountNewRequestValidator);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         InformationAccountNewRequest req = userRequest.getRequestPayload();
@@ -135,7 +128,7 @@ public class InformationAccountService extends QueueConsumer implements Initiali
 
         Instant now = Instant.now();
         Account account = new Account();
-        account.setAccount(req.getAccount());
+        account.setAccount(accountValue);
         account.setAccountType(AccountType.Info.getKey());
         if (req.getStatus() == null) {
             account.setStatus(WorkflowStatus.Active.getKey());
@@ -146,8 +139,7 @@ public class InformationAccountService extends QueueConsumer implements Initiali
         account.setCompanyId(req.getCompanyId());
         account.setCreated(now);
         account.setUpdated(now);
-
+        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), true);
-        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), true);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
@@ -239,7 +231,7 @@ public class InformationAccountService extends QueueConsumer implements Initiali
         account.setCompanyId(forCompanyId);
         account.setCreated(now);
         account.setUpdated(now);
-        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), false);
+        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), false);
         if (requestInfoUpdate != null) {
             log.debug("Stop make new account, cause error: {}", requestInfoUpdate.getMessage());
             return requestInfoUpdate;
@@ -304,7 +296,7 @@ public class InformationAccountService extends QueueConsumer implements Initiali
      *
      * @return infoCounter++
      */
-    public synchronized Long accountNextId() {
+    protected Long accountNextId() {
         if (infoCounter == null) synchronized (this) {
             if (infoCounter == null) {
                 log.debug("Init account-information counter.");

clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/SDFProcessService.java

@@ -6,43 +6,31 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.misc.Notification;
 import ru.clearing.classes.statics.data.sdf.SDf52;
 import ru.clearing.classes.statics.data.sdf.SDf53;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationFeedbackRequest;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.platform.enumeration.AccountStatus;
-import ru.spcex.platform.enumeration.NotificationStatus;
-import ru.spcex.platform.enumeration.ObjectType;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.ImdgTransaction;
-import ru.spcex.platform.utils.collection.Pair;
 
 import java.time.Instant;
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 @Service
 public class SDFProcessService {
-    public static final String SDF_STATUS_OK = "OK"; // (Операция выполнена успешно) - если account обновлена по sDf52;
+    public static final String SDF_STATUS_OK = "0"; // (Операция выполнена успешно) - если account обновлена по sDf52;
     public static final String SDF_STATUS_ERROR_REPEAT = "1"; // (Ошибка. Попытка повторно исполнить операцию)
     public static final String SDF_STATUS_ERROR_COMPANY_NOT_FOUND = "2"; // (Ошибка. Участник не найден) - если получена ошибка (5013) "Компания %s не найдена" (т.е. account НЕ обновлена по sDf52);
     public static final String SDF_STATUS_ERROR_LIMIT_SUMM = "3"; // (Ошибка. Сумма списания превышает сумму средств на торговом счете участника в ТС)
     public static final String SDF_STATUS_ERROR_NO_TRADE = "4"; // (Ошибка. Торги не идут)
     public static final String SDF_STATUS_ERROR = "9"; // (Другие ошибки, выявленные в КС) - если получены другие ошибки (т.е. account НЕ обновлена по sDf52).
 
-    protected static final Long SDF52_STATUS_0Blocked = 0L;
-    protected static final Long SDF52_STATUS_1Unblocked = 1L;
-    protected static final Long SDF52_STATUS_2Closed = 2L;
-    protected static final Long SDF52_STATUS_3Open = 3L;
-
     final protected Logger log = LoggerFactory.getLogger(getClass());
 
     protected final Producer<String, Object> kafkaResponseQueue;
@@ -114,7 +102,6 @@ public class SDFProcessService {
         newSdf.setAccName(sdf52.getAcc_name());
         newSdf.setAccount(sdf52.getAccount());
         newSdf.setDeal(sdf52.getDeal());
-        newSdf.setDate(sdf52.getDate());
         newSdf.setStatus(sdf52.getStatus());
         newSdf.setResult(result);
         newSdf.setGenerationTime(now);
@@ -134,12 +121,12 @@ public class SDFProcessService {
      * @return AccountStatus или null
      */
     public AccountStatus parseSdf52Status(Long status) {
-        if (SDF52_STATUS_1Unblocked.equals(status) || SDF52_STATUS_3Open.equals(status)) {
+        if (Long.valueOf(1L).equals(status)) {
             return AccountStatus.ACTIVE;
-        } else if (SDF52_STATUS_0Blocked.equals(status)) {
+        } else if (Long.valueOf(0L).equals(status)) {
             return AccountStatus.BLOCKED;
         }
-        if (SDF52_STATUS_2Closed.equals(status)) {
+        if (Long.valueOf(2L).equals(status)) {
             return AccountStatus.CLOSE;
         }
         return null;
@@ -156,5 +143,4 @@ public class SDFProcessService {
         log.debug("Send ExportToFileRequest({}, {}) message id={} to kafka \"{}\"",
                 groupId, request.getNameOfTable(), msgId, destination);
     }
-
 }

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/AccountServiceTest.java

@@ -1,5 +1,7 @@
 package ru.spcex.clearing.account.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
@@ -21,28 +23,40 @@ import ru.clearing.platform.dictionary.AccountTypeDictionary;
 import ru.clearing.platform.dictionary.ServiceStatusDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
-import ru.spcex.clearing.account.config.validation.InformationAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.AccountSdfToStatementRequestPart;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.service.RequestInfo;
-import ru.spcex.clearing.test.MatcherFactory;
+import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
 import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.test.TestUtils.*;
+import static ru.spcex.clearing.test.config.ImdgTestConfig.currentID;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -50,9 +64,6 @@ import static ru.spcex.clearing.test.TestUtils.*;
         ValidationConfig.class,
         AccountValidationConfig.class,
         AccountService.class,
-        AccountHelper.class,
-        InformationAccountService.class,
-        InformationAccountValidationConfig.class,
         ImdgTestConfig.class,
         KafkaTestConfig.class})
 class AccountServiceTest {
@@ -198,16 +209,8 @@ class AccountServiceTest {
         waitingSendAndCheckRecord(0L, mockProducer);
 
         Account resultUpdating = accountImdg.getSingleObjectByID(accountId);
-        Account expectAccount = new Account();
+        existAccount.setUpdated(resultUpdating.getUpdated());
-        expectAccount.setId(existAccount.getId());
+        ACCOUNT_MATCHER.assertMatch(resultUpdating, existAccount);
-        expectAccount.setAccount(account);
-        expectAccount.setAccountType(AccountType.Corr.getKey());
-        expectAccount.setStatus(ServiceStatus.Closed.getKey());
-        expectAccount.setCompanyId(companyId);
-        expectAccount.setCreated(existAccount.getCreated());
-        expectAccount.setUpdated(resultUpdating.getUpdated());
-        expectAccount.setStatus(ServiceStatus.Active.getKey());
-        ACCOUNT_MATCHER.assertMatch(resultUpdating, expectAccount);
         accountImdg.delete(resultUpdating);
     }
 

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/AccountSymbolsServiceTest.java

@@ -1,164 +0,0 @@
-package ru.spcex.clearing.account.service;
-
-import org.apache.kafka.clients.consumer.MockConsumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import ru.clearing.classes.statics.data.account.*;
-import ru.spcex.clearing.account.config.BeanConfiguration;
-import ru.spcex.clearing.account.config.validation.AccountSymbolsValidationConfig;
-import ru.spcex.clearing.account.config.validation.ValidationConfig;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountSymbolsNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.test.MatcherFactory;
-import ru.spcex.clearing.test.TestObjectCreator;
-import ru.spcex.clearing.test.config.ImdgTestConfig;
-import ru.spcex.clearing.test.config.KafkaTestConfig;
-import ru.spcex.platform.enumeration.*;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.test.TestUtils.*;
-import static ru.spcex.clearing.test.config.KafkaTestConfig.setMockFuture;
-
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {
-        BeanConfiguration.class,
-        ValidationConfig.class,
-        AccountSymbolsValidationConfig.class,
-        AccountSymbolsService.class,
-        ImdgTestConfig.class,
-        KafkaTestConfig.class})
-class AccountSymbolsServiceTest {
-    public static final MatcherFactory.Matcher<AccountSymbols> ACCOUNT_SYMBOL_MATCHER = usingIgnoringFieldsComparator();
-    private static final int PARTITION = 0;
-
-    @Autowired
-    AccountSymbolsService accountSymbolsService;
-    @Autowired
-    @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
-
-    @Autowired
-    @Qualifier("mockProducer")
-    protected Producer<String, Object> mockProducer;
-
-    @Autowired
-    @Qualifier("kafkaTestTemplate")
-    protected KafkaTemplate<String, Object> kafkaTemplate;
-
-    private Imdg<AccountSymbols> accountSymbolsImdg;
-
-    private Imdg<Account> accountImdg;
-    private Long accountId;
-    private Imdg<ClearingAccount> clearingAccountImdg;
-    private Long clearingAccountId;
-
-    static int newRequestCnt = 0;
-
-    @PostConstruct
-    private void init() {
-        hazelcastServiceTest.waitAvailable();
-        accountSymbolsImdg = hazelcastServiceTest.getImdg(
-                IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class
-        );
-        accountImdg = hazelcastServiceTest.getImdg(
-                IMDGDistributedNames.Map_Account, Account.class
-        );
-        clearingAccountImdg = hazelcastServiceTest.getImdg(
-                IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class
-        );
-
-        Account account = new Account();
-        account.setStatus(ServiceStatus.Active.getKey());
-        account.setAccountType(AccountType.Clrn.getKey());
-        accountId = accountImdg.insert(account);
-
-        ClearingAccount clearingAccount = new ClearingAccount();
-        clearingAccount.setAccountId(accountId);
-        clearingAccount.setClearingAccountType("CAT");
-        clearingAccountId = clearingAccountImdg.insert(clearingAccount);
-
-        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
-    }
-
-    @PreDestroy
-    private void destroyTest() {
-        //clean test data
-        Account account = accountImdg.getSingleObjectByID(accountId);
-        if (account != null)
-            accountImdg.delete(account);
-        ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(clearingAccountId);
-        if (clearingAccount != null)
-            clearingAccountImdg.delete(clearingAccount);
-    }
-
-    @Test
-    void tradingClearingRegistryNew_moneyAccount_clearingAccount() {
-        setMockFuture(kafkaTemplate);
-        AccountSymbolsNewRequest accountSymbolsNewRequest = new AccountSymbolsNewRequest();
-        accountSymbolsNewRequest.setAccountId(accountId);
-        accountSymbolsNewRequest.setAccountSymbolValue("SYMBOL1");
-
-        AccountSymbols predictableAccountSymbols = new AccountSymbols();
-        predictableAccountSymbols.setAccountId(accountId);
-        predictableAccountSymbols.setAccountSymbolValue("SYMBOL1");
-
-        String jsonString = getJsonStringForNew(accountSymbolsNewRequest, 0L);
-
-        addRecordToKafka((MockConsumer) accountSymbolsService.getConsumer(),
-                Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_NEW,
-                newRequestCnt,
-                0,
-                jsonString);
-
-        waitingSendAndCheckRecord(0L, mockProducer);
-
-        AccountSymbols resultNew = accountSymbolsImdg.getAllValues().iterator().next();
-        predictableAccountSymbols.setId(resultNew.getId());
-
-        ACCOUNT_SYMBOL_MATCHER.assertMatch(resultNew, predictableAccountSymbols);
-        accountSymbolsImdg.delete(resultNew); // cleanup test
-
-        newRequestCnt++;
-    }
-
-    @Test
-    void tradingClearingRegistryDelete() {
-        AccountSymbols existAccountSymbols = new AccountSymbols();
-        existAccountSymbols.setAccountId(accountId);
-        existAccountSymbols.setAccountSymbolValue("SYMBOL 2");
-        Long accountSymbolId = accountSymbolsImdg.insert(existAccountSymbols);
-
-        CommonDeleteRequest accountSymbolsDeleteRequest = new CommonDeleteRequest();
-        accountSymbolsDeleteRequest.setId(accountSymbolId);
-
-        String jsonString = getJsonStringForDelete(accountSymbolsDeleteRequest, 0);
-
-        //ACT
-        addRecordToKafka((MockConsumer) accountSymbolsService.getConsumer(),
-                Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_DELETE,
-                PARTITION,
-                0,
-                jsonString);
-
-        //ASSERT
-        waitingSendAndCheckRecord(0L, mockProducer);
-
-        AccountSymbols resultUpdating = accountSymbolsImdg.getSingleObjectByID(accountSymbolId);
-        Assertions.assertNull(resultUpdating, "Должен был удалиться");
-    }
-
-}

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java

@@ -1,13 +1,17 @@
 package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -21,6 +25,7 @@ import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.BankAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
 import ru.spcex.clearing.account.errors.AccountError;
+import ru.spcex.clearing.account.utils.MatcherFactory.Matcher;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
@@ -29,13 +34,12 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountNewReq
 import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.test.MatcherFactory.Matcher;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 
@@ -45,14 +49,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.platform.messaging.service.Status.Error;
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.test.TestUtils.*;
-import static ru.spcex.clearing.test.config.KafkaTestConfig.getCaptor;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
-        AccountHelper.class,
+        AccountService.class,
         BankAccountService.class,
         ValidationConfig.class,
         BankAccountValidationConfig.class,
@@ -94,11 +97,15 @@ public class BankAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
     @Autowired
     private BankAccountService bankAccountService;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
@@ -209,11 +216,11 @@ public class BankAccountServiceTest {
         //AccountValidationRule.RequiredFields
         //WrongFieldValue
         bankAccountNewRequest.setCurrency(null);
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "null, currency"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "currency"));
         checkError(errMsg, bankAccountNewRequest);
 
         bankAccountNewRequest.setCurrency("TT0");
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.DictionaryNotFound, "TT0, CurrencyCodeDictionary"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.WrongFieldValue, "currency"));
         checkError(errMsg, bankAccountNewRequest);
 
         bankAccountNewRequest.setCurrency(currency);
@@ -232,20 +239,36 @@ public class BankAccountServiceTest {
         checkError(errMsg, bankAccountNewRequest);
 
         bankAccountNewRequest.setAccount(acc);
+        bankAccountNewRequest.setDestination(null);
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "destination"));
+        checkError(errMsg, bankAccountNewRequest);
+
+        bankAccountNewRequest.setDestination(destination);
+        bankAccountNewRequest.setCompanyId(null);
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "companyId"));
+        checkError(errMsg, bankAccountNewRequest);
+        bankAccountNewRequest.setCompanyId(addresseeIdNew);
 
         //AccountValidationRule.CompanyPresent
         //CompanyNotFound
         bankAccountNewRequest.setCompanyId(999924535239L);
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.CompanyNotFound, bankAccountNewRequest.getCompanyId()+", companyId"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.CompanyNotFound, "companyId"));
         checkError(errMsg, bankAccountNewRequest);
 
+        //CompanyNotActive
+        company.setWorkflowStatus(Status.Blocked.getKey());
+        companyImdg.insert(company);
         bankAccountNewRequest.setCompanyId(company.getId());
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.CompanyNotActive, "companyId"));
+        checkError(errMsg, bankAccountNewRequest);
 
         //AccountValidationRule.AccountIsNew
         //AccountAlreadyExist
+        company.setWorkflowStatus(Status.Active.getKey());
+        companyImdg.insert(company);
         Account existAccount = getTestAccount(accountId, acc);
         accountImdg.insert(existAccount);
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.AccountAlreadyExist, existAccount.getAccount()));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.AccountAlreadyExist, "account"));
         checkError(errMsg, bankAccountNewRequest);
         accountImdg.delete(existAccount);
     }
@@ -268,9 +291,8 @@ public class BankAccountServiceTest {
         //ACT
         addRecordToKafka((MockConsumer) bankAccountService.getConsumer(), TOPIC_ACCOUNT_NEW, PARTITION, currentOffset, jsonString);
 
-        ArgumentCaptor<ProducerRecord> producerRecord = getCaptor(mockProducer);
         //waiting for kafka producer send message (finale event)
-        verify(mockProducer, timeout(30_000L).times(currentTime))
+        verify(producer, timeout(30_000L).times(currentTime))
                 .send(producerRecord.capture());
         BaseRequest<Object> baseRequestResult = (BaseRequest<Object>) producerRecord.getValue().value();
 
@@ -346,13 +368,13 @@ public class BankAccountServiceTest {
     }
 
     /**
-     * {@link BankAccountService#bankAccountBlock(BaseRequest)}
+     * {@link BankAccountService#bankAccountDelete(BaseRequest)}
      * Тест проверяет удаление сущности {@link BankAccount} в Hazelcast при передаче из Apache Kafka.
      * Входной запрос {@link CommonDeleteRequest}:
      * {@link CommonDeleteRequest#id} - Идентификатор записи
      */
     @Test
-    void bankAccountBlock() {
+    void bankAccountDelete() {
         //ARRANGE
         BankAccount bankAccountExists = getBankAccount();
         bankAccountImdg.insert(bankAccountExists);
@@ -371,8 +393,8 @@ public class BankAccountServiceTest {
         //ASSERT
         waitingSendAndCheckRecord(ID, mockProducer);
 
-        Account bankAccount = accountImdg.getSingleObjectByID(accountId);
+        BankAccount bankAccount = bankAccountImdg.getSingleObjectByID(ID);
-        assertEquals(bankAccount.getStatus(), WorkflowStatus.Blocked.getKey());
+        Assertions.assertNull(bankAccount);
     }
 
     private Company getTestCompany() {

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/ClearingAccountServiceTest.java

@@ -1,13 +1,17 @@
 package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -21,31 +25,25 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ClearingAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
-import ru.spcex.clearing.account.errors.AccountError;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClearingAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClearingAccountUpdateRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
-import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
 
 import javax.annotation.PostConstruct;
-import java.util.Collections;
 import java.util.Map;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.test.TestUtils.*;
-import static ru.spcex.clearing.test.config.ImdgTestConfig.currentID;
-import static ru.spcex.clearing.test.config.KafkaTestConfig.setMockFuture;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -53,9 +51,8 @@ import static ru.spcex.clearing.test.config.KafkaTestConfig.setMockFuture;
         ValidationConfig.class,
         ClearingAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountHelper.class,
+        AccountService.class,
         ClearingAccountService.class,
-        SDFProcessService.class,
         ImdgTestConfig.class,
         KafkaTestConfig.class})
 class ClearingAccountServiceTest {
@@ -73,16 +70,16 @@ class ClearingAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
 
-    @Autowired
-    @Qualifier("kafkaTestTemplate")
-    protected KafkaTemplate<String, Object> kafkaTemplate;
-
     private Imdg<ClearingAccount> clearingAccountImdg;
     private Imdg<Account> accountImdg;
     private Imdg<Company> companyImdg;
@@ -163,7 +160,8 @@ class ClearingAccountServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        verify(producer, timeout(30_000L).times(2))
+                .send(producerRecord.capture());
 
         Account predictableAccount = new Account();
         predictableAccount.setAccount(ACCOUNT_VALUE);
@@ -227,64 +225,77 @@ class ClearingAccountServiceTest {
         ACCOUNT_MATCHER.assertMatch(accountResult, predictableAccount);
     }
 
-    @Test
+//    /**
-    void makeSdfErrorText() {
+//     * {@link ClearingAccountService#accountNewSdf01(BaseRequest)}<br>
-        Assertions.assertEquals("013", clearingAccountService.makeSdfErrorText(AccountError.CompanyNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
+//     * Тест проверяет создание сущности {@link BaseRequest} в Hazelcast при передаче из Apache Kafka.<br>
-        Assertions.assertEquals("2", clearingAccountService.makeSdfErrorText(null, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
+//     * Входной запрос {@link AccountSdf01Request}:<br>
-    }
+//     * {@link AccountSdfRequestPart#setSdfId} - текущий Id<br>
-
+//     * {@link AccountSdfRequestPart#setAccount} - 123456789123<br>
-    /**
+//     * {@link AccountSdfRequestPart#setCompanyId} - текущий Id<br>
-     * {@link ClearingAccountService#accountNewSdf01(BaseRequest)}<br>
+//     * {@link AccountSdf01Request#setGroupingSdf01Id} - текущий Id<br>
-     * Тест проверяет создание сущности {@link BaseRequest} в Hazelcast при передаче из Apache Kafka.<br>
+//     * {@link AccountSdf01Request#setAccounts} - Collections.singletonList(AccountSdfRequestPart)<br>
-     * Входной запрос {@link AccountSdf01Request}:<br>
+//     */
-     * {@link AccountSdfRequestPart#setSdfId} - текущий Id<br>
+//    @Test
-     * {@link AccountSdfRequestPart#setAccount} - 123456789123<br>
+//    void accountSdf01New() throws InterruptedException {
-     * {@link AccountSdfRequestPart#setCompanyId} - текущий Id<br>
+//        //ARRANGE
-     * {@link AccountSdf01Request#setGroupingSdf01Id} - текущий Id<br>
+//        Long firstID = currentID.getAndIncrement();
-     * {@link AccountSdf01Request#setAccounts} - Collections.singletonList(AccountSdfRequestPart)<br>
+//        Long secondID = currentID.getAndIncrement();
-     */
+//        AccountSdfRequestPart accountSdfRequestPart = new AccountSdfRequestPart();
-    @Test
+//        accountSdfRequestPart.setSdfId(firstID);
-    void accountSdf01New() throws InterruptedException {
+//        accountSdfRequestPart.setAccount(account);
-        //ARRANGE
+//        accountSdfRequestPart.setCompanyId(firstID);
-        clearImdg(accountImdg);
+//        AccountSdf01Request accountSdf01Request = new AccountSdf01Request();
-        setMockFuture(kafkaTemplate);
+//        accountSdf01Request.setGroupingSdf01Id(firstID);
-        Long firstID = currentID.getAndIncrement();
+//        accountSdf01Request.setAccounts(Collections.singletonList(accountSdfRequestPart));
-        Long secondID = currentID.getAndIncrement();
+//        BaseRequest<AccountSdf01Request> baseNewRequest = new BaseRequest<>();
-        AccountSdfRequestPart accountSdfRequestPart = new AccountSdfRequestPart();
+//        baseNewRequest.setRequestPayload(accountSdf01Request);
-        accountSdfRequestPart.setSdfId(firstID);
+//        baseNewRequest.setId(firstID);
-        accountSdfRequestPart.setAccount(ACCOUNT_VALUE);
+//        baseNewRequest.setActionType(ActionType.NEW);
-        accountSdfRequestPart.setCompanyId(firstID);
+//        String jsonBaseNewRequest;
-        AccountSdf01Request accountSdf01Request = new AccountSdf01Request();
+//        ObjectMapper objectMapper = new ObjectMapper();
-        accountSdf01Request.setGroupingSdf01Id(firstID);
+//        try {
-        accountSdf01Request.setAccounts(Collections.singletonList(accountSdfRequestPart));
+//            jsonBaseNewRequest = objectMapper.writeValueAsString(baseNewRequest);
-
+//        } catch (JsonProcessingException e) {
-        String jsonString = getJsonStringForNew(accountSdf01Request, 0L);
+//            throw new RuntimeException(e);
-
+//        }
-        Account predictableAccount = new Account();
+//
-        predictableAccount.setAccount(ACCOUNT_VALUE);
+//        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
-        predictableAccount.setCompanyId(firstID);
+//        responsePart.setSdfId(firstID);
-        predictableAccount.setAccountType(AccountType.Clrn.getKey());
+//        responsePart.setErrorCode(null);
-        predictableAccount.setStatus(ServiceStatus.Active.getKey());
+//        responsePart.setErrorText(null);
-        predictableAccount.setRelationId(relationId);
+//        List<AccountSdfToStatementRequestPart> accountToStatement = Collections.singletonList(responsePart);
-        ClearingAccount predictableClearingAccount = new ClearingAccount();
+//        StatementRequest statementRequest = new StatementRequest();
-        predictableClearingAccount.setCompanyId(companyId);
+//        statementRequest.setGroupId(firstID);
-//        predictableClearingAccount.setClearingAccountType(CLEARING_ACCOUNT_TYPE_DICT);
+//        statementRequest.setAccountCreationResults(accountToStatement);
-
+//
-        //KAFKA
+//        BaseRequest<Object> baseRequest = new BaseRequest<>();
-        addRecordToKafka((MockConsumer) clearingAccountService.getConsumer(), Consts.ACCOUNT_NEW_SDF01, PARTITION, 0, jsonString);
+//        baseRequest.setId(secondID);
-        waitingSendAndCheckRecord(0L, mockProducer);
+//        baseRequest.setActionType(ActionType.SYSTEM);
-
+//        baseRequest.setRequestPayload(statementRequest);
-        ImdgHazelcast<Account> accountImdg = (ImdgHazelcast<Account>) hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+//
-
+//        Account predictableAccount = new Account();
-        //ASSERT
+//        predictableAccount.setAccount(account);
-        Account accountResult = accountImdg.getSingleObjectBySQL(String.format("account = %s", ACCOUNT_VALUE));
+//        predictableAccount.setCompanyId(firstID);
-        ClearingAccount resultClearingAccountNew = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", accountResult.getId()));
+//
-        predictableAccount.setId(accountResult.getId());
+//        RequestInfo predictableRequestInfo = new RequestInfo();
-        predictableClearingAccount.setAccountId(accountResult.getId());
+//        predictableRequestInfo.setId(secondID);
-        predictableClearingAccount.setId(resultClearingAccountNew.getId());
+//        predictableRequestInfo.setStatus(Status.Processing);
-        predictableAccount.setId(accountResult.getId());
+//
-        ACCOUNT_MATCHER.assertMatch(accountResult, predictableAccount);
+//        //KAFKA
-        CLEARING_ACCOUNT_MATCHER.assertMatch(resultClearingAccountNew, predictableClearingAccount);
+//        final String TOPIC_ACCOUNT_NEW = Consts.ACCOUNT_NEW_SDF01;
-        accountImdg.delete(accountResult);
+//        addRecordToKafka((MockConsumer) accountService.getConsumer(), TOPIC_ACCOUNT_NEW, PARTITION, 0, jsonBaseNewRequest);
-    }
+//
+//        //waiting for kafka producer send message (finale event)
+//        verify(producer, timeout(30_000L).times(2))
+//                .send(producerRecord.capture());
+//        //todo переписать валидацию ожидания на новые waitingSendAndCheckRecord / waitingWhenTryAddRecordAndCheckError
+//
+//        ImdgHazelcast<Account> accountImdg = (ImdgHazelcast<Account>) hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+//
+//        //ASSERT
+//        Account accountResult = accountImdg.getSingleObjectBySQL(String.format("account = %s", account));
+//        predictableAccount.setId(accountResult.getId());
+//        ACCOUNT_MATCHER.assertMatch(accountResult, predictableAccount);
+//        accountImdg.delete(accountResult);
+//    }
 }

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/ClientCodeServiceTest.java

@@ -24,13 +24,13 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.ClientCodeValidationConfig;
 import ru.spcex.clearing.account.config.validation.TradingClearingRegistryValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.TestUtils;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
@@ -376,7 +376,7 @@ class ClientCodeServiceTest {
 
         waitingSendAndCheckRecord(ID, mockProducer);
         ClientCode resultUpdate = clientCodeImdg.getSingleObjectByID(ID);
-        assertEquals(WorkflowStatus.Blocked.getKey(), resultUpdate.getStatus());
+        Assertions.assertNull(resultUpdate);
     }
 
 //    /**

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/DepoAccountServiceTest.java

@@ -1,11 +1,16 @@
 package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -19,22 +24,25 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.DepoAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.DepoAccountNewRequest;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
 import java.util.Map;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
-import static ru.spcex.clearing.test.TestUtils.*;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.addRecordToKafka;
+import static ru.spcex.clearing.test.TestUtils.getJsonStringForNew;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -42,7 +50,7 @@ import static ru.spcex.clearing.test.TestUtils.*;
         ValidationConfig.class,
         DepoAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountHelper.class,
+        AccountService.class,
         DepoAccountService.class,
         ImdgTestConfig.class,
         KafkaTestConfig.class})
@@ -61,8 +69,12 @@ class DepoAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
@@ -147,7 +159,8 @@ class DepoAccountServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        verify(producer, timeout(30_000L).times(2))
+                .send(producerRecord.capture());
 
         Account predictableAccount = new Account();
         predictableAccount.setAccount(ACCOUNT_VALUE);

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/InformationAccountServiceTest.java

@@ -1,13 +1,17 @@
 package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -20,23 +24,26 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.InformationAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.InformationAccountNewRequest;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
-import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
 import java.util.Map;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
-import static ru.spcex.clearing.test.TestUtils.*;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.addRecordToKafka;
+import static ru.spcex.clearing.test.TestUtils.getJsonStringForNew;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -44,7 +51,7 @@ import static ru.spcex.clearing.test.TestUtils.*;
         ValidationConfig.class,
         InformationAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountHelper.class,
+        AccountService.class,
         InformationAccountService.class,
         ImdgTestConfig.class,
         KafkaTestConfig.class})
@@ -62,8 +69,12 @@ class InformationAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
@@ -85,7 +96,6 @@ class InformationAccountServiceTest {
         accountImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Account, Account.class
         );
-        clearImdg(accountImdg);
 
         companyImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Company, Company.class
@@ -133,7 +143,6 @@ class InformationAccountServiceTest {
     void accountInformationNew() {
         InformationAccountNewRequest InformationAccountNewRequest = new InformationAccountNewRequest();
         InformationAccountNewRequest.setCompanyId(companyId);
-        InformationAccountNewRequest.setAccount(account);
 
         String jsonString = getJsonStringForNew(InformationAccountNewRequest, 0L);
 
@@ -143,7 +152,9 @@ class InformationAccountServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        //waiting for kafka producer send message (finale event)
+        verify(producer, timeout(30_000L).times(2))
+                .send(producerRecord.capture());
 
         Account predictableAccount = new Account();
         predictableAccount.setAccountType(AccountType.Info.getKey());
@@ -159,7 +170,7 @@ class InformationAccountServiceTest {
         InformationAccount resultInfoAccountNew = informationAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
 
         predictableAccount.setId(resultAccountNew.getId());
-        predictableAccount.setAccount(account);
+        predictableAccount.setAccount(informationAccountService.generateInfoAccount(resultInfoAccountNew.getId()));
         predictableInfoAccount.setAccountId(resultAccountNew.getId());
         predictableInfoAccount.setId(resultInfoAccountNew.getId());
 
@@ -170,6 +181,7 @@ class InformationAccountServiceTest {
         accountImdg.delete(resultAccountNew);
     }
 
+    @Autowired ImdgProvider imdgProvider;
     @Test
     void accountIncrementSequence() {
         Imdg<InformationAccount> accountInfoImdg = hazelcastServiceTest.getImdg( IMDGDistributedNames.Map_InformationAccount, InformationAccount.class );
@@ -187,9 +199,8 @@ class InformationAccountServiceTest {
             accountInfo.setCompanyId(account.getCompanyId());
             accountInfoImdg.insert(accountInfo);
         }
-        UserRoleVerification userRoleVerification = Mockito.mock(UserRoleVerification.class);
         InformationAccountService infoAccSvc=new InformationAccountService(null,null,null,
-                null, userRoleVerification, hazelcastServiceTest, null, null, null, null);
+                null, imdgProvider, null, null, null, null);
         Long n = infoAccSvc.accountNextId();
         Assertions.assertEquals(13L, n);
         n = infoAccSvc.accountNextId();

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/SDFProcessServiceTest.java

@@ -1,5 +1,6 @@
 package ru.spcex.clearing.account.service;
 
+import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -26,11 +27,15 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
-import ru.spcex.platform.enumeration.AccountStatus;
+import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
+import java.util.Map;
+
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -45,7 +50,7 @@ class SDFProcessServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
     @Captor
     private ArgumentCaptor<ProducerRecord> producerRecord;
@@ -98,9 +103,8 @@ class SDFProcessServiceTest {
     void parseSdf52Status() {
         Assertions.assertEquals(AccountStatus.BLOCKED, sdfProcessService.parseSdf52Status(0L));
         Assertions.assertEquals(AccountStatus.ACTIVE, sdfProcessService.parseSdf52Status(1L));
-        Assertions.assertEquals(AccountStatus.ACTIVE, sdfProcessService.parseSdf52Status(3L));
         Assertions.assertEquals(AccountStatus.CLOSE, sdfProcessService.parseSdf52Status(2L));
-        Assertions.assertEquals(null, sdfProcessService.parseSdf52Status(4705211956118233163L));
+        Assertions.assertEquals(null, sdfProcessService.parseSdf52Status(3L));
         Assertions.assertEquals(null, sdfProcessService.parseSdf52Status(null));
     }
 }

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java

@@ -1,13 +1,17 @@
 package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -15,30 +19,31 @@ import ru.clearing.classes.statics.data.account.ClearingAccount;
 import ru.clearing.classes.statics.data.account.DepoAccount;
 import ru.clearing.classes.statics.data.account.InformationAccount;
 import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.platform.dictionary.ServiceStatusDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.TradingClearingRegistryValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryUpdateRequest;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.ServiceStatus;
+import ru.spcex.platform.enumeration.TradingClearingRegistryPurpose;
+import ru.spcex.platform.enumeration.TradingClearingRegistryType;
+import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.test.TestUtils.*;
-import static ru.spcex.clearing.test.config.KafkaTestConfig.setMockFuture;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -59,19 +64,18 @@ class TradingClearingRegistryServiceTest {
     TradingClearingRegistryService tradingClearingRegistryService;
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
 
-    @Autowired
-    @Qualifier("kafkaTestTemplate")
-    protected KafkaTemplate<String, Object> kafkaTemplate;
-
     private Imdg<TradingClearingRegistry> tradingClearingRegistryImdg;
     private Imdg<Company> companyImdg;
-    private Imdg<CompanySymbols> companySymbolsImdg;
     private Imdg<ServiceStatusDictionary> serviceStatusDictionaryImdg;
 
     private Imdg<ClearingAccount> clearingAccountImdg;
@@ -99,9 +103,6 @@ class TradingClearingRegistryServiceTest {
         companyImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Company, Company.class
         );
-        companySymbolsImdg = hazelcastServiceTest.getImdg(
-                IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class
-        );
         serviceStatusDictionaryImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_ServiceStatusDictionary, ServiceStatusDictionary.class
         );
@@ -128,14 +129,8 @@ class TradingClearingRegistryServiceTest {
         company.setClearingCode("77");
         companyImdg.insert(company);
 
-        CompanySymbols companySymbols = new CompanySymbols();
-        companySymbols.setCompanyId(companyId);
-        companySymbols.setCompanySymbol(CompanySymbol.CLRC.getKey());
-        companySymbolsImdg.insert(companySymbols);
-
         Account account = new Account();
         account.setStatus(ServiceStatus.Active.getKey());
-        account.setAccountType(AccountType.Clrn.getKey());
         accountId = accountImdg.insert(account);
 
         account2Id = accountImdg.insert(account);
@@ -159,17 +154,15 @@ class TradingClearingRegistryServiceTest {
 
     @Test
     void tradingClearingRegistryNew_moneyAccount_clearingAccount() {
-        setMockFuture(kafkaTemplate);
         TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
         tradingClearingRegistryNewRequest.setCompanyId(companyId);
         tradingClearingRegistryNewRequest.setMoneyAccountId(accountId);
-        tradingClearingRegistryNewRequest.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
 
         TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
         predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077MAT00001");
+        predictableTradingClearingRegistry.setCode("0077MAT");
         predictableTradingClearingRegistry.setMoneyAccountId(accountId);
-        predictableTradingClearingRegistry.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
+        predictableTradingClearingRegistry.setTradingClearingRegistryType("CAT");
         predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.M.getKey());
         predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
 
@@ -185,6 +178,7 @@ class TradingClearingRegistryServiceTest {
 
         TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
         predictableTradingClearingRegistry.setId(resultNew.getId());
+        predictableTradingClearingRegistry.setCode(predictableTradingClearingRegistry.getCode() + resultNew.getId());
         predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
         predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
 
@@ -196,16 +190,13 @@ class TradingClearingRegistryServiceTest {
 
     @Test
     void tradingClearingRegistryNew_moneyAccount_informationAccount() {
-        setMockFuture(kafkaTemplate);
-        clearImdg(tradingClearingRegistryImdg);
         TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
         tradingClearingRegistryNewRequest.setCompanyId(companyId);
         tradingClearingRegistryNewRequest.setMoneyAccountId(account2Id);
-        tradingClearingRegistryNewRequest.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
 
         TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
         predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077MAT00001");
+        predictableTradingClearingRegistry.setCode("0077MAT");
         predictableTradingClearingRegistry.setMoneyAccountId(account2Id);
         predictableTradingClearingRegistry.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
         predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.M.getKey());
@@ -219,10 +210,11 @@ class TradingClearingRegistryServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        waitingSendAndCheckRecord(0L, producer, producerRecord);
 
         TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
         predictableTradingClearingRegistry.setId(resultNew.getId());
+        predictableTradingClearingRegistry.setCode(predictableTradingClearingRegistry.getCode() + resultNew.getId());
         predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
         predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
 
@@ -235,8 +227,6 @@ class TradingClearingRegistryServiceTest {
 
     @Test
     void tradingClearingRegistryNew_depoAccount() {
-        setMockFuture(kafkaTemplate);
-        clearImdg(tradingClearingRegistryImdg);
         TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
         tradingClearingRegistryNewRequest.setCompanyId(companyId);
         tradingClearingRegistryNewRequest.setMoneyAccountId(accountId);
@@ -244,7 +234,7 @@ class TradingClearingRegistryServiceTest {
 
         TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
         predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077CDATT00001");
+        predictableTradingClearingRegistry.setCode("0077CDAT");
         predictableTradingClearingRegistry.setMoneyAccountId(accountId);
         predictableTradingClearingRegistry.setDepoAccountId(account2Id);
         predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT");
@@ -259,12 +249,14 @@ class TradingClearingRegistryServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        waitingSendAndCheckRecord(0L, producer, producerRecord);
 
         TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
         predictableTradingClearingRegistry.setId(resultNew.getId());
+        predictableTradingClearingRegistry.setCode(predictableTradingClearingRegistry.getCode() + resultNew.getId());
         predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
         predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
+        predictableTradingClearingRegistry.setCompanyId(123L);
 
         TRADING_CLEARING_REGISTRY_MATCHER.assertMatch(resultNew, predictableTradingClearingRegistry);
         tradingClearingRegistryImdg.delete(resultNew);
@@ -292,7 +284,7 @@ class TradingClearingRegistryServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingSendAndCheckRecord(0L, mockProducer);
+        waitingSendAndCheckRecord(0L, producer, producerRecord);
 
         TradingClearingRegistry resultUpdating = tradingClearingRegistryImdg.getSingleObjectByID(registryId);
         existTradingClearingRegistry.setUpdated(resultUpdating.getUpdated());
@@ -320,7 +312,7 @@ class TradingClearingRegistryServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingSendAndCheckRecord(0L, mockProducer);
+        waitingSendAndCheckRecord(0L, producer, producerRecord);
 
         TradingClearingRegistry resultUpdating = tradingClearingRegistryImdg.getSingleObjectByID(registryId);
         existTradingClearingRegistry.setUpdated(resultUpdating.getUpdated());
@@ -341,8 +333,8 @@ class TradingClearingRegistryServiceTest {
                 "000000105", TradingClearingRegistryPurpose.C, "ER", 100012L
         ));
 
-        Assertions.assertEquals("0105MAT00012", tradingClearingRegistryService.makeCode(
+        Assertions.assertEquals("0105MAT100012", tradingClearingRegistryService.makeCode(
-                "000000105", TradingClearingRegistryPurpose.M, "A", 100012L
+                "000000105", TradingClearingRegistryPurpose.M, "ER", 100012L
         ));
     }
 

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/utils/ImapEvent.java

@@ -0,0 +1,63 @@
+package ru.spcex.clearing.account.utils;
+
+import com.hazelcast.core.IMap;
+import com.hazelcast.map.listener.EntryAddedListener;
+import com.hazelcast.map.listener.EntryRemovedListener;
+import com.hazelcast.map.listener.EntryUpdatedListener;
+
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class ImapEvent<T> {
+    private final IMap<Long, T> iMap;
+    private final String listenerAdding;
+    private final String listenerUpdating;
+    private final String listenerRemoving;
+    private final AtomicBoolean checkEventHappened = new AtomicBoolean(false);
+
+    public ImapEvent(IMap<Long, T> iMap) {
+        this.iMap = iMap;
+        listenerAdding = iMap.addEntryListener((EntryAddedListener<Long, T>) entryEvent -> {
+            synchronized (checkEventHappened) {
+                checkEventHappened.set(true);
+                checkEventHappened.notify();
+            }
+        }, false);
+        listenerUpdating = iMap.addEntryListener((EntryUpdatedListener<Long, T>) entryEvent -> {
+            synchronized (checkEventHappened) {
+                checkEventHappened.set(true);
+                checkEventHappened.notify();
+            }
+        }, false);
+        listenerRemoving = iMap.addEntryListener((EntryRemovedListener<Long, T>) entryEvent -> {
+            synchronized (checkEventHappened) {
+                checkEventHappened.set(true);
+                checkEventHappened.notify();
+            }
+        }, false);
+    }
+
+    public void waitWhenHappened() throws InterruptedException {
+        //running timer task as daemon thread
+        Timer timer = new Timer(true);
+        timer.scheduleAtFixedRate(new TimerTask() {
+            boolean secondRan;
+
+            @Override
+            public void run() {
+                checkEventHappened.set(secondRan);//если что-то пойдет не так не тормозить основной поток
+                secondRan = true;
+            }
+        }, 0, 30 * 1000);
+        synchronized (checkEventHappened) {
+            while (!checkEventHappened.get()) {
+                checkEventHappened.wait(100);
+            }
+        }
+        //preparing hazelcastImdgProvider for next test
+        iMap.removeEntryListener(listenerAdding);
+        iMap.removeEntryListener(listenerUpdating);
+        iMap.removeEntryListener(listenerRemoving);
+    }
+}

clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/utils/MatcherFactory.java

@@ -0,0 +1,38 @@
+package ru.spcex.clearing.account.utils;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Factory for creating test matchers.
+ * <p>
+ * Comparing actual and expected objects via AssertJ
+ */
+public class MatcherFactory {
+
+    public static <T> Matcher<T> usingIgnoringFieldsComparator(String... fieldsToIgnore) {
+        return new Matcher<>(fieldsToIgnore);
+    }
+
+    public static class Matcher<T> {
+        private final String[] fieldsToIgnore;
+
+        private Matcher(String... fieldsToIgnore) {
+            this.fieldsToIgnore = fieldsToIgnore;
+        }
+
+        public void assertMatch(T actual, T expected) {
+            assertThat(actual).usingRecursiveComparison().ignoringFields(fieldsToIgnore).isEqualTo(expected);
+        }
+
+        @SafeVarargs
+        public final void assertMatch(Iterable<T> actual, T... expected) {
+            assertMatch(actual, Arrays.asList(expected));
+        }
+
+        public void assertMatch(Iterable<T> actual, Iterable<T> expected) {
+            assertThat(actual).usingRecursiveFieldByFieldElementComparatorIgnoringFields(fieldsToIgnore).isEqualTo(expected);
+        }
+    }
+}

clearing-parent/backend-api/pom.xml

@@ -195,19 +195,6 @@
                                         </fileMapper>
                                     </fileMappers>
                                 </transformationSet>
-                                <transformationSet>
-                                    <dir>src/main/resources/meta</dir>
-                                    <includes>
-                                        <include>data_initial.xml</include>
-                                    </includes>
-                                    <stylesheet>src/main/resources/meta/xsl/data.xsl</stylesheet>
-                                    <fileMappers>
-                                        <fileMapper
-                                                implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
-                                            <targetExtension>data_initial.sql</targetExtension>
-                                        </fileMapper>
-                                    </fileMappers>
-                                </transformationSet>
                             </transformationSets>
                         </configuration>
                     </execution>

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/BackEndApiImdgConfig.java

@@ -1,7 +1,5 @@
 package ru.spcex.clearing.backendapi.config;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -13,8 +11,6 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 @Configuration
 public class BackEndApiImdgConfig {
-    Logger log = LoggerFactory.getLogger(getClass());
-
     @Bean(name = "taskExecutorHazelcastClientInitializer")
     public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer() {
         return createThreadPoolTaskExecutor(1, true);
@@ -25,16 +21,6 @@ public class BackEndApiImdgConfig {
         return createThreadPoolTaskExecutor(1, false);
     }
 
-    @Bean(name = "taskExecutorHazelcastClientInitializerHist")
-    public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializerHist() {
-        return createThreadPoolTaskExecutor(1, true);
-    }
-
-    @Bean(name = "taskExecutorIdGeneratorAwaiterHist")
-    public ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiterHist() {
-        return createThreadPoolTaskExecutor(1, false);
-    }
-
     @Autowired
     @Bean
     public ImdgProvider imdgProvider(
@@ -42,33 +28,9 @@ public class BackEndApiImdgConfig {
             @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
             BackendApiSettings clientSetting
     ) {
-        if (clientSetting.getHazelcast() == null || clientSetting.getHazelcast().getClusterMembers() == null) {
+        return new HazelcastService(taskExecutorHazelcastClientInitializer,
-            log.warn("Property \"backend-api.hazelcast.cluster-members\" not set!");
-            throw new IllegalArgumentException("Property \"backend-api.hazelcast.cluster-members\" not set");
-        }
-        ImdgProvider imdg = new HazelcastService(taskExecutorHazelcastClientInitializer,
                 taskExecutorIdGeneratorAwaiter,
                 clientSetting.getHazelcast());
-// todo корректное ожидание готовности        imdg.waitAvailable();
-        return imdg;
-    }
-
-    @Autowired
-    @Bean
-    public ImdgProvider imdgProviderHist(
-            @Qualifier("taskExecutorHazelcastClientInitializerHist") ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer,
-            @Qualifier("taskExecutorIdGeneratorAwaiterHist") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
-            BackendApiSettings clientSetting
-    ) {
-        if (clientSetting.getHazelcastSearch() == null || clientSetting.getHazelcastSearch().getClusterMembers() == null) {
-            log.warn("Property \"backend-api.hazelcast-search.cluster-members\" not set!");
-            // может работать без history, но history будет недоступна
-        }
-        ImdgProvider imdg = new HazelcastService(taskExecutorHazelcastClientInitializer,
-                taskExecutorIdGeneratorAwaiter,
-                clientSetting.getHazelcastSearch());
-// todo корректное ожидание готовности        imdg.waitAvailable();
-        return imdg;
     }
 
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/HistoryConfig.java

@@ -1,177 +0,0 @@
-package ru.spcex.clearing.backendapi.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.HistorySubscription;
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.specific.*;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-
-import java.util.LinkedList;
-import java.util.List;
-
-@Configuration
-public class HistoryConfig {
-
-    private final ImdgPredicateBuilder pb;
-
-    @Autowired
-    public HistoryConfig(ImdgProvider imdgProvider) {
-        this.pb = imdgProvider.getImdg(
-                IMDGDistributedNames.Map_SearchMoneyBalanceRegister,
-                SpcexObjectBase.class
-        ).predicateBuilder();
-    }
-
-    @Bean
-    public List<HistorySubscription> histSubscriptions() {
-        List<HistorySubscription> hst = new LinkedList<>();
-        hst.add(executionDeposit());
-        hst.add(executionFond());
-        hst.add(depoBalanceRegister());
-        hst.add(moneyBalanceRegister());
-        hst.add(admittedLiabilitiesRegister());
-        hst.add(coveredLiabilitiesRegister());
-        hst.add(moneyPaymentInstructionRegister());
-        hst.add(depoPaymentInstructionRegister());
-        hst.add(excludeLiabilitiesRegister());
-        hst.add(liabilitiesRegister());
-        hst.add(executionRegister());
-        return hst;
-    }
-
-    private HistorySubscription moneyBalanceRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("money-balance-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchMoneyBalanceRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_MoneyBalanceRegister);
-        sbscr.setConditions(List.of(
-                new CreatedFromCondition(pb),
-                new CreatedToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription depoBalanceRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("depo-balance-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchDepoBalanceRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_DepoBalanceRegister);
-        sbscr.setConditions(List.of(
-                new CreatedFromCondition(pb),
-                new CreatedToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription depoPaymentInstructionRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("depo-payment-instruction-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchDepoPaymentInstructionRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_DepoPaymentInstructionRegister);
-        sbscr.setConditions(List.of(
-                new CreatedFromCondition(pb),
-                new CreatedToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription excludeLiabilitiesRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("exclude-liabilities-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchExcludeLiabilitiesRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister);
-        sbscr.setConditions(List.of(
-                new CreatedFromCondition(pb),
-                new CreatedToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription liabilitiesRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("liabilities-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchLiabilitiesRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_LiabilitiesRegister);
-        sbscr.setConditions(List.of(
-                new CreatedFromCondition(pb),
-                new CreatedToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription admittedLiabilitiesRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("admitted-liabilities-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchAdmittedLiabilitiesRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister);
-        sbscr.setConditions(List.of(
-                new ClearingDateFromCondition(pb),
-                new ClearingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription executionRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("execution-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchExecutionRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_ExecutionRegister);
-        sbscr.setConditions(List.of(
-                new ClearingDateFromCondition(pb),
-                new ClearingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription moneyPaymentInstructionRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("money-payment-instruction-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchMoneyPaymentInstructionRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_MoneyPaymentInstructionRegister);
-        sbscr.setConditions(List.of(
-                new ClearingDateFromCondition(pb),
-                new ClearingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription coveredLiabilitiesRegister() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("covered-liabilities-registers");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchCoveredLiabilitiesRegister);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_CoveredLiabilitiesRegister);
-        sbscr.setConditions(List.of(
-                new ClearingDateFromCondition(pb),
-                new ClearingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription executionDeposit() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("execution-deposits");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchExecutionDeposit);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_ExecutionDeposit);
-        sbscr.setConditions(List.of(
-                new TradingDateFromCondition(pb),
-                new TradingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-
-    private HistorySubscription executionFond() {
-        HistorySubscription sbscr = new HistorySubscription();
-        sbscr.setDestination("execution-fonds");
-        sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchExecutionFond);
-        sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_ExecutionFond);
-        sbscr.setConditions(List.of(
-                new TradingDateFromCondition(pb),
-                new TradingDateToCondition(pb)
-        ));
-        return sbscr;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/KafkaConfig.java

@@ -1,26 +1,35 @@
 package ru.spcex.clearing.backendapi.config;
 
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.consumer.OffsetResetStrategy;
 import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.context.annotation.Scope;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
 import ru.spcex.clearing.backendapi.config.element.BackendApiSettings;
 import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
 import ru.spcex.clearing.platform.messaging.config.KafkaProducerFactory;
 import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 
+import javax.annotation.PostConstruct;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
 @Configuration
 public class KafkaConfig {
 
@@ -31,6 +40,8 @@ public class KafkaConfig {
         return KafkaProducerFactory.producer(settings.getKafkaProducer());
     }
 
+
+
     @Bean
     public ProducerFactory<String, Object> pf(BackendApiSettings settings) {
         KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
@@ -62,7 +73,6 @@ public class KafkaConfig {
 
     @Profile("!kafkaDisabled")
     @Autowired
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
     @Bean
     public Consumer<String, Object> createConsumer(BackendApiSettings settings) {
         return KafkaConsumerFactory.consumer(settings.getKafkaConsumer());

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/element/BackendApiSettings.java

@@ -13,7 +13,6 @@ import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams;
 @ConfigurationProperties("backend-api")
 public class BackendApiSettings {
     private HazelcastClientParams hazelcast;
-    private HazelcastClientParams hazelcastSearch;
     private KafkaProducerSettings kafkaProducer;
     private KafkaConsumerSettings kafkaConsumer;
     private SecuritySettings security;
@@ -58,12 +57,4 @@ public class BackendApiSettings {
     public void setSecurity(SecuritySettings security) {
         this.security = security;
     }
-
-    public HazelcastClientParams getHazelcastSearch() {
-        return hazelcastSearch;
-    }
-
-    public void setHazelcastSearch(HazelcastClientParams hazelcastSearch) {
-        this.hazelcastSearch = hazelcastSearch;
-    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountSymbolsController.java

@@ -1,71 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.account;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import ru.clearing.classes.statics.data.account.AccountSymbols;
-import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
-import ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction;
-import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
-import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
-import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
-import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
-import ru.spcex.clearing.backendapi.service.IOperator;
-import ru.spcex.clearing.backendapi.service.IStateLoader;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-@Controller
-@RequestMapping("/accounting/depo-accounts-symbols")
-public class AccountSymbolsController extends AbstractQueueController {
-    private final IStateLoader stateLoader;
-
-    @Autowired
-    public AccountSymbolsController(IOperator operator, IStateLoader stateLoader) {
-        super(operator);
-        this.stateLoader = stateLoader;
-    }
-
-    @ApiOperation(value = "get all accounts-symbols.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
-    @RequestMapping(method = RequestMethod.GET)
-    @ResponseBody
-    public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_AccountSymbols, AccountSymbols.class);
-        CommonGetAllResponse response = new CommonGetAllResponse();
-        response.fromEntity(all);
-        return response;
-    }
-
-
-    @ApiOperation(value = "create AccountSymbols.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public CudResponse add(
-            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
-            @RequestBody AccountSymbolsNewAction accountNewAction) throws ExecutionException, InterruptedException {
-        return processRequest(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_NEW, accountNewAction);
-    }
-
-    @ApiOperation(value = "delete AccountSymbols.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    @ResponseBody
-    public CudResponse delete(@ApiParam(value = "Идентификатор удаляемого объекта", required = true, example = "1234")
-                              @PathVariable("id") Long id) throws ExecutionException, InterruptedException {
-        CommonDeleteAction deleteAction = new CommonDeleteAction();
-        deleteAction.setId(id);
-        return processRequest(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_DELETE, deleteAction);
-    }
-
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/InformationAccountController.java

@@ -1,40 +1,28 @@
 package ru.spcex.clearing.backendapi.controller.queue.account;
 
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import ru.clearing.classes.statics.data.account.InformationAccount;
-import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
-import ru.spcex.clearing.backendapi.controller.request.cud.account.AccountInformationNewAction;
-import ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction;
-import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
-import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
-import ru.spcex.clearing.backendapi.service.IOperator;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
 @Controller
 @RequestMapping("/accounting/information-accounts")
-public class InformationAccountController extends AbstractQueueController {
+public class InformationAccountController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public InformationAccountController(IOperator operator, IStateLoader stateLoader) {
+    public InformationAccountController(IStateLoader stateLoader) {
-        super(operator);
         this.stateLoader = stateLoader;
     }
 
@@ -49,15 +37,4 @@ public class InformationAccountController extends AbstractQueueController {
         response.fromEntity(all);
         return response;
     }
-
-
-//    @ApiOperation(value = "Добавление информационного счета.")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-//    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-//    @ResponseBody
-//    public CudResponse add(
-//            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
-//            @RequestBody AccountInformationNewAction accountNewInformationAction) throws ExecutionException, InterruptedException {
-//        return processRequest(Consts.DESTINATION_INFORMATION_ACCOUNT_NEW, accountNewInformationAction);
-//    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyRoleSetController.java

@@ -1,28 +1,22 @@
 package ru.spcex.clearing.backendapi.controller.queue.company;
 
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import ru.clearing.classes.statics.data.company.CompanyRoleSet;
 import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
-import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
-import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyRoleSetNewAction;
-import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
-import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IOperator;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
 @Controller
 @RequestMapping("/company-role-sets")
@@ -47,26 +41,4 @@ public class CompanyRoleSetController extends AbstractQueueController {
         response.fromEntity(all);
         return response;
     }
-
-    @ApiOperation(value = "create CompanyRoleSet.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-    @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public CudResponse create(
-            @ApiParam(value = "Значения полей нового объекта.", required = true)
-            @RequestBody CompanyRoleSetNewAction companyRoleSetNewAction) throws ExecutionException, InterruptedException {
-        return processRequest(Consts.DESTINATION_COMPANY_ROLE_SET_NEW, companyRoleSetNewAction);
-    }
-
-    @ApiOperation(value = "delete CompanyRoleSet.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class)})
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    @ResponseBody
-    public CudResponse delete(@ApiParam(value = "Идентификатор удаляемого объекта", required = true, example = "1234")
-                              @PathVariable("id") Long id) throws ExecutionException, InterruptedException {
-        CommonDeleteAction deleteAction = new CommonDeleteAction();
-        deleteAction.setId(id);
-        return processRequest(Consts.DESTINATION_COMPANY_ROLE_SET_DELETE, deleteAction);
-    }
-
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java

@@ -14,11 +14,7 @@ import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllRespo
 import ru.spcex.clearing.backendapi.service.IOperator;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
-import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Map;
 
@@ -26,16 +22,11 @@ import java.util.Map;
 @RequestMapping("/execution-deposits")
 public class ExecutionDepositController extends AbstractQueueController {
     private final IStateLoader stateLoader;
-    private final ImdgPredicateBuilder imdgPredicateBuilder;
 
     @Autowired
-    public ExecutionDepositController(IOperator operator, IStateLoader stateLoader,
+    public ExecutionDepositController(IOperator operator, IStateLoader stateLoader) {
-                                      ImdgProvider imdgProvider) {
         super(operator);
         this.stateLoader = stateLoader;
-        this.imdgPredicateBuilder = imdgProvider
-                .getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class)
-                .predicateBuilder();
     }
 
     @ApiOperation(value = "get all ExecutionDeposits.")
@@ -43,11 +34,9 @@ public class ExecutionDepositController extends AbstractQueueController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        ImdgPredicate imdgPredicate = imdgPredicateBuilder.greatEqual("firstLegSettlementDate", LocalDate.now());
         Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
                 IMDGDistributedNames.Map_ExecutionDeposit,
-                ExecutionDeposit.class,
+                ExecutionDeposit.class);
-                imdgPredicate);
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionFondController.java

@@ -14,11 +14,7 @@ import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllRespo
 import ru.spcex.clearing.backendapi.service.IOperator;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 
-import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Map;
 
@@ -26,17 +22,11 @@ import java.util.Map;
 @RequestMapping("/execution-fonds")
 public class ExecutionFondController extends AbstractQueueController {
     private final IStateLoader stateLoader;
-    private final ImdgPredicateBuilder imdgPredicateBuilder;
 
     @Autowired
-    public ExecutionFondController(IOperator operator,
+    public ExecutionFondController(IOperator operator, IStateLoader stateLoader) {
-                                   IStateLoader stateLoader,
-                                   ImdgProvider imdgProvider) {
         super(operator);
         this.stateLoader = stateLoader;
-        this.imdgPredicateBuilder = imdgProvider
-                .getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class)
-                .predicateBuilder();
     }
 
     @ApiOperation(value = "get all ExecutionFond.")
@@ -44,11 +34,9 @@ public class ExecutionFondController extends AbstractQueueController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        ImdgPredicate imdgPredicate = imdgPredicateBuilder.greatEqual("settlementDate", LocalDate.now());
         Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
                 IMDGDistributedNames.Map_ExecutionFond,
-                ExecutionFond.class,
+                ExecutionFond.class);
-                imdgPredicate);
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/HistController.java

@@ -1,95 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history;
-
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.ConditionProvider;
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.HistorySubscription;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
-import ru.spcex.clearing.backendapi.errors.ActionValidationException;
-import ru.spcex.clearing.backendapi.errors.BackEndError;
-import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
-import ru.spcex.clearing.backendapi.service.IStateLoader;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-
-import java.time.LocalDate;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Optional;
-
-@Controller
-@RequestMapping("/history")
-public class HistController {
-    private final GetResponseFactory responseFactory;
-    private final IStateLoader stateLoader;
-    private final ConditionProvider conditionProvider;
-
-    @Autowired
-    public HistController(GetResponseFactory responseFactory,
-                          IStateLoader stateLoader,
-                          ConditionProvider conditionProvider) {
-        this.responseFactory = responseFactory;
-        this.stateLoader = stateLoader;
-        this.conditionProvider = conditionProvider;
-    }
-
-    @ApiOperation(value = "Get history")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
-    @RequestMapping(method = RequestMethod.GET)
-    @ResponseBody
-    public CommonGetAllResponse getHistory(
-            @ApiParam(value = "destination сущности по которой запрашивается история", example = "money-balance-registers", required = true)
-            @RequestParam("destination")
-            String destination,
-            @ApiParam(value = "Начальная точка поиска по дате", example = "2023-01-15")
-            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-            @RequestParam(name = "from", required = false)
-            LocalDate from,
-            @ApiParam(value = "Конечная точка поиска по дате", example = "2023-01-15")
-            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-            @RequestParam(name = "to", required = false)
-            LocalDate to
-    ) {
-        if (to == null && from == null) {
-            throw new ActionValidationException(new EnumMessage(BackEndError.ValidationError, "from/to url params both empty"));
-        }
-
-        Optional<Class<? extends SpcexObjectBase>> entityClass = responseFactory.classByDestination(destination);
-        //class may be added to HistorySubscription if needed
-        if (entityClass.isEmpty()) {
-            throw new ActionValidationException(new EnumMessage(BackEndError.ValidationError,
-                    "destination " + "'" + destination + "' not supported (meta class not found)"));
-        }
-
-        HistoryRequest req = new HistoryRequest();
-        req.setTable(destination);
-        req.setFrom(from);
-        req.setTo(to);
-
-        HistorySubscription[] subscr = new HistorySubscription[1];
-        ImdgPredicate[] prdct = new ImdgPredicate[1];
-        conditionProvider.conditionForRequest(req).map(s -> subscr[0] = s, p -> prdct[0] = p);
-
-        Collection<Map<String, Object>> searchRes = stateLoader.getAllMetaTransform(
-                subscr[0].getSearchProxyMapName(),
-                subscr[0].getFullHistoryMapName(),
-                entityClass.get(),
-                prdct[0]
-        );
-
-        CommonGetAllResponse response = new CommonGetAllResponse();
-        response.fromEntity(searchRes);
-        return response;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/ConditionProvider.java

@@ -1,72 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.clearing.backendapi.errors.ActionValidationException;
-import ru.spcex.clearing.backendapi.errors.BackEndError;
-import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.utils.collection.Pair;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-@Component
-public class ConditionProvider {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final GetResponseFactory responseFactory;
-    private final ImdgPredicateBuilder pb;
-
-    private final Map<String, HistorySubscription> subscriptions;
-
-    @Autowired
-    public ConditionProvider(GetResponseFactory responseFactory, ImdgProvider imdgProvider,
-                             List<HistorySubscription> subscriptions) {
-        this.responseFactory = responseFactory;
-        this.subscriptions = new HashMap<>();
-        Imdg<SpcexObjectBase> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SearchMoneyBalanceRegister, SpcexObjectBase.class);
-        this.pb = imdg.predicateBuilder();
-        subscriptions.forEach(s -> this.subscriptions.put(s.getDestination(), s));
-    }
-
-    public Pair<HistorySubscription, ImdgPredicate> conditionForRequest(HistoryRequest req) {
-        String destination = req.getTable();
-        HistorySubscription subscription = subscriptions.get(destination);
-        if (subscription == null) {
-            throw new ActionValidationException(new EnumMessage(BackEndError.ValidationError,
-                    "destination " + "'" + destination + "' not supported (subscription info not found)"));
-        }
-
-        List<ImdgPredicate> predicates = subscription
-                .getConditions()
-                .stream()
-                .map(c -> c.condition(req))
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .toList();
-
-        ImdgPredicate result;
-        if (predicates.size() == 0) {
-            //add boundary conditions?
-            log.warn("destination '{}' zero predicates found", destination);
-            result = pb.alwaysTrue();
-        } else if (predicates.size() == 1) {
-            result = predicates.iterator().next();
-        } else {
-            result = pb.and(predicates.toArray(new ImdgPredicate[0]));
-        }
-
-        return new Pair<>(subscription, result);
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/HistorySubscription.java

@@ -1,46 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition;
-
-import java.util.Collections;
-import java.util.List;
-
-public class HistorySubscription {
-    private String destination;
-
-    private List<IHistoryCondition> conditions;
-    private String searchProxyMapName;
-    private String fullHistoryMapName;
-    //class
-
-
-    public List<IHistoryCondition> getConditions() {
-        return conditions != null ? conditions : Collections.emptyList();
-    }
-
-    public void setConditions(List<IHistoryCondition> conditions) {
-        this.conditions = conditions;
-    }
-
-    public String getSearchProxyMapName() {
-        return searchProxyMapName;
-    }
-
-    public void setSearchProxyMapName(String searchProxyMapName) {
-        this.searchProxyMapName = searchProxyMapName;
-    }
-
-    public String getFullHistoryMapName() {
-        return fullHistoryMapName;
-    }
-
-    public void setFullHistoryMapName(String fullHistoryMapName) {
-        this.fullHistoryMapName = fullHistoryMapName;
-    }
-
-    public String getDestination() {
-        return destination;
-    }
-
-    public void setDestination(String destination) {
-        this.destination = destination;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/IHistoryCondition.java

@@ -1,15 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition;
-
-
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-
-import java.util.Optional;
-
-public interface IHistoryCondition {
-    Optional<ImdgPredicate> condition(HistoryRequest req);
-
-    default Optional<ImdgPredicate> of(ImdgPredicate predicate) {
-        return Optional.of(predicate);
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/ClearingDateFromCondition.java

@@ -1,25 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-
-import java.util.Optional;
-
-public class ClearingDateFromCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public ClearingDateFromCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getFrom() != null) {
-            return Optional.ofNullable(pb.greatEqual("clearingDate", req.getFrom()));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/ClearingDateToCondition.java

@@ -1,25 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-
-import java.util.Optional;
-
-public class ClearingDateToCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public ClearingDateToCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getTo() != null) {
-            return Optional.ofNullable(pb.lessEqual("clearingDate", req.getTo()));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/CreatedFromCondition.java

@@ -1,26 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.util.Optional;
-
-public class CreatedFromCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public CreatedFromCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getFrom() != null) {
-            return Optional.of(pb.greatEqual("created", TimeUtil.localDateToInstant(req.getFrom())));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/CreatedToCondition.java

@@ -1,26 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.util.Optional;
-
-public class CreatedToCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public CreatedToCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getTo() != null) {
-            return Optional.of(pb.lessEqual("created", TimeUtil.localDateToInstant(req.getTo())));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/TradingDateFromCondition.java

@@ -1,25 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-
-import java.util.Optional;
-
-public class TradingDateFromCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public TradingDateFromCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getFrom() != null) {
-            return Optional.ofNullable(pb.greatEqual("tradingDate", req.getFrom()));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/history/condition/specific/TradingDateToCondition.java

@@ -1,25 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.history.condition.specific;
-
-import ru.spcex.clearing.backendapi.controller.queue.history.condition.IHistoryCondition;
-import ru.spcex.clearing.backendapi.controller.request.cud.history.HistoryRequest;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
-
-import java.util.Optional;
-
-public class TradingDateToCondition implements IHistoryCondition {
-
-    private final ImdgPredicateBuilder pb;
-
-    public TradingDateToCondition(ImdgPredicateBuilder pb) {
-        this.pb = pb;
-    }
-
-    @Override
-    public Optional<ImdgPredicate> condition(HistoryRequest req) {
-        if (req.getTo() != null) {
-            return Optional.ofNullable(pb.lessEqual("tradingDate", req.getTo()));
-        }
-        return Optional.empty();
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java

@@ -10,7 +10,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
-import ru.spcex.clearing.backendapi.controller.request.cud.registry.*;
+import ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeRefundDateActionNew;
+import ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew;
+import ru.spcex.clearing.backendapi.controller.request.cud.registry.ReturnDepositActionNew;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
@@ -68,19 +70,6 @@ public class RegistryController extends AbstractQueueController {
         return processRequest(Consts.REGISTRY_RETURN_DEPOSIT_ACTION, returnDepositAction);
     }
 
-    @ApiOperation(value = "Отметить средства на возврат депозита")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-    @RequestMapping(value = "/identificationFunds/{id}", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public CudResponse identificationFundsAction(
-            @ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
-            @PathVariable("id") Long id,
-            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
-            @RequestBody IdentificationFundsActionNew identificationFundsActionNew) throws ExecutionException, InterruptedException {
-        identificationFundsActionNew.setId(id);
-        return processRequest(Consts.REGISTRY_IDENTIFICATION_FUNDS, identificationFundsActionNew);
-    }
-
     @ApiOperation(value = "Изменение даты возврата депозита")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
     @RequestMapping(value = "/changeRefundDate/{groupId}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -93,18 +82,4 @@ public class RegistryController extends AbstractQueueController {
         returnDepositAction.setGroupId(groupId);
         return processRequest(Consts.REGISTRY_CHANGE_REFUND_DATE_ACTION, returnDepositAction);
     }
-
-    @ApiOperation(value = "Установить отметку о получение выписки")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
-    @RequestMapping(value = "/changeStatusExtract/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public CudResponse changeStatusExtract(
-            @ApiParam(value = "Идентификатор регистра.", required = true, example = "1234")
-            @PathVariable("id") Long id,
-            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
-            @RequestBody ChangeStatusExtractActionNew changeStatusExtractAction) throws ExecutionException, InterruptedException {
-        changeStatusExtractAction.setId(id);
-        return processRequest(Consts.REGISTRY_CHANGE_STATUS_EXTRACT_ACTION, changeStatusExtractAction);
-    }
-
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountInformationNewAction.java

@@ -1,71 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.account;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.backendapi.domain.actions.IAction;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.InformationAccountNewRequest;
-
-public class AccountInformationNewAction implements IAction<InformationAccountNewRequest> {
-
-    @ApiModelProperty(value = "Наименование компании", example = "1200")
-    @JsonProperty
-    private Long companyId;
-    @ApiModelProperty(value = "Номер счета", example = "A30101111111111111776")
-    @JsonProperty
-    private String account;
-    @ApiModelProperty(value = "Наименование статуса", example = "ACTV")
-    @JsonProperty
-    private String status;
-    @ApiModelProperty(value = "Наименование типа счета", example = "INFO")
-    @JsonProperty
-    private String accountType;
-
-    @Override
-    public InformationAccountNewRequest toRequest() {
-        var req = new InformationAccountNewRequest();
-        req.setCompanyId(this.companyId);
-        req.setAccount(this.account);
-        req.setStatus(this.status);
-        req.setAccountType(this.accountType);
-        return req;
-    }
-
-    @ApiModelProperty(hidden = true)
-    @Override
-    public ActionType getActionType() {
-        return ActionType.NEW;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getAccountType() {
-        return accountType;
-    }
-
-    public void setAccountType(String accountType) {
-        this.accountType = accountType;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/AccountSymbolsNewAction.java

@@ -1,47 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.account;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.backendapi.domain.actions.IAction;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.AccountSymbolsNewRequest;
-
-public class AccountSymbolsNewAction implements IAction<AccountSymbolsNewRequest> {
-
-    @ApiModelProperty(value = "Номер счета", example = "1200")
-    @JsonProperty
-    private Long accountId;
-    @ApiModelProperty(value = "Значение реквизита", example = "ABCD")
-    @JsonProperty
-    private String accountSymbolValue;
-
-    @Override
-    public AccountSymbolsNewRequest toRequest() {
-        var req = new AccountSymbolsNewRequest();
-        req.setAccountId(this.accountId);
-        req.setAccountSymbolValue(this.accountSymbolValue);
-        return req;
-    }
-
-    @ApiModelProperty(hidden = true)
-    @Override
-    public ActionType getActionType() {
-        return ActionType.NEW;
-    }
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(Long accountId) {
-        this.accountId = accountId;
-    }
-
-    public String getAccountSymbolValue() {
-        return accountSymbolValue;
-    }
-
-    public void setAccountSymbolValue(String accountSymbolValue) {
-        this.accountSymbolValue = accountSymbolValue;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/company/CompanyRoleSetNewAction.java

@@ -1,59 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.company;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.backendapi.domain.actions.IAction;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyRoleSetNewRequest;
-
-public class CompanyRoleSetNewAction implements IAction<CompanyRoleSetNewRequest> {
-    @ApiModelProperty(value = "Наименование компании", example = "1234")
-    @JsonProperty
-    Long companyId;
-    @ApiModelProperty(value = "Код роли компании", example = "ABCD")
-    @JsonProperty
-    String companyRole;
-    @ApiModelProperty(value = "Код статуса", example = "ACTV")
-    @JsonProperty
-    String workflowStatus;
-
-    @Override
-    public CompanyRoleSetNewRequest toRequest() {
-        CompanyRoleSetNewRequest request = new CompanyRoleSetNewRequest();
-        request.setCompanyId(this.companyId);
-        request.setCompanyRole(this.companyRole);
-        request.setWorkflowStatus(this.workflowStatus);
-        return request;
-    }
-
-    @ApiModelProperty(hidden = true)
-    @Override
-    public ActionType getActionType() {
-        return ActionType.NEW;
-    }
-
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getCompanyRole() {
-        return companyRole;
-    }
-
-    public void setCompanyRole(String companyRole) {
-        this.companyRole = companyRole;
-    }
-
-    public String getWorkflowStatus() {
-        return workflowStatus;
-    }
-
-    public void setWorkflowStatus(String workflowStatus) {
-        this.workflowStatus = workflowStatus;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/history/HistoryRequest.java

@@ -1,51 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.history;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
-import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
-
-import java.time.LocalDate;
-
-public class HistoryRequest {
-
-    @ApiModelProperty(value = "Таблица для поиска", example = "1200")
-    @JsonProperty
-    private String table;
-    @ApiModelProperty(value = "Начальный точка поиска по дате", example = "2022-12-25")
-    @JsonProperty
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate from;
-    @ApiModelProperty(value = "Конечная точка поиска по дате ", example = "2022-12-25")
-    @JsonProperty
-    @JsonSerialize(using = LocalDateSerializer.class)
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate to;
-
-    public String getTable() {
-        return table;
-    }
-
-    public void setTable(String table) {
-        this.table = table;
-    }
-
-    public LocalDate getFrom() {
-        return from;
-    }
-
-    public void setFrom(LocalDate from) {
-        this.from = from;
-    }
-
-    public LocalDate getTo() {
-        return to;
-    }
-
-    public void setTo(LocalDate to) {
-        this.to = to;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ChangeStatusExtractActionNew.java

@@ -1,82 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.registry;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.backendapi.domain.actions.IAction;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryChangeStatusExtractRequest;
-
-import java.math.BigDecimal;
-
-public class ChangeStatusExtractActionNew implements IAction<RegistryChangeStatusExtractRequest> {
-
-    @JsonIgnore
-    public Long id;
-    @JsonProperty
-    public String shortName;
-    @JsonProperty
-    public String contract;
-    @JsonProperty
-    public BigDecimal balance;
-    @JsonProperty
-    public String registryStatus;
-
-    @Override
-    public RegistryChangeStatusExtractRequest toRequest() {
-        var req = new RegistryChangeStatusExtractRequest();
-        req.setId(id);
-        req.setShortName(shortName);
-        req.setContract(contract);
-        req.setBalance(balance);
-        req.setRegistryStatus(registryStatus);
-        return req;
-    }
-
-
-    @ApiModelProperty(hidden = true)
-    @Override
-    public ActionType getActionType() {
-        return ActionType.UPDATE;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getShortName() {
-        return shortName;
-    }
-
-    public void setShortName(String shortName) {
-        this.shortName = shortName;
-    }
-
-    public String getContract() {
-        return contract;
-    }
-
-    public void setContract(String contract) {
-        this.contract = contract;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public String getRegistryStatus() {
-        return registryStatus;
-    }
-
-    public void setRegistryStatus(String registryStatus) {
-        this.registryStatus = registryStatus;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/IdentificationFundsActionNew.java

@@ -1,89 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.request.cud.registry;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-import ru.spcex.clearing.backendapi.domain.actions.IAction;
-import ru.spcex.clearing.backendapi.errors.BackEndError;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.IdentificationFundsRequest;
-import ru.spcex.platform.classes.base.interfaces.WithId;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class IdentificationFundsActionNew implements IAction<IdentificationFundsRequest>, WithId {
-
-    @JsonIgnore
-    public Long id;
-    @ApiModelProperty(value = "Сумма", example = "1600.20")
-    @JsonProperty
-    public BigDecimal balance;
-    @ApiModelProperty(value = "Торгово-клиринговый регистр", example = "1234")
-    @JsonProperty
-    public Long tradingClearingRegistryId;
-    @ApiModelProperty(value = "Идентификатор компании", example = "1234")
-    @JsonProperty
-    public Long companyId;
-
-    @Override
-    public IdentificationFundsRequest toRequest() {
-        var req = new IdentificationFundsRequest();
-        req.setId(id);
-        req.setBalance(balance);
-        req.setTradingClearingRegistryId(tradingClearingRegistryId);
-        req.setCompanyId(companyId);
-        return req;
-    }
-
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (id == null) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'id'"));
-        }
-        return errors;
-    }
-
-    @ApiModelProperty(hidden = true)
-    @Override
-    public ActionType getActionType() {
-        return ActionType.NEW;
-    }
-
-    @Override
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public Long getTradingClearingRegistryId() {
-        return tradingClearingRegistryId;
-    }
-
-    public void setTradingClearingRegistryId(Long tradingClearingRegistryId) {
-        this.tradingClearingRegistryId = tradingClearingRegistryId;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/NotificationUpdateAction.java

@@ -13,10 +13,6 @@ public class NotificationUpdateAction implements IAction<NotificationUpdateReque
     @ApiModelProperty(value = "Наименование статуса сообщения", example = "ACTV")
     @JsonProperty
     public String notificationStatus;
-    @ApiModelProperty(value = "Наименование отправителя (не исопльзуется)", example = "1234")
-    @JsonProperty(required = false)
-    @Deprecated
-    public Long senderId;
 
     @Override
     public NotificationUpdateRequest toRequest() {
@@ -47,12 +43,4 @@ public class NotificationUpdateAction implements IAction<NotificationUpdateReque
     public void setNotificationStatus(String notificationStatus) {
         this.notificationStatus = notificationStatus;
     }
-
-    public Long getSenderId() {
-        return senderId;
-    }
-
-    public void setSenderId(Long senderId) {
-        this.senderId = senderId;
-    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java

@@ -36,12 +36,9 @@ public class LauncherNew implements IAction<Object> {
     @JsonProperty
     private Long sessionId;
 
-    @ApiModelProperty(value = "Текущий баланс (свободно)", example = "12.22")
+    @ApiModelProperty(value = "Текущий баланс", example = "12.22")
     @JsonProperty
     private BigDecimal balance;
-    @ApiModelProperty(value = "Текущий баланс (всего)", example = "12.22")
-    @JsonProperty
-    private BigDecimal fullBalance;
     @ApiModelProperty(value = "Наименование инструмента/валюты", example = "SPB")
     @JsonProperty
     private String securitySymbol;
@@ -75,7 +72,6 @@ public class LauncherNew implements IAction<Object> {
         taskRunnerCommandRequest.setSessionType(sessionType);
         taskRunnerCommandRequest.setSessionId(sessionId);
         taskRunnerCommandRequest.setBalance(balance);
-        taskRunnerCommandRequest.setFullBalance(fullBalance);
         taskRunnerCommandRequest.setSecuritySymbol(securitySymbol);
         taskRunnerCommandRequest.setCreditLeg_amount(creditLeg_amount);
         taskRunnerCommandRequest.setPaymentPurpose(paymentPurpose);
@@ -219,12 +215,4 @@ public class LauncherNew implements IAction<Object> {
     public void setDebitLeg_accountId(Long debitLeg_accountId) {
         this.debitLeg_accountId = debitLeg_accountId;
     }
-
-    public BigDecimal getFullBalance() {
-        return fullBalance;
-    }
-
-    public void setFullBalance(BigDecimal fullBalance) {
-        this.fullBalance = fullBalance;
-    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityNewAction.java

@@ -39,10 +39,7 @@ public class FixedIncomeSecurityNewAction implements IAction<FixedIncomeSecurity
     @ApiModelProperty(value = "Размер лота", example = "300.5")
     @JsonProperty
     public BigDecimal lotSize;
-    @ApiModelProperty(value = "Текущее значение номинала", example = "200.4")
+    @ApiModelProperty(value = "Номинал", example = "200.5")
-    @JsonProperty
-    public BigDecimal nominalForDate;
-    @ApiModelProperty(value = "Номинал инструмента", example = "200.5")
     @JsonProperty
     public BigDecimal nominalValue;
     @ApiModelProperty(value = "Наименование валюты номинала", example = "RUB")
@@ -86,7 +83,6 @@ public class FixedIncomeSecurityNewAction implements IAction<FixedIncomeSecurity
         req.setIsin(this.getIsin());
         req.setBondType(this.getBondType());
         req.setLotSize(this.getLotSize());
-        req.setNominalForDate(this.getNominalForDate());
         req.setNominalValue(this.getNominalValue());
         req.setNominalCurrency(this.getNominalCurrency());
         req.setMaturityDate(this.getMaturityDate());
@@ -155,14 +151,6 @@ public class FixedIncomeSecurityNewAction implements IAction<FixedIncomeSecurity
         this.lotSize = lotSize;
     }
 
-    public BigDecimal getNominalForDate() {
-        return nominalForDate;
-    }
-
-    public void setNominalForDate(BigDecimal nominalForDate) {
-        this.nominalForDate = nominalForDate;
-    }
-
     public BigDecimal getNominalValue() {
         return nominalValue;
     }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/FixedIncomeSecurityUpdateAction.java

@@ -41,10 +41,7 @@ public class FixedIncomeSecurityUpdateAction implements IAction<FixedIncomeSecur
     @ApiModelProperty(value = "Размер лота", example = "300.5")
     @JsonProperty
     public BigDecimal lotSize;
-    @ApiModelProperty(value = "Текущее значение номинала", example = "200.4")
+    @ApiModelProperty(value = "Номинал", example = "200.5")
-    @JsonProperty
-    public BigDecimal nominalForDate;
-    @ApiModelProperty(value = "Номинал инструмента", example = "200.5")
     @JsonProperty
     public BigDecimal nominalValue;
     @ApiModelProperty(value = "Наименование валюты номинала", example = "RUB")
@@ -88,7 +85,6 @@ public class FixedIncomeSecurityUpdateAction implements IAction<FixedIncomeSecur
         req.setIsin(this.getIsin());
         req.setBondType(this.getBondType());
         req.setLotSize(this.getLotSize());
-        req.setNominalForDate(this.getNominalForDate());
         req.setNominalValue(this.getNominalValue());
         req.setNominalCurrency(this.getNominalCurrency());
         req.setMaturityDate(this.getMaturityDate());
@@ -165,14 +161,6 @@ public class FixedIncomeSecurityUpdateAction implements IAction<FixedIncomeSecur
         this.lotSize = lotSize;
     }
 
-    public BigDecimal getNominalForDate() {
-        return nominalForDate;
-    }
-
-    public void setNominalForDate(BigDecimal nominalForDate) {
-        this.nominalForDate = nominalForDate;
-    }
-
     public BigDecimal getNominalValue() {
         return nominalValue;
     }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/AnyKafkaMessageAction.java

@@ -0,0 +1,60 @@
+package ru.spcex.clearing.backendapi.controller.test;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRawValue;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModelProperty;
+import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
+
+public class AnyKafkaMessageAction implements IAction<TradingClearingRegistryNewRequest> {
+    @ApiModelProperty(value = "полное имя класса payload для BaseRequest", example = "ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest")
+    @JsonProperty
+    private String fullClassName;
+    @JsonProperty
+    private String topicName;
+    @JsonRawValue
+    public String json;
+
+    @JsonProperty("json")
+    private void unpackRawJson(JsonNode json) {
+        this.json = json.toString();
+    }
+
+    @Override
+    public TradingClearingRegistryNewRequest toRequest() {
+        var req = new TradingClearingRegistryNewRequest();
+        return req;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.SYSTEM;
+    }
+
+    public String getFullClassName() {
+        return fullClassName;
+    }
+
+    public void setFullClassName(String fullClassName) {
+        this.fullClassName = fullClassName;
+    }
+
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
+    public String getJson() {
+        return json;
+    }
+
+    public void setJson(String json) {
+        this.json = json;
+    }
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/test/KafkaApiController.java

@@ -0,0 +1,68 @@
+package ru.spcex.clearing.backendapi.controller.test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.ClassUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import ru.spcex.clearing.backendapi.errors.BackEndError;
+import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
+import ru.spcex.platform.utils.error.ValidationException;
+import ru.spcex.platform.utils.text.TextUtil;
+
+@Controller
+@RequestMapping("/anonymous/kafka-api")
+public class KafkaApiController {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final KafkaSender kafkaSender;
+    private static final ObjectMapper json = new ObjectMapper();
+    static {
+    }
+
+    @Autowired
+    public KafkaApiController(KafkaSender kafkaSender) {
+        this.kafkaSender = kafkaSender;
+    }
+
+    @ApiOperation(value = "Test backend-api availability.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = String.class)})
+    @RequestMapping(method = RequestMethod.POST, path = "/any/message", produces = MediaType.TEXT_PLAIN_VALUE)
+    @ResponseBody
+    public String processGet(@ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody AnyKafkaMessageAction bankAccountNewAction) throws ClassNotFoundException, ValidationException, JsonProcessingException {
+        log.info("Call test method for backend-api controller");
+        validate(bankAccountNewAction);
+        Class<?> parameterType = ClassUtils.forName(bankAccountNewAction.getFullClassName(), ClassUtils.getDefaultClassLoader());
+        JavaType requestType = json.getTypeFactory().constructSimpleType(parameterType, null);
+        Object obj = json.readValue(bankAccountNewAction.getJson(), requestType);
+        Long idOfBaseRequestMessage = kafkaSender.sendRequestToQueue(bankAccountNewAction.getTopicName(), obj);
+        log.debug("Test message to topic {} with request id={}", bankAccountNewAction.getTopicName(), idOfBaseRequestMessage);
+        return "success: baseRequest.id = " + idOfBaseRequestMessage;
+    }
+
+    private void validate(AnyKafkaMessageAction bankAccountNewAction) throws ValidationException {
+        if (TextUtil.isEmpty(bankAccountNewAction.getTopicName())) {
+            throw new ValidationException(new EnumMessage(BackEndError.ValidationError, "topicName"));
+        }
+        if (TextUtil.isEmpty(bankAccountNewAction.getFullClassName())) {
+            throw new ValidationException(new EnumMessage(BackEndError.ValidationError, "fullClassName"));
+        }
+        if (TextUtil.isEmpty(bankAccountNewAction.getJson())) {
+            throw new ValidationException(new EnumMessage(BackEndError.ValidationError, "json"));
+        }
+    }
+
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/GetResponseFactory.java

@@ -5,7 +5,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.utils.time.TimeUtil;
 
 import java.text.SimpleDateFormat;
@@ -131,19 +130,6 @@ public class GetResponseFactory {
         response.put(name, data);
     }
 
-    public Optional<Class<? extends SpcexObjectBase>> classByDestination(String destination) {
-        Map<String, ObjectExtracted> extracted = meta.getObjectsExtractedByDestination();
-        ObjectExtracted objectExtracted = extracted.get(destination);
-        if (objectExtracted == null) return Optional.empty();
-        try {
-            Class<? extends SpcexObjectBase> clazz = (Class<? extends SpcexObjectBase>) objectExtracted.getClazz();
-            return Optional.ofNullable(clazz);
-        } catch (Exception e) {
-            log.error(ExceptionUtils.getStackTrace(e));
-            return Optional.empty();
-        }
-    }
-
     private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter
             .ofPattern("yyyy-MM-dd'T'HH:mm:ss+03:00")
             .withLocale(Locale.US)

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/MetaServer.java

@@ -3,7 +3,6 @@ package ru.spcex.clearing.backendapi.meta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.spcex.platform.utils.log.ExceptionUtils;
-import ru.spcex.platform.utils.text.TextUtil;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -68,8 +67,6 @@ public class MetaServer extends MetaBase {
                         objectsExtractedByClazz.put(String.valueOf(classNameMock++), oe);
                     if (objectElement.getSubscription() != null && objectElement.getSubscription().destination != null) {
                         objectsExtractedByDestination.put(objectElement.getSubscription().destination, oe);
-                    } else if (!TextUtil.isEmpty(objectElement.getDestination())) {
-                        objectsExtractedByDestination.put(objectElement.getDestination(), oe);
                     }
                     for (ActionElement actionElement : objectElement.getActions()) {
                         if (actionElement.getClazz() == null) {

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/meta/ObjectElement.java

@@ -18,10 +18,6 @@ public class ObjectElement {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String table = null;
 
-    @JsonProperty(required = false)
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private String destination = null;
-
     @JsonProperty(value = "fields", required = true)
     private List<ActionField> fields = new LinkedList<>();
 
@@ -80,12 +76,4 @@ public class ObjectElement {
     public Subscription getSubscriptionHistory() {
         return subscriptionHistory;
     }
-
-    public String getDestination() {
-        return destination;
-    }
-
-    public void setDestination(String destination) {
-        this.destination = destination;
-    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/IStateLoader.java

@@ -1,7 +1,6 @@
 package ru.spcex.clearing.backendapi.service;
 
 import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 
 import java.util.Collection;
 import java.util.Map;
@@ -16,10 +15,4 @@ public interface IStateLoader {
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName, Class<T> clazz);
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransformSpecificClass(String mapName, Class<T> clazz);
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName, Class<T> clazz, Map<String, ? extends Comparable<?>> conditions);
-    <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName, Class<T> clazz, ImdgPredicate conditions);
-    <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(
-            String searchMapName,
-            String mapName,
-            Class<T> clazz,
-            ImdgPredicate conditions);
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/impl/StateLoaderImpl.java

@@ -1,33 +1,28 @@
 package ru.spcex.clearing.backendapi.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class StateLoaderImpl implements IStateLoader {
     private final Map<String, Imdg<?>> allImdgMaps;
-    private final Map<String, Imdg<?>> allHistMaps;
     private final ImdgProvider imdgProvider;
-    private final ImdgProvider imdgHistProvider;
     private final GetResponseFactory responseFactory;
 
     @Autowired
-    public StateLoaderImpl(@Qualifier("imdgProvider") ImdgProvider imdgProvider,
+    public StateLoaderImpl(ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
-                           @Qualifier("imdgProviderHist") ImdgProvider imdgHistProvider, GetResponseFactory responseFactory) {
-        this.imdgHistProvider = imdgHistProvider;
         this.responseFactory = responseFactory;
         this.allImdgMaps = new ConcurrentHashMap<>();
-        this.allHistMaps = new HashMap<>();
         this.imdgProvider = imdgProvider;
     }
 
@@ -64,38 +59,8 @@ public class StateLoaderImpl implements IStateLoader {
         return responseFactory.responseFromObjectCollection(all);
     }
 
-    @Override
-    public <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName,
-                                                                                           Class<T> clazz,
-                                                                                           ImdgPredicate conditions) {
-        Imdg<T> imdg = getImdg(mapName, clazz);
-        Collection<T> all = imdg.getCollectionObjectsByPredicate(conditions);
-        return responseFactory.responseFromObjectCollection(all);
-    }
-
     @SuppressWarnings("unchecked")
     private <T extends SpcexObjectBase> Imdg<T> getImdg(String mapName, Class<T> clazz) {
         return (Imdg<T>) allImdgMaps.computeIfAbsent(mapName, (mapName1) -> imdgProvider.getImdg(mapName, clazz));
     }
-
-    @SuppressWarnings("unchecked")
-    private <T extends SpcexObjectBase> Imdg<T> getHistImdg(String mapName, Class<T> clazz) {
-        return (Imdg<T>) allHistMaps.computeIfAbsent(mapName, (mapName1) -> imdgHistProvider.getImdg(mapName, clazz));
-    }
-
-    @Override
-    public <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(
-            String searchMapName,
-            String mapName,
-            Class<T> clazz,
-            ImdgPredicate conditions) {
-        Imdg<SpcexObjectBase> imdgSearch = getHistImdg(searchMapName, SpcexObjectBase.class);
-        Imdg<T> imdgHistory = getHistImdg(mapName, clazz);
-        Collection<Long> ids = imdgSearch.getCollectionIdsByPredicate(conditions);
-        return ids.stream()
-                .map(imdgHistory::getSingleObjectByID)
-                .filter(Objects::nonNull)
-                .map(o -> responseFactory.responseFromObject(o, clazz))
-                .toList();
-    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java

@@ -87,14 +87,8 @@ public class ActionMetaValidation implements InitializingBean {
                         Object value = field.extractValue(object);
                     }
                 } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                    String className = metaAction.getClazz().getName();
+                    log.warn("Error self-test validator on class {} and field {}: {}",
-                    if (className.endsWith(".MoneyMarketSecurityUpdateAction") || className.endsWith(".ChangeRefundDateActionNew")) {
+                            metaAction.getClazz(), field.getMemberName(), ExceptionUtils.getStackTrace(e));
-                        log.warn("Expected warning self-test validator on class {} and field {}: {}",
-                                className, field.getMemberName(), e.toString());
-                    } else {
-                        log.warn("Error self-test validator on class {} and field {}: {}",
-                                className, field.getMemberName(), ExceptionUtils.getStackTrace(e));
-                    }
                 }
             }
         }

clearing-parent/backend-api/src/main/resources/application.properties

@@ -9,9 +9,6 @@ backend-api.example-setting=test
 backend-api.hazelcast.cluster-members=127.0.0.1:5701
 backend-api.hazelcast.login=dev
 backend-api.hazelcast.password=dev-pass
-backend-api.hazelcast-search.cluster-members=127.0.0.1:5702
-backend-api.hazelcast-search.login=dev-hist
-backend-api.hazelcast-search.password=dev-pass-hist
 backend-api.kafka-producer.bootstrap-servers=localhost:9092
 backend-api.kafka-producer.acks=all
 backend-api.kafka-producer.retries=0

clearing-parent/backend-api/src/main/resources/meta/data.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<meta version="3.9.0.68">
+<meta version="3.5.0.13">
 	<enums>
 		<allowed id="1" code="ALWD" name="Разрешено"/>
 		<allowed id="2" code="DEND" name="Запрещено"/>
@@ -111,7 +111,7 @@
 
 		<tradingClearingRegistryType id="1" code="A" name="Владелец"/>
 		<tradingClearingRegistryType id="2" code="B" name="Клиентский"/>
-		<tradingClearingRegistryType id="3" code="C" name="Клиентский"/>
+		<tradingClearingRegistryType id="3" code="C" name="Попечитель"/>
 		<tradingClearingRegistryType id="4" code="D" name="Доверительный управляющий"/>
 		<tradingClearingRegistryType id="5" code="E" name="Эмитент"/>
 		<tradingClearingRegistryType id="6" code="Z" name="К размещению/выкупу"/>
@@ -155,8 +155,7 @@
 		<registryUnit id="4" code="C" name="Комиссия"/>
 		<registryUnit id="5" code="U" name="Невыясненные"/>
 		<registryUnit id="5" code="I" name="Списания/зачисления"/>
-		<registryUnit id="7" code="V" name="Выписка"/>
+        <registryCode id="1" code="AMAT" name="Денежные средства - общие"/>
-		<registryCode id="1" code="AMAT" name="Денежные средства Участника клиринга, зарезервированные на торги"/>
         <registryCode id="2" code="AMAF" name="Денежные средства - свободные"/>
         <registryCode id="3" code="AMAB" name="Денежные средства - блокированные"/>
         <registryCode id="4" code="TMAT" name="Требования по деньгам"/>
@@ -167,7 +166,7 @@
         <registryCode id="9" code="LSAT" name="Рассчитанные обязательства по бумагам"/>
         <registryCode id="10" code="LMAT" name="Рассчитанные обязательства по деньгам"/>
         <registryCode id="11" code="CSAT" name="Рассчитанные требования по бумагам"/>
-		<registryCode id="12" code="AMBT" name="Денежные средства Участника клиринга, зарезервированные на торги – клиенты"/>
+        <registryCode id="12" code="AMBT" name="Денежные средства клиента - общие"/>
         <registryCode id="13" code="AMBF" name="Денежные средства клиента - свободные"/>
         <registryCode id="14" code="AMBB" name="Денежные средства клиента - блокированные"/>
         <registryCode id="15" code="TMBT" name="Требования по деньгам (кл)"/>
@@ -180,18 +179,12 @@
         <registryCode id="22" code="CSBT" name="Рассчитанные требования по бумагам (кл)"/>
         <registryCode id="23" code="DMAT" name="Возврат депозита"/>
         <registryCode id="24" code="DMBT" name="Возврат депозита (кл)"/>
-		<registryCode id="25" code="ASAT" name="Ценные бумаги Участника клиринга – свои"/>
+        <registryCode id="25" code="ASAT" name="Ценные бумаги - общие"/>
         <registryCode id="26" code="ASAF" name="Ценные бумаги - свободные"/>
         <registryCode id="27" code="ASAB" name="Ценные бумаги - блокированные"/>
         <registryCode id="28" code="DMAX" name="Возврат инициатору"/>
         <registryCode id="29" code="DMBX" name="Возврат инициатору (кл)"/>
         <registryCode id="30" code="DMAU" name="Денежные средства - невыясненные"/>
-		<registryCode id="31" code="DMAV" name="Треб. выписки"/>
-		<registryCode id="32" code="ASZT" name="Ценные бумаги для размещения/выкупа"/>
-		<registryCode id="33" code="ASBT" name="Ценные бумаги Участника клиринга – клиенты"/>
-		<registryCode id="34" code="ASCT" name="Ценные бумаги Участника клиринга – клиенты-нерезиденты"/>
-		<registryCode id="35" code="AMCT" name="Денежные средства Участника клиринга, зарезервированные на торги – клиенты"/>
-		<registryCode id="36" code="ASXT" name="Ценные бумаги Участника клиринга – ДУ"/>
 		<registryStatus id="1" code="OK" name="Рассчитано"/>
 		<registryStatus id="2" code="UNCV" name="Не исполнено"/>
 		<registryStatus id="3" code="FAIL" name="Не исполнено контрагентом"/>
@@ -218,7 +211,7 @@
 		<accountType id="10" code="DTRN" name="Депозитарный транзакционный счет"/>
 		<depoAccountType id="1" code="A" name="Счет участника"/>
 		<depoAccountType id="2" code="B" name="Счет клиента"/>
-		<depoAccountType id="3" code="C" name="Счет нерезидента"/>
+		<depoAccountType id="3" code="C" name="Счет попечителя"/>
 		<depoAccountType id="4" code="D" name="Счет доверительного управляющего"/>
 		<depoAccountType id="5" code="Z" name="Счет к размещению/выкупу"/>
 		<depoAccountType id="6" code="F" name="Счет держателя"/>
@@ -250,10 +243,6 @@
 		<task id="23" code="GRET" name="Формирование отчетности по сделкам"/>
 		<task id="24" code="GREF" name="Формирование итоговой отчетности"/>
 		<task id="25" code="FDFF" name="Формирование ДФ-05 с кодом 9 (финальный)"/>
-		<task id="26" code="SDEP" name="Время начала возврата депозитов"/>
-		<task id="27" code="EDEP" name="Время завершения возврата депозитов"/>
-		<task id="28" code="CHDF" name="Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21"/>
-		<task id="29" code="CCLR" name="Завершение неудачных клиринговых сессий"/>
 		<taskStatus id="1" code="ACTV" name="Активна"/>
 		<taskStatus id="2" code="BLKD" name="Не активна"/>
 		<taskStatus id="3" code="CNCL" name="Отмена расписания"/>
@@ -280,7 +269,7 @@
 
 		<sessionType id="1" code="FINL" name="Итоговая клиринговая сессия"/>
 		<sessionType id="2" code="MEDM" name="Промежуточная клиринговая сессия"/>
-		<sessionType id="3" code="XDEP" name="Возврат депозитов"/>
+		<sessionType id="3" code="XDEP" name="Промежуточная возврат депозитов"/>
 		<sessionType id="4" code="IPOT" name="Первичные торги Т0"/>
 		<sessionType id="5" code="TRDT" name="Вторичные торги Т0"/>
 		<sessionType id="6" code="LIQU" name="Ликвидационное прекращение обязательств"/>
@@ -321,8 +310,6 @@
 		<objectType id="2" code="VFRS" name="verificationResult"/>
 		<objectType id="3" code="RGST" name="registry"/>
 		<objectType id="4" code="GTWY" name="gateway-api"/>
-		<objectType id="5" code="ACCA" name="account"/>
-		<objectType id="6" code="ACCB" name="account"/>
 		<notificationStatus id="1" code="PEND" name="В ожидании"/>
 		<notificationStatus id="2" code="CNCL" name="Отменено"/>
 		<notificationStatus id="3" code="ACPT" name="Принято"/>
@@ -356,7 +343,7 @@
 		<errorCode id="1008" code="SECR" name="Пользователь %s неактивен."/>
 		<errorCode id="1010" code="SECR" name="Инструмент %s уже существует."/>
 		<errorCode id="1011" code="SECR" name="Инструмент %s не найден."/>
-		<errorCode id="1012" code="SECR" name="Инструмент %s неактивен."/> <!-- параметр security.securitySymbol -->
+		<errorCode id="1012" code="SECR" name="Инструмент %s неактивен."/>
 		<errorCode id="1013" code="SECR" name="Запись по инструменту %s уже существует."/>
 		<errorCode id="1014" code="SECR" name="Запись по инструменту %s не найдена."/>
 		<errorCode id="1015" code="SECR" name="Валюта %s уже существует."/>
@@ -390,7 +377,7 @@
 		<errorCode id="3006" code="CMPN" name="Запись с идентификатором %s не найдена."/>
 		<errorCode id="3010" code="CMPN" name="Компания %s уже существует"/>
 		<errorCode id="3011" code="CMPN" name="Компания %s не найдена."/>
-		<errorCode id="3012" code="CMPN" name="Компания %s неактивна."/> <!-- параметр company.shortName -->
+		<errorCode id="3012" code="CMPN" name="Компания %s неактивна."/>
 		<errorCode id="3013" code="CMPN" name="Профиль компании %s не найден."/>
 		<errorCode id="3014" code="CMPN" name="Реквизит компании %s не найден."/>
 		<errorCode id="3015" code="CMPN" name="Контакт компании %s не найден."/>
@@ -433,8 +420,6 @@
  		<errorCode id="5019" code="ACNT" name="Для компании %s отсутствует категория %s."/>
  		<errorCode id="5022" code="ACNT" name="Для компании %s отсутствует клиринговый код."/>
  		<errorCode id="5023" code="ACNT" name="Счет %s уже используется."/>
- 		<errorCode id="5024" code="ACNT" name="Не указан номер счета."/>
- 		<errorCode id="5025" code="ACNT" name="Необходимо указать ДЕПО счет."/>
 		<!-- error code for balance-service -->
 		<errorCode id="5200" code="BLNC" name="Общая ошибка модуля balance-service."/>
 		<errorCode id="5210" code="BLNC" name="Клиринговая сессия неактивна."/>
@@ -476,15 +461,8 @@
 		<errorCode id="5423" code="CLRN" name="Новые сделки отсутствуют."/>
 		<errorCode id="5424" code="CLRN" name="Идентифицированные средства по возврату депозита превышают обязательства"/>
 		<errorCode id="5425" code="CLRN" name="Запрещена идентификация средства по рассчитанным обязательствам."/>
-		<errorCode id="5426" code="CLRN" name="Дата оплаты вклада депозита меньше новой даты возврата."/>
+		<errorCode id="5426" code="CLRN" name="Режим списаний и зачислений отключен в настройках модуля."/>
 		<errorCode id="5427" code="CLRN" name="Найдено больше одной записи %s."/>
-		<errorCode id="5428" code="CLRN" name="Активная клиринговая сессия уже существует."/>
-		<errorCode id="5429" code="CLRN" name="ДФ57 Счет %s не соответствует компании %s"/>
-		<errorCode id="5430" code="CLRN" name="Неверный код регистра: %s"/>
-		<errorCode id="5431" code="CLRN" name="Дата возврата для депозита с разделением не может быть изменена"/>
-		<errorCode id="5432" code="CLRN" name="После сверки обнаружена разница между плановым и фактическим балансом"/>
-		<errorCode id="5433" code="CLRN" name="Сессия по возврату депозита не может исполняться вне временного интервала, установленного в системе"/>
-		<errorCode id="5434" code="CLRN" name="Операция невозможна по счету с типом %s."/>
 		<!-- error code for dbf-importer -->
 		<errorCode id="5600" code="DBFI" name="Общая ошибка модуля dbf-importer."/>
 		<!-- error code for dbf-exporter -->
@@ -494,8 +472,6 @@
 		<errorCode id="6000" code="GTWA" name="Общая ошибка модуля gateway-api."/>
 		<errorCode id="6001" code="GTWA" name="Не удается найти запись %s в Company"/>
 		<errorCode id="6002" code="GTWA" name="Не удается найти запись %s в security"/>
-		<errorCode id="6003" code="GTWA" name="Превышен интервал ожидания ответа от внешней системы"/>
-		<errorCode id="6004" code="GTWA" name="Получен отрицательный ответ на запрос системы"/>
 
 		<!-- error code for scheduler-service -->
 		<errorCode id="7000" code="SCHD" name="Общая ошибка модуля scheduler-service."/>
@@ -532,6 +508,92 @@
 
 	</enums>
 	<objects>
+		<company id="1" fullName="АО Санкт-Петербургская Валютная Биржа" shortName="СПВБ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
+		<company id="2" fullName="ЗАО «Петербургский Расчетный Центр»" shortName="ПРЦ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
+		<company id="3" fullName="Торговая организация" shortName="ТС" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
+		<company id="4" fullName="ЗАО «Санкт-Петербургский Расчетно-Депозитарный Центр»" shortName="РДЦ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
+		<!--company id="5" fullName="Центральный Банк Российской Федерации" shortName="ЦБ РФ" tradingCode="" clearingCode="" workflowStatus="ACTV"/-->
+		<companySymbols id="1" companyId="1" companySymbol="BIC" companySymbolValue="044030920"/>
+		<companySymbols id="2" companyId="2" companySymbol="BIC" companySymbolValue="044030505"/>
+		<currency id="643" currency_code="RUB"/>
+		<security instrumentType="CRNC" shortName="RUB" fullName="Российский рубль" securitySymbol="RUB" workflowStatus="ACTV" id="643"/>
+		<account id="1" companyId="1" account="30414810300000006000" accountType="TRAN" status="ACTV" processingSign="ALWD"/>
+		<account id="2" companyId="1" account="30414810600000007000" accountType="ANLT" status="ACTV" processingSign="ALWD"/>
+		<account id="3" companyId="1" account="700100000AT0" accountType="DTRN" status="ACTV" processingSign="ALWD"/>
+
+
+		<market id="1" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UESC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Обыкновенные акции"/>
+		<market id="2" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NESC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Обыкновенные акции"/>
+		<market id="3" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DESC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Обыкновенные акции"/>
+		<market id="4" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="AESC" name="Размещение: акции (аукцион по цене)" exchangeId="1" description="Размещение: акции (аукцион по цене): Обыкновенные акции"/>
+		<market id="5" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WESC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Обыкновенные акции"/>
+		<market id="6" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UEPC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Привилегированные акции"/>
+		<market id="7" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NEPC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Привилегированные акции"/>
+		<market id="8" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DEPC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Привилегированные акции"/>
+		<market id="9" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="AEPC" name="Размещение: акции (аукцион по цене)" exchangeId="1" description="Размещение: акции (аукцион по цене): Привилегированные акции"/>
+		<market id="10" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WEPC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Привилегированные акции"/>
+		<market id="11" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABVC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Купонные облигации с переменным купоном"/>
+		<market id="12" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBVC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Купонные облигации с переменным купоном"/>
+		<market id="13" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBVC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Купонные облигации с переменным купоном"/>
+		<market id="14" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBVC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Купонные облигации с переменным купоном"/>
+		<market id="15" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBVC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Купонные облигации с переменным купоном"/>
+		<market id="16" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBVC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Купонные облигации с переменным купоном"/>
+		<market id="17" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABFC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Купонные облигации с постоянным купоном"/>
+		<market id="18" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBFC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Купонные облигации с постоянным купоном"/>
+		<market id="19" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBFC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Купонные облигации с постоянным купоном"/>
+		<market id="20" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBFC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Купонные облигации с постоянным купоном"/>
+		<market id="21" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBFC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Купонные облигации с постоянным купоном"/>
+		<market id="22" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBFC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Купонные облигации с постоянным купоном"/>
+		<market id="23" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABIC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Облигации с индексированным номиналом"/>
+		<market id="24" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBIC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Облигации с индексированным номиналом"/>
+		<market id="25" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBIC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации с индексированным номиналом"/>
+		<market id="26" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBIC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации с индексированным номиналом"/>
+		<market id="27" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBIC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации с индексированным номиналом"/>
+		<market id="28" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBIC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Облигации с индексированным номиналом"/>
+		<market id="29" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABMC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Облигации с амортизацией долга"/>
+		<market id="30" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBMC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Облигации с амортизацией долга"/>
+		<market id="31" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBMC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации с амортизацией долга"/>
+		<market id="32" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBMC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации с амортизацией долга"/>
+		<market id="33" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBMC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации с амортизацией долга"/>
+		<market id="34" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBMC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Облигации с амортизацией долга"/>
+		<market id="35" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BKVC" name="Размещение: Аукцион БР" exchangeId="1" description="Размещение: Аукцион БР: Облигации Банка России с переменным купоном (КОБР)"/>
+		<market id="36" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SKVC" name="Доразмещение: Адресные заявки БР" exchangeId="1" description="Доразмещение: Адресные заявки БР: Облигации Банка России с переменным купоном (КОБР)"/>
+		<market id="37" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UKVC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации Банка России с переменным купоном (КОБР)"/>
+		<market id="38" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NKVC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации Банка России с переменным купоном (КОБР)"/>
+		<market id="39" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DKVC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации Банка России с переменным купоном (КОБР)"/>
+		<market id="45" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABEC" name="Размещение: Аукцион СПВБ" exchangeId="1" description="Размещение: Аукцион СПВБ: Биржевые облигации"/>
+		<market id="46" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBEC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Биржевые облигации"/>
+		<market id="47" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBEC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Биржевые облигации"/>
+		<market id="48" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBEC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Биржевые облигации"/>
+		<market id="61" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMVC" name="ОФЗПК-Размещение: Аукцион БР" exchangeId="1" description="ОФЗПК-Размещение: Аукцион БР: Облигации Минфина"/>
+		<market id="62" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMVC" name="ОФЗПК-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗПК-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
+		<market id="63" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMVC" name="ОФЗПК-Режим непрерывных торгов" exchangeId="1" description="ОФЗПК-Режим непрерывных торгов: Облигации Минфина"/>
+		<market id="64" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMVC" name="ОФЗПК-Дискретный аукцион" exchangeId="1" description="ОФЗПК-Дискретный аукцион: Облигации Минфина"/>
+		<market id="65" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMVC" name="ОФЗПК-Торги в режиме выкупа" exchangeId="1" description="ОФЗПК-Торги в режиме выкупа: Облигации Минфина"/>
+		<market id="66" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMFC" name="ОФЗПД-Размещение: Аукцион БР" exchangeId="1" description="ОФЗПД-Размещение: Аукцион БР: Облигации Минфина"/>
+		<market id="67" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMFC" name="ОФЗПД- Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗПД- Доразмещение: Адресные заявки БР: Облигации Минфина"/>
+		<market id="68" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMFC" name="ОФЗПД-Режим непрерывных торгов" exchangeId="1" description="ОФЗПД-Режим непрерывных торгов: Облигации Минфина"/>
+		<market id="69" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMFC" name="ОФЗПД-Дискретный аукцион" exchangeId="1" description="ОФЗПД-Дискретный аукцион: Облигации Минфина"/>
+		<market id="70" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMFC" name="ОФЗПД-Торги в режиме выкупа" exchangeId="1" description="ОФЗПД-Торги в режиме выкупа: Облигации Минфина"/>
+		<market id="71" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMMC" name="ОФЗАД-Размещение: Аукцион БР" exchangeId="1" description="ОФЗАД-Размещение: Аукцион БР: Облигации Минфина"/>
+		<market id="72" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMMC" name="ОФЗАД-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗАД-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
+		<market id="73" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMMC" name="ОФЗАД-Режим непрерывных торгов" exchangeId="1" description="ОФЗАД-Режим непрерывных торгов: Облигации Минфина"/>
+		<market id="74" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMMC" name="ОФЗАД-Дискретный аукцион" exchangeId="1" description="ОФЗАД-Дискретный аукцион: Облигации Минфина"/>
+		<market id="75" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMMC" name="ОФЗАД-Торги в режиме выкупа" exchangeId="1" description="ОФЗАД-Торги в режиме выкупа: Облигации Минфина"/>
+		<market id="76" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMIC" name="ОФЗИН-Размещение: Аукцион БР" exchangeId="1" description="ОФЗИН-Размещение: Аукцион БР: Облигации Минфина"/>
+		<market id="77" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMIC" name="ОФЗИН-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗИН-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
+		<market id="78" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMIC" name="ОФЗИН-Режим непрерывных торгов" exchangeId="1" description="ОФЗИН-Режим непрерывных торгов: Облигации Минфина"/>
+		<market id="79" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMIC" name="ОФЗИН-Дискретный аукцион" exchangeId="1" description="ОФЗИН-Дискретный аукцион: Облигации Минфина"/>
+		<market id="80" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMIC" name="ОФЗИН-Торги в режиме выкупа" exchangeId="1" description="ОФЗИН-Торги в режиме выкупа: Облигации Минфина"/>
+		<market id="82" marketType="SCND" section="FOND" settlementCurrency="RUB" code="BBVC" name="ОФЗ-ПК - Аукцион БР" exchangeId="1" description="ОФЗ-ПК - Аукцион БР"/>
+		<market id="83" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTATSS" name="СПб ГУП АТС Смольного" exchangeId="1" description="СПб ГУП АТС Смольного"/>
+		<market id="88" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMTTKFSP" name="Комитет финансов СПб" exchangeId="1" description="Комитет финансов СПб"/>
+		<market id="89" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDSKFLO" name="Комитет финансов ЛО" exchangeId="1" description="Комитет финансов ЛО"/>
+		<market id="90" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTFSKB" name="ФСКМБ" exchangeId="1" description="ФСКМБ"/>
+		<market id="91" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDSFGGE" name="ФАУ ГГЭ" exchangeId="1" description="ФАУ ГГЭ"/>
+		<market id="92" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTVRGO" name="ВВО РГО" exchangeId="1" description="ВВО РГО"/>
+		<market id="93" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTTDRM" name="ООО Торговый дом РМ-Рейл" exchangeId="1" description="ООО Торговый дом РМ-Рейл"/>
+		<market id="95" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTRKFN" name="АО РК Финанс" exchangeId="1" description="АО РК Финанс"/>
 	</objects>
 </meta>
 		

clearing-parent/backend-api/src/main/resources/meta/data_initial.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<meta version="3.9.0.68">
-	<enums>
-
-	</enums>
-	<objects>
-		<company id="1" fullName="АО Санкт-Петербургская Валютная Биржа" shortName="СПВБ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
-		<company id="2" fullName="ЗАО «Петербургский Расчетный Центр»" shortName="ПРЦ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
-		<company id="3" fullName="Торговая организация" shortName="ТС" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
-		<company id="4" fullName="ЗАО «Санкт-Петербургский Расчетно-Депозитарный Центр»" shortName="РДЦ" tradingCode="" clearingCode="" workflowStatus="ACTV"/>
-		<!--company id="5" fullName="Центральный Банк Российской Федерации" shortName="ЦБ РФ" tradingCode="" clearingCode="" workflowStatus="ACTV"/-->
-		<companySymbols id="1" companyId="1" companySymbol="BIC" companySymbolValue="044030920"/>
-		<companySymbols id="2" companyId="2" companySymbol="BIC" companySymbolValue="044030505"/>
-		<currency id="643" currency_code="RUB"/>
-		<security id="643" instrumentType="CRNC" shortName="RUB" fullName="Российский рубль" securitySymbol="RUB" workflowStatus="ACTV"/>
-		<account id="1" companyId="1" account="30414810300000006000" accountType="TRAN" status="ACTV" processingSign="ALWD"/>
-		<account id="2" companyId="1" account="30414810600000007000" accountType="ANLT" status="ACTV" processingSign="ALWD"/>
-		<account id="3" companyId="1" account="700100000AT0" accountType="DTRN" status="ACTV" processingSign="ALWD"/>
-		<market id="1" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UESC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Обыкновенные акции"/>
-		<market id="2" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NESC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Обыкновенные акции"/>
-		<market id="3" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DESC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Обыкновенные акции"/>
-		<market id="4" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="AESC" name="Размещение: акции (аукцион по цене)" exchangeId="1" description="Размещение: акции (аукцион по цене): Обыкновенные акции"/>
-		<market id="5" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WESC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Обыкновенные акции"/>
-		<market id="6" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UEPC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Привилегированные акции"/>
-		<market id="7" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NEPC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Привилегированные акции"/>
-		<market id="8" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DEPC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Привилегированные акции"/>
-		<market id="9" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="AEPC" name="Размещение: акции (аукцион по цене)" exchangeId="1" description="Размещение: акции (аукцион по цене): Привилегированные акции"/>
-		<market id="10" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WEPC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Привилегированные акции"/>
-		<market id="11" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABVC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Купонные облигации с переменным купоном"/>
-		<market id="12" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBVC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Купонные облигации с переменным купоном"/>
-		<market id="13" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBVC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Купонные облигации с переменным купоном"/>
-		<market id="14" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBVC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Купонные облигации с переменным купоном"/>
-		<market id="15" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBVC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Купонные облигации с переменным купоном"/>
-		<market id="16" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBVC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Купонные облигации с переменным купоном"/>
-		<market id="17" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABFC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Купонные облигации с постоянным купоном"/>
-		<market id="18" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBFC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Купонные облигации с постоянным купоном"/>
-		<market id="19" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBFC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Купонные облигации с постоянным купоном"/>
-		<market id="20" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBFC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Купонные облигации с постоянным купоном"/>
-		<market id="21" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBFC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Купонные облигации с постоянным купоном"/>
-		<market id="22" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBFC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Купонные облигации с постоянным купоном"/>
-		<market id="23" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABIC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Облигации с индексированным номиналом"/>
-		<market id="24" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBIC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Облигации с индексированным номиналом"/>
-		<market id="25" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBIC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации с индексированным номиналом"/>
-		<market id="26" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBIC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации с индексированным номиналом"/>
-		<market id="27" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBIC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации с индексированным номиналом"/>
-		<market id="28" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBIC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Облигации с индексированным номиналом"/>
-		<market id="29" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABMC" name="Размещение: Аукцион по цене" exchangeId="1" description="Размещение: Аукцион по цене: Облигации с амортизацией долга"/>
-		<market id="30" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="KBMC" name="Размещение: Аукцион по ставке" exchangeId="1" description="Размещение: Аукцион по ставке: Облигации с амортизацией долга"/>
-		<market id="31" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBMC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации с амортизацией долга"/>
-		<market id="32" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBMC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации с амортизацией долга"/>
-		<market id="33" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBMC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации с амортизацией долга"/>
-		<market id="34" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="WBMC" name="Размещение: адресные заявки (подписка)" exchangeId="1" description="Размещение: адресные заявки (подписка): Облигации с амортизацией долга"/>
-		<market id="35" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BKVC" name="Размещение: Аукцион БР" exchangeId="1" description="Размещение: Аукцион БР: Облигации Банка России с переменным купоном (КОБР)"/>
-		<market id="36" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SKVC" name="Доразмещение: Адресные заявки БР" exchangeId="1" description="Доразмещение: Адресные заявки БР: Облигации Банка России с переменным купоном (КОБР)"/>
-		<market id="37" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UKVC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Облигации Банка России с переменным купоном (КОБР)"/>
-		<market id="38" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NKVC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Облигации Банка России с переменным купоном (КОБР)"/>
-		<market id="39" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DKVC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Облигации Банка России с переменным купоном (КОБР)"/>
-		<market id="45" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="ABEC" name="Размещение: Аукцион СПВБ" exchangeId="1" description="Размещение: Аукцион СПВБ: Биржевые облигации"/>
-		<market id="46" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UBEC" name="Режим непрерывных торгов" exchangeId="1" description="Режим непрерывных торгов: Биржевые облигации"/>
-		<market id="47" marketType="SCND" section="FOND" settlementCurrency="RUB" code="NBEC" name="Режим переговорных сделок (РПС)" exchangeId="1" description="Режим переговорных сделок (РПС): Биржевые облигации"/>
-		<market id="48" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DBEC" name="Дискретный аукцион" exchangeId="1" description="Дискретный аукцион: Биржевые облигации"/>
-		<market id="61" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMVC" name="ОФЗПК-Размещение: Аукцион БР" exchangeId="1" description="ОФЗПК-Размещение: Аукцион БР: Облигации Минфина"/>
-		<market id="62" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMVC" name="ОФЗПК-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗПК-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
-		<market id="63" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMVC" name="ОФЗПК-Режим непрерывных торгов" exchangeId="1" description="ОФЗПК-Режим непрерывных торгов: Облигации Минфина"/>
-		<market id="64" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMVC" name="ОФЗПК-Дискретный аукцион" exchangeId="1" description="ОФЗПК-Дискретный аукцион: Облигации Минфина"/>
-		<market id="65" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMVC" name="ОФЗПК-Торги в режиме выкупа" exchangeId="1" description="ОФЗПК-Торги в режиме выкупа: Облигации Минфина"/>
-		<market id="66" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMFC" name="ОФЗПД-Размещение: Аукцион БР" exchangeId="1" description="ОФЗПД-Размещение: Аукцион БР: Облигации Минфина"/>
-		<market id="67" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMFC" name="ОФЗПД- Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗПД- Доразмещение: Адресные заявки БР: Облигации Минфина"/>
-		<market id="68" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMFC" name="ОФЗПД-Режим непрерывных торгов" exchangeId="1" description="ОФЗПД-Режим непрерывных торгов: Облигации Минфина"/>
-		<market id="69" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMFC" name="ОФЗПД-Дискретный аукцион" exchangeId="1" description="ОФЗПД-Дискретный аукцион: Облигации Минфина"/>
-		<market id="70" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMFC" name="ОФЗПД-Торги в режиме выкупа" exchangeId="1" description="ОФЗПД-Торги в режиме выкупа: Облигации Минфина"/>
-		<market id="71" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMMC" name="ОФЗАД-Размещение: Аукцион БР" exchangeId="1" description="ОФЗАД-Размещение: Аукцион БР: Облигации Минфина"/>
-		<market id="72" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMMC" name="ОФЗАД-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗАД-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
-		<market id="73" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMMC" name="ОФЗАД-Режим непрерывных торгов" exchangeId="1" description="ОФЗАД-Режим непрерывных торгов: Облигации Минфина"/>
-		<market id="74" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMMC" name="ОФЗАД-Дискретный аукцион" exchangeId="1" description="ОФЗАД-Дискретный аукцион: Облигации Минфина"/>
-		<market id="75" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMMC" name="ОФЗАД-Торги в режиме выкупа" exchangeId="1" description="ОФЗАД-Торги в режиме выкупа: Облигации Минфина"/>
-		<market id="76" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BMIC" name="ОФЗИН-Размещение: Аукцион БР" exchangeId="1" description="ОФЗИН-Размещение: Аукцион БР: Облигации Минфина"/>
-		<market id="77" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="SMIC" name="ОФЗИН-Доразмещение: Адресные заявки БР" exchangeId="1" description="ОФЗИН-Доразмещение: Адресные заявки БР: Облигации Минфина"/>
-		<market id="78" marketType="SCND" section="FOND" settlementCurrency="RUB" code="UMIC" name="ОФЗИН-Режим непрерывных торгов" exchangeId="1" description="ОФЗИН-Режим непрерывных торгов: Облигации Минфина"/>
-		<market id="79" marketType="SCND" section="FOND" settlementCurrency="RUB" code="DMIC" name="ОФЗИН-Дискретный аукцион" exchangeId="1" description="ОФЗИН-Дискретный аукцион: Облигации Минфина"/>
-		<market id="80" marketType="SCND" section="FOND" settlementCurrency="RUB" code="MMIC" name="ОФЗИН-Торги в режиме выкупа" exchangeId="1" description="ОФЗИН-Торги в режиме выкупа: Облигации Минфина"/>
-		<market id="82" marketType="PRMR" section="FOND" settlementCurrency="RUB" code="BBVC" name="ОФЗ-ПК - Аукцион БР" exchangeId="1" description="ОФЗ-ПК - Аукцион БР"/>
-		<market id="83" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTATSS" name="СПб ГУП АТС Смольного" exchangeId="1" description="СПб ГУП АТС Смольного"/>
-		<market id="88" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMTTKFSP" name="Комитет финансов СПб" exchangeId="1" description="Комитет финансов СПб"/>
-		<market id="89" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDSKFLO" name="Комитет финансов ЛО" exchangeId="1" description="Комитет финансов ЛО"/>
-		<market id="90" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTFSKB" name="ФСКМБ" exchangeId="1" description="ФСКМБ"/>
-		<market id="91" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDSFGGE" name="ФАУ ГГЭ" exchangeId="1" description="ФАУ ГГЭ"/>
-		<market id="92" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTVRGO" name="ВВО РГО" exchangeId="1" description="ВВО РГО"/>
-		<market id="93" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTTDRM" name="ООО Торговый дом РМ-Рейл" exchangeId="1" description="ООО Торговый дом РМ-Рейл"/>
-		<market id="95" marketType="PRMR" section="MKR" settlementCurrency="RUB" code="XMDTRKFN" name="АО РК Финанс" exchangeId="1" description="АО РК Финанс"/>
-	</objects>
-</meta>
-		
-		

clearing-parent/backend-api/src/main/resources/meta/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.9.0.71",
+		"version": "3.7.0.45",
 		
 		"enums": {
 		
@@ -2361,41 +2361,7 @@
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	]
-			,"actions":[
+			
-			{"method":"post",
-				
-					"name": "Добавление роли участнику",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyRoleSetNewAction",
-				
-				"fields": [
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
-	,
-		{"code": "companyRole",
-			"type": 12,"dbname": "Код роли компании","name": "Наименование роли компании","shortname": "Роль","link": "companyRole","required": true
-		}
-	,
-		{"code": "workflowStatus",
-			"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление роли участнику",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "companyRoleSet","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"security": {
@@ -2570,10 +2536,6 @@
 		{"code": "fullNameEng",
 			"type": 2,"length": 255,"name": "Полное наименование инструмента на английском","shortname": "Наименование на английском","searchable": true,"sortable": true,"visible": true,"extends": "security"
 		}
-	,
-		{"code": "clearingOrganization",
-			"type": 2,"length": 255,"name": "Клиринговая организация","shortname": "Клиринговая организация","searchable": true,"sortable": true,"visible": true,"filterable": "true","filterValue": "АО СПВБ"
-		}
 	,
 		{"code": "isin",
 			"type": 2,"length": 50,"name": "Наименование инструмента ISIN","shortname": "ISIN","searchable": true,"sortable": true,"visible": true,"extends": "security"
@@ -2773,7 +2735,7 @@
 			
 				"destination": "securities/traded-money-securities",
 			
-				"class": "ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity",
+				"class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
 			
 				"table": "traded_money_market_security",
 			
@@ -3038,13 +3000,9 @@
 		{"code": "maturityDate",
 			"type": 6,"name": "Дата погашения","shortname": "Погашение","searchable": true,"sortable": true
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал","searchable": true,"sortable": true
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал","searchable": true,"sortable": true
+			"type": 10,"name": "Номинал","shortname": "Номинал","searchable": true,"sortable": true
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3120,13 +3078,9 @@
 		{"code": "lotSize",
 			"type": 11,"name": "Размер лота","shortname": "Лот","visible": false
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал"
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал"
+			"type": 10,"name": "Текущий номинал","shortname": "Текущий номинал"
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3203,13 +3157,9 @@
 		{"code": "lotSize",
 			"field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","visible": false
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал"
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал"
+			"type": 10,"name": "Текущий номинал","shortname": "Текущий номинал"
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3328,11 +3278,11 @@
 			"type": 3,"name": "Номер купона","shortname": "Номер","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodStartDate",
+		{"code": "periodEndDate",
 			"type": 6,"name": "Начало периода действия","shortname": "Начало","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodEndDate",
+		{"code": "periodStartDate",
 			"type": 6,"name": "Окончание периода действия","shortname": "Окончание","searchable": true,"sortable": true,"visible": true
 		}
 	,
@@ -4060,7 +4010,7 @@
 			,"actions":[
 			{"method":"post",
 				
-					"name": "Разделение депозита",
+					"name": "Досрочное изъятие депозита",
 				
 					"destination": "registries/splitDeposit",
 				
@@ -4111,35 +4061,6 @@
 		{"code": "balance",
 			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
 		}
-	]
-			}
-		,
-			{"method":"post",
-				
-					"name": "Идентификация неразмеченных средств",
-				
-					"destination": "registries/identificationFunds",
-				
-					"confirmation": "balance,tradingClearingRegistryId",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "registry","linkCode": "id","required": true
-		}
-	,
-		{"code": "balance",
-			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
-		}
-	,
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
-	,
-		{"code": "tradingClearingRegistryId",
-			"type": 1,"name": "Торгово-клиринговый регистр","shortname": "Торгово-клиринговый регистр","link": "tradingClearingRegistry","linkCode": "code","required": true
-		}
 	]
 			}
 		,
@@ -4165,39 +4086,6 @@
 		{"code": "refundDate",
 			"type": 6,"name": "Дата возврата депозита","shortname": "Возврат депозита","visible": true,"enabled": true
 		}
-	]
-			}
-		,
-			{"method":"put",
-				
-					"name": "Установить отметку о получении выписки",
-				
-					"destination": "registries/changeStatusExtract",
-				
-					"confirmation": "shortName,contract,balance",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "registry","linkCode": "id","required": true
-		}
-	,
-		{"code": "shortName",
-			"type": 2,"length": 255,"name": "Краткое наименование компании","shortname": "Компания","enabled": false
-		}
-	,
-		{"code": "contract",
-			"type": 2,"length": 255,"name": "Договор","shortname": "Номер договора","required": true,"enabled": false
-		}
-	,
-		{"code": "balance",
-			"type": 10,"name": "Текущий баланс","shortname": "Баланс","enabled": false
-		}
-	,
-		{"code": "registryStatus",
-			"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "registryStatus","visible": false
-		}
 	]
 			}
 		]
@@ -4255,7 +4143,7 @@
 			,"actions":[
 			{"method":"post",
 				
-					"name": "Добавление счета",
+					"name": "Добавление корреспондентского счета",
 				
 					"confirmation": "companyId,account,status",
 				
@@ -4267,7 +4155,7 @@
 		}
 	,
 		{"code": "account",
-			"type": 2,"length": 50,"name": "Номер счета","shortname": "Счет"
+			"type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true
 		}
 	,
 		{"code": "status",
@@ -4282,7 +4170,7 @@
 		,
 			{"method":"put",
 				
-					"name": "Изменение счета",
+					"name": "Изменение корреспондентского счета",
 				
 					"confirmation": "companyId,account,status",
 				
@@ -4313,7 +4201,7 @@
 		,
 			{"method":"delete",
 				
-					"name": "Блокировка счета",
+					"name": "Блокировка корреспондентского счета",
 				
 					"confirmation": "companyId,account",
 				
@@ -4622,10 +4510,6 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
@@ -4658,76 +4542,12 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	]
 			
-		}
-	,
-		"accountSymbols": {
-			
-				"name": "Депо КС - РДЦ",
-			
-				"destination": "accounting/depo-accounts-symbols",
-			
-				"class": "ru.clearing.classes.statics.data.account.AccountSymbols",
-			
-				"logUpdates": "true",
-			
-				"table": "depo_account_symbols",
-			
-			"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
-		}
-	,
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","searchable": true,"sortable": true,"visible": true,"link": "account","linkCode": "account"
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","searchable": true,"sortable": true,"visible": true
-		}
-	]
-			,"actions":[
-			{"method":"post",
-				
-					"name": "Добавление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction",
-				
-				"fields": [
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","link": "account","linkCode": "account","required": true
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"clearingAccount": {
@@ -4754,10 +4574,6 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
@@ -5323,7 +5139,7 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Запрос остатков по всем счетам (отправка ДФ-56 для получения ответа ДФ-01, ДФ-57)",
+					"name": "Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)",
 				
 				"fields": []
 			}
@@ -5334,15 +5150,11 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)",
+					"name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)",
 				
 				"fields": [
-		{"code": "fullBalance",
-			"type": 10,"name": "Текущий баланс (всего)","shortname": "Текущие средства (всего)","enabled": false
-		}
-	,
 		{"code": "balance",
-			"type": 10,"name": "Текущий баланс (свободно)","shortname": "Текущие средства (свободно)","enabled": false
+			"type": 10,"name": "Текущий баланс","shortname": "Текущие средства","enabled": false
 		}
 	,
 		{"code": "securitySymbol",
@@ -5358,7 +5170,7 @@
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true
+			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true,"enabled": false
 		}
 	,
 		{"code": "creditLeg_accountId",
@@ -5420,11 +5232,11 @@
 				
 				"fields": [
 		{"code": "section",
-			"type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code","required": true
+			"type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code"
 		}
 	,
 		{"code": "sessionType",
-			"type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code","required": true
+			"type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code"
 		}
 	,
 		{"code": "companyId",
@@ -5553,7 +5365,7 @@
 				
 					"group": "Формирование отчетности",
 				
-					"name": "Формирование отчетности PFX64/PFX65",
+					"name": "Формирование отчетности по сделкам",
 				
 				"fields": []
 			}
@@ -5577,28 +5389,6 @@
 				
 					"name": "Формирование ДФ-05 с кодом 9 (финальный)",
 				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CHDF",
-				
-					"group": "Общее",
-				
-					"name": "Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21",
-				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CCLR",
-				
-					"group": "Клиринг",
-				
-					"name": "Завершение неудачных клиринговых сессий",
-				
 				"fields": []
 			}
 		]
@@ -5634,7 +5424,7 @@
 		}
 	,
 		{"code": "sessionStatus",
-			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Шаг","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
+			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
 		}
 	,
 		{"code": "companyId",
@@ -5866,12 +5656,10 @@
 	,
 		"executionDeposit": {
 			
-				"name": "Сделки на секции МКР",
+				"name": "Сделки",
 			
 				"destination": "execution-deposits",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionDeposit",
 			
 				"logUpdates": "true",
@@ -5898,9 +5686,17 @@
 		{"code": "partyTradingClearingRegistry",
 			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true,"ignore": true
 		}
+	,
+		{"code": "counterPartyTradingClearingRegistryId",
+			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code"
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistry",
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
+		}
 	,
 		{"code": "market",
-			"type": 2,"length": 8,"dbname": "Код секции финансового инструмента","name": "Секция финансового инструмента","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkKeyCode": "code","linkCode": "description"
+			"type": 12,"dbname": "Код секции финансового инструмента","name": "Секция финансового инструмента","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkKeyCode": "code","linkCode": "description"
 		}
 	,
 		{"code": "price",
@@ -5982,14 +5778,6 @@
 		{"code": "counterPartyId",
 			"type": 1,"dbname": "Идентификатор компании-партнера, с которой заключена сделка","name": "Наименование компании-партнера, с которой заключена сделка","shortname": "Партнер","visible": false,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "counterPartyTradingClearingRegistryId",
-			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code","ignore": true
-		}
-	,
-		{"code": "counterPartyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
-		}
 	,
 		{"code": "coverageStatus",
 			"type": 12,"dbname": "Код статуса достаточности обеспечения","name": "Cтатус достаточности обеспечения","shortname": "Обеспеченность","searchable": true,"sortable": true,"link": "allowed"
@@ -6024,8 +5812,6 @@
 			
 				"destination": "execution-fonds",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionFond",
 			
 				"logUpdates": "true",
@@ -6074,7 +5860,7 @@
 		}
 	,
 		{"code": "interestAmount",
-			"type": 11,"name": "НКД","shortname": "НКД","visible": true,"searchable": true,"sortable": true
+			"type": 11,"name": "Объем процентов","shortname": "Проценты","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "exchangeOrderId",
@@ -6082,7 +5868,7 @@
 		}
 	,
 		{"code": "price",
-			"type": 10,"name": "Цена, %","shortname": "Цена, %","visible": true,"searchable": true,"sortable": true
+			"type": 10,"name": "Ставка по депозиту","shortname": "Ставка, %","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "settlementAmount",
@@ -6110,7 +5896,15 @@
 		}
 	,
 		{"code": "partyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true,"ignore": true
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistryId",
+			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code"
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistry",
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "comment",
@@ -6132,14 +5926,6 @@
 		{"code": "counterPartyId",
 			"type": 1,"dbname": "Идентификатор компании-партнера, с которой заключена сделка","name": "Наименование компании-партнера, с которой заключена сделка","shortname": "Партнер","visible": false,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "counterPartyTradingClearingRegistryId",
-			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code","ignore": true
-		}
-	,
-		{"code": "counterPartyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
-		}
 	,
 		{"code": "securityFullName",
 			"type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": true,"searchable": true,"sortable": true
@@ -6174,19 +5960,17 @@
 			
 				"destination": "depo-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister",
 			
 				"table": "balance_depo_register",
 			
 			"fields": [
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
-			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true
+			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true
 		}
 	,
 		{"code": "updatedAt",
@@ -6198,7 +5982,7 @@
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "depoCode",
@@ -6222,8 +6006,6 @@
 			
 				"destination": "money-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister",
 			
 				"table": "money_balance_register",
@@ -6238,7 +6020,7 @@
 		}
 	,
 		{"code": "infoAccount",
-			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "remainderSum",
@@ -6246,23 +6028,23 @@
 		}
 	,
 		{"code": "blockedSum",
-			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "unblockedSum",
-			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "inn",
-			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "companyFullName",
-			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "companyId",
@@ -6270,7 +6052,7 @@
 		}
 	,
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
@@ -6278,7 +6060,7 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
 		}
 	]
 			
@@ -6290,8 +6072,6 @@
 			
 				"destination": "admitted-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister",
 			
 				"table": "admitted_liabilities_register",
@@ -6354,8 +6134,6 @@
 			
 				"destination": "covered-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister",
 			
 				"table": "covered_Liabilities_register",
@@ -6418,8 +6196,6 @@
 			
 				"destination": "money-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister",
 			
 				"table": "money_payment_instruction_register",
@@ -6474,8 +6250,6 @@
 			
 				"destination": "depo-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister",
 			
 				"table": "depo_payment_instruction_register",
@@ -6530,8 +6304,6 @@
 			
 				"destination": "exclude-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister",
 			
 				"table": "exclude_liabilities_register",
@@ -6610,8 +6382,6 @@
 			
 				"destination": "liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister",
 			
 				"table": "liabilities_register",
@@ -6690,8 +6460,6 @@
 			
 				"destination": "execution-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExecutionRegister",
 			
 				"table": "execution_register",
@@ -7073,11 +6841,11 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время прочтения записи","shortname": "Прочитано","searchable": true,"sortable": true
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"dbname": "Идентификатор отправителя","name": "Наименование отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"visible": true,"link": "userCls","linkCode": "identifier"
+			"type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","ignore": true
 		}
 	,
 		{"code": "addresseeId",
@@ -7093,7 +6861,7 @@
 		}
 	,
 		{"code": "notificationStatus",
-			"type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus"
+			"type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus","ignore": true
 		}
 	,
 		{"code": "comment",
@@ -7109,8 +6877,6 @@
 				
 					"name": "Изменение статуса сообщения",
 				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.NotificationUpdateAction",
-				
 				"fields": [
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "notification","linkCode": "id","required": true
@@ -8386,7 +8152,7 @@
 		}
 	,
 		{"code": "acc_name",
-			"field": "accName","type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
+			"type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "account",
@@ -8396,10 +8162,6 @@
 		{"code": "deal",
 			"type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true
 		}
-	,
-		{"code": "date",
-			"type": 2,"length": 8,"name": "Дата изменения состояния счета","shortname": "Дата изменения состояния счета","searchable": true,"sortable": true,"visible": true
-		}
 	,
 		{"code": "status",
 			"type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true
@@ -8857,10 +8619,6 @@
 				"table": "s_df_57",
 			
 			"fields": [
-		{"code": "generationTime",
-			"type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true
-		}
-	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false
 		}
@@ -9016,6 +8774,10 @@
 		{"code": "fileName",
 			"type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true
 		}
+	,
+		{"code": "generationTime",
+			"type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true
+		}
 	,
 		{"code": "generationId",
 			"type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true
@@ -9372,7 +9134,7 @@
 			
 				"destination": "operations",
 			
-				"class": "ru.clearing.classes.statics.data.payment.Operation",
+				"class": "",
 			
 				"table": "operation",
 			
@@ -9418,7 +9180,7 @@
 			
 				"destination": "market-data-liquidations",
 			
-				"class": "ru.clearing.classes.statics.data.misc.MarketDataLiquidation",
+				"class": "",
 			
 				"table": "market_data_liquidation",
 			

clearing-parent/backend-api/src/main/resources/meta/meta.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.9.0.71">
+<meta version="3.7.0.45">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -545,16 +545,6 @@
 			<companyRole type="12" dbname="Код роли компании" name="Наименование роли компании" shortname="Роль" searchable="true" sortable="true" visible="true" link="companyRole"/>
 			<workflowStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" link="workflowStatus"/>
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
-			<actions>
-				<post name="Добавление роли участнику" class="ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyRoleSetNewAction">
-					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
-					<companyRole type="12" dbname="Код роли компании" name="Наименование роли компании" shortname="Роль" link="companyRole" required="true"/>
-					<workflowStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="workflowStatus" required="true"/>
-				</post>
-				<delete name="Удаление роли участнику" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
-					<id type="1" name="Идентификатор записи" shortname="ID" link="companyRoleSet" linkCode="id" required="true"/>
-				</delete>
-			</actions>
 		</companyRoleSet>
 		<security name="Инструменты" destination="securities" class="ru.clearing.classes.statics.data.security.Security" logUpdates="true" table="security">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
@@ -593,7 +583,7 @@
 			<issuerId type="1" dbname="Идентификатор эмитента" name="Наименование эмитента" shortname="Эмитент" searchable="true" sortable="true" link="company" extends="security" linkCode="shortName"/>
 			<shortNameEng type="2" length="255" name="Краткое наименование инструмента на английском" shortname="Краткое наименование на английском" searchable="true" sortable="true" visible="true" extends="security"/>
 			<fullNameEng type="2" length="255" name="Полное наименование инструмента на английском" shortname="Наименование на английском" searchable="true" sortable="true" visible="true" extends="security"/>
-			<clearingOrganization type="2" length="255" name="Клиринговая организация" shortname="Клиринговая организация" searchable="true" sortable="true" visible="true" filterable="true" filterValue="АО СПВБ"/>
+		<!-- todo скоро добавят задание, поправить базу перед этим<clearingOrganization type="2" length="255" name="Клиринговая организация" shortname="Клиринговая организация" searchable="true" sortable="true" visible="true" filterable="true" filterValue="АО СПВБ"/> -->
 			<isin type="2" length="50" name="Наименование инструмента ISIN" shortname="ISIN" searchable="true" sortable="true" visible="true" extends="security"/>
 			<workflowStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" link="workflowStatus" extends="security"/>
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
@@ -642,7 +632,7 @@
 				</delete>
 			</actions>
 		</moneyMarketSecurity>
-		<tradedMoneyMarketSecurity name="Спецификации денежного рынка, учавствующие в сделках" destination="securities/traded-money-securities" class="ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity" table="traded_money_market_security">
+		<tradedMoneyMarketSecurity name="Спецификации денежного рынка, учавствующие в сделках" destination="securities/traded-money-securities" class="ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity" table="traded_money_market_security">
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
 			<shortName type="2" length="255" name="Краткое наименование инструмента" shortname="Краткое наименование" searchable="true" sortable="true" visible="true" extends="security"/>
 			<securityCode type="2" length="255" name="Полный код инструмента со сроком" shortname="Код инструмента" searchable="true" sortable="true" visible="true"/>
@@ -704,8 +694,7 @@
 			<instrumentType type="12" dbname="Код типа инструмента" name="Наименование типа инструмента" shortname="Тип инструмента" searchable="true" sortable="true" visible="true" link="instrumentType" extends="security"/>
 			<bondType type="12" dbname="Код типа облигации" name="Наименование типа облигации" shortname="Тип облигации" searchable="true" sortable="true" visible="true" link="bondType"/>
 			<maturityDate type="6" name="Дата погашения" shortname="Погашение" searchable="true" sortable="true"/>
-			<nominalForDate type="10" name="Текущее значение номинала" shortname="Текущий номинал" searchable="true" sortable="true"/>
+			<nominalValue type="10" name="Номинал" shortname="Номинал" searchable="true" sortable="true"/>
-			<nominalValue type="10" name="Номинал инструмента" shortname="Номинал" searchable="true" sortable="true"/>
 			<nominalCurrency type="12" dbname="Код валюты номинала" name="Наименование валюты номинала" shortname="Валюта номинала" searchable="true" sortable="true" link="currencyCode"/>
 			<coupon type="10" name="Купон" shortname="Купон" searchable="true" sortable="true"/>
 			<couponFrequency type="3" name="Длительность купона" shortname="Длительность" searchable="true" sortable="true"/>
@@ -724,8 +713,7 @@
 					<isin type="2" length="50" name="Наименование инструмента ISIN" shortname="ISIN"/>
 					<bondType type="12" dbname="Код типа облигации" name="Наименование типа облигации" shortname="Тип облигации" link="bondType"/>
 					<lotSize type="11" name="Размер лота" shortname="Лот" visible="false"/>
-					<nominalForDate type="10" name="Текущее значение номинала" shortname="Текущий номинал"/>
+					<nominalValue type="10" name="Текущий номинал" shortname="Текущий номинал"/>
-					<nominalValue type="10" name="Номинал инструмента" shortname="Номинал"/>
 					<nominalCurrency type="12" name="Наименование валюты номинала" shortname="Валюта номинала" link="currencyCode" linkCode="code"/>
 					<maturityDate type="6" name="Дата погашения" shortname="Погашение"/>
 					<coupon type="10" name="Купон" shortname="Купон"/>
@@ -744,8 +732,7 @@
 					<isin type="2" length="50" name="Наименование инструмента ISIN" shortname="ISIN"/>
 					<bondType type="12" dbname="Код типа облигации" name="Наименование типа облигации" shortname="Тип облигации" link="bondType"/>
 					<lotSize field="securityId" type="11" name="Размер лота" shortname="Лот" linkKeyCode="securityId" linkCode="lotSize" link="listing" visible="false"/>
-					<nominalForDate type="10" name="Текущее значение номинала" shortname="Текущий номинал"/>
+					<nominalValue type="10" name="Текущий номинал" shortname="Текущий номинал"/>
-					<nominalValue type="10" name="Номинал инструмента" shortname="Номинал"/>
 					<nominalCurrency type="12" name="Наименование валюты номинала" shortname="Валюта номинала" link="currencyCode" linkCode="code"/>
 					<maturityDate type="6" name="Дата погашения" shortname="Погашение"/>
 					<coupon type="10" name="Купон" shortname="Купон"/>
@@ -772,8 +759,8 @@
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
 			<couponRate type="11" name="Купонная ставка" shortname="Ставка" searchable="true" sortable="true" visible="true"/>
 			<number type="3" name="Номер купона" shortname="Номер" searchable="true" sortable="true" visible="true"/>
-			<periodStartDate type="6" name="Начало периода действия" shortname="Начало" searchable="true" sortable="true" visible="true"/>
+			<periodEndDate type="6" name="Начало периода действия" shortname="Начало" searchable="true" sortable="true" visible="true"/>
-			<periodEndDate type="6" name="Окончание периода действия" shortname="Окончание" searchable="true" sortable="true" visible="true"/>
+			<periodStartDate type="6" name="Окончание периода действия" shortname="Окончание" searchable="true" sortable="true" visible="true"/>
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 		</couponPeriod>
         <listing name="Инструменты на режимах" destination="listings" class="ru.clearing.classes.statics.data.misc.Listing" logUpdates="true" table="listing">
@@ -944,7 +931,7 @@
 			<updatedAt field="updated" type="4" name="Дата и время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<securityId type="1" dbname="Идентификатор инструмента" name="Код инструмента" shortname="Код инструмента" searchable="false" sortable="true" visible="false" link="security" linkCode="shortName"/>
 			<actions>
-				<post name="Разделение депозита" destination="registries/splitDeposit" confirmation="contract,outboundAmount,refundDate" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew">
+				<post name="Досрочное изъятие депозита" destination="registries/splitDeposit" confirmation="contract,outboundAmount,refundDate" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.RSplitDepositActionNew">
 					<companyId type="1" name="Наименование участника" shortname="Инициатор" link="company" linkCode="shortName" enabled="false"/>
 					<contract type="2" length="255" name="Договор" shortname="Номер договора" required="true" enabled="false"/>
 					<outboundAmount type="10" name="Сумма изъятия" shortname="Сумма" required="true"/>
@@ -956,24 +943,11 @@
 					<id type="1" name="Регистр требований" shortname="Регистр требований" required="true" enabled="false" visible="false"/>
 					<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
 				</post>
-				<post name="Идентификация неразмеченных средств" destination="registries/identificationFunds" confirmation="balance,tradingClearingRegistryId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew">
-					<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>
-					<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
-					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
-					<tradingClearingRegistryId type="1" name="Торгово-клиринговый регистр" shortname="Торгово-клиринговый регистр" link="tradingClearingRegistry" linkCode="code" required="true"/>
-				</post>
 				<put name="Изменение даты возврата депозита" destination="registries/changeRefundDate" confirmation="contact,contract,refundDate" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeRefundDateActionNew"> 
 					<groupId type="1" dbname="Идентификатор группы связанных регистров" name="Идентификатор группы" required="true" enabled="false" visible="false"/>
 					<contract type="2" length="255" name="Договор" shortname="Номер договора" required="true" enabled="false"/>
 					<refundDate type="6" name="Дата возврата депозита" shortname="Возврат депозита" visible="true" enabled="true"/>
 				</put>
-				<put name="Установить отметку о получении выписки" destination="registries/changeStatusExtract" confirmation="shortName,contract,balance" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew">
-					<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>
-					<shortName type="2" length="255" name="Краткое наименование компании" shortname="Компания" enabled="false"/>
-					<contract type="2" length="255" name="Договор" shortname="Номер договора" required="true" enabled="false"/>
-					<balance type="10" name="Текущий баланс" shortname="Баланс" enabled="false"/>
-					<registryStatus type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" link="registryStatus" visible="false"/>
-				</put>
 			</actions>
 		</registry>
 		<account name="Счета" destination="accounting/accounts" class="ru.clearing.classes.statics.data.account.Account" logUpdates="true" table="account">
@@ -987,20 +961,20 @@
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true"/>
 			<actions>
-				<post name="Добавление счета" confirmation="companyId,account,status" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountNewAction">
+				<post name="Добавление корреспондентского счета" confirmation="companyId,account,status" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountNewAction">
 					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
-					<account type="2" length="50" name="Номер счета" shortname="Счет"/>
+					<account type="2" length="50" name="Номер счета" shortname="Счет" required="true"/>
 					<status type="12" name="Наименование статуса" shortname="Статус" link="serviceStatus"/>
 					<accountType type="12" name="Наименование типа счета" shortname="Тип" link="accountType" required="true" visible="false"/>
 				</post>
-				<put name="Изменение счета" confirmation="companyId,account,status" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountUpdateAction">
+				<put name="Изменение корреспондентского счета" confirmation="companyId,account,status" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountUpdateAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="account" linkCode="id" required="true"/>
 					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" enabled="false"/>
 					<account type="2" length="50" name="Номер счета" shortname="Счет" enabled="false"/>
 					<status type="12" name="Наименование статуса" shortname="Статус" link="serviceStatus"/>
 					<accountType type="12" name="Наименование типа счета" shortname="Тип" link="accountType" required="true" visible="false"/>
 				</put>
-				<delete name="Блокировка счета" confirmation="companyId,account" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
+				<delete name="Блокировка корреспондентского счета" confirmation="companyId,account" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="account" linkCode="id" required="true"/>
 				</delete>
 			</actions>
@@ -1074,35 +1048,26 @@
 			<accountId type="1" dbname="Идентификатор информационного счета" name="Номер информационного счета" shortname="Регистр на КС" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
 			<clearingAccountId type="1" dbname="Идентификатор аналитического счета" name="Номер аналитического счета" shortname="Клиринговый счет" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
             <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
-			<serviceStatus field="accountId" type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" linkKeyCode="id" linkCode="status" link="account" extends="account" />
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
+			<actions>
+				<post name="Добавление информационного счета" confirmation="companyId,account,status" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountNewInformationAction">
+					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
+					<account type="2" length="50" name="Номер счета" shortname="Счет" required="true"/>
+					<status type="12" name="Наименование статуса" shortname="Статус" link="serviceStatus"/>
+					<accountType type="12" name="Наименование типа счета" shortname="Тип" link="accountType" required="true" visible="false"/>
+				</post>
+			</actions>
 		</informationAccount>
 		<depoAccount name="Депозитарные счета" destination="accounting/depo-accounts" class="ru.clearing.classes.statics.data.account.DepoAccount" logUpdates="true" table="depo_account">
 			<accountId type="1" dbname="Идентификатор счета" name="Номер счета" shortname="Счет" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
 			<depoAccountType type="12" dbname="Код типа счета" name="Наименование типа счета" shortname="Тип" searchable="true" sortable="true" visible="true" link="depoAccountType"/>
 			<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
-			<serviceStatus field="accountId" type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" linkKeyCode="id" linkCode="status" link="account" extends="account" />
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 		</depoAccount>
-		<accountSymbols name="Депо КС - РДЦ" destination="accounting/depo-accounts-symbols" class="ru.clearing.classes.statics.data.account.AccountSymbols" logUpdates="true" table="depo_account_symbols">
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
-			<accountId type="1" dbname="Идентификатор счета" name="Счет депо КС" shortname= "Счет депо КС" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
-			<accountSymbolValue type="2" length="255" name="Счет РДЦ" shortname="Счет РДЦ" searchable="true" sortable="true" visible="true"/>
-			<actions>
-				<post name="Добавление депо КС - РДЦ" confirmation="accountId,accountSymbolValue" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction">
-					<accountId type="1" dbname="Идентификатор счета" name="Счет депо КС" shortname= "Счет депо КС" link="account" linkCode="account" required="true"/>
-					<accountSymbolValue type="2" length="255" name="Счет РДЦ" shortname="Счет РДЦ" required="true"/>
-				</post>
-				<delete name="Удаление депо КС - РДЦ" confirmation="accountId,accountSymbolValue">
-					<id type="1" name="Идентификатор записи" shortname="ID" link="account" linkCode="id" required="true"/>
-				</delete>
-			</actions>
-		</accountSymbols>
 		<clearingAccount name="Торгово-Банковские счета" destination="accounting/clearing-accounts" class="ru.clearing.classes.statics.data.account.ClearingAccount" logUpdates="true" table="clearing_account">
 			<accountId type="1" dbname="Идентификатор счета" name="Номер счета" shortname="Счет" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
 			<clearingAccountType type="12" dbname="Код типа счета" name="Наименование типа счета" shortname="Тип" searchable="true" sortable="true" visible="true" link="clearingAccountType" linkCode="name"/>
 			<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
-			<serviceStatus field="accountId" type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" linkKeyCode="id" linkCode="status" link="account" extends="account" />
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 		</clearingAccount>
         <plannerTemplate name="Шаблон расписания операционного дня" destination="schedule/planner-templates" class="ru.clearing.classes.statics.data.scheduler.PlannerTemplate" table="planner_template">
@@ -1235,15 +1200,14 @@
 				</post>			
 				<post destination="LOSC" group="Обмен с интеграционными модулями" name="Загрузка инструментов">
 				</post>
-				<post destination="GALB" group="Обмен с расчетной организацией" name="Запрос остатков по всем счетам (отправка ДФ-56 для получения ответа ДФ-01, ДФ-57)">
+				<post destination="GALB" group="Обмен с расчетной организацией" name="Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)">
 				</post>
-				<post destination="OUTV" group="Обмен с расчетной организацией" name="Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)">
+				<post destination="OUTV" group="Обмен с расчетной организацией" name="Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)">
-					<fullBalance type="10" name="Текущий баланс (всего)" shortname="Текущие средства (всего)" enabled="false"/>
+					<balance type="10" name="Текущий баланс" shortname="Текущие средства" enabled="false"/>
-					<balance type="10" name="Текущий баланс (свободно)" shortname="Текущие средства (свободно)" enabled="false"/>
 					<securitySymbol type="2" name="Наименование инструмента/валюты" shortname="Валюта" enabled="false"/>
 					<creditLeg_amount type="10" name="Сумма отправителя" shortname="Сумма" required="true"/>
 					<paymentPurpose type="2" length="255" name="Назначение платежа" shortname="Основание" required="true"/>
-					<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true"/>
+					<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true" enabled="false"/>
 					<creditLeg_accountId type="1" group="Отправитель" name="Наименование счета отправителя" shortname="Регистр списания" link="account" linkCode="account"/>
 					<addresseeId type="1" group="Получатель" name="Участник получатель" shortname="Получатель" link="company" linkCode="shortName" required="true" enabled="false"/>
 					<debitLeg_accountId type="1" group="Получатель" name="Наименование счета получателя" shortname="Счет получателя" link="bankAccount" linkCode="correspondentAccount"/>
@@ -1255,8 +1219,8 @@
 				<post destination="LIMS" group="Обмен с Торговой системой" name="Выгрузка в Торговую систему остатков по бумагам (отправка lim)">
 				</post>
 				<post destination="SCLR" group="Клиринг" name="Запуск клиринговой сессии" confirmation="section,sessionType">
-					<section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code" required="true" />
+					<section type="12" name="Секция" shortname="Секция" link="section" linkCode="name" linkKeyCode="code"/>
-					<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code" required="true" />
+					<sessionType type="12" name="Тип клиринговой сессии" shortname="Тип клиринговой сессии" link="sessionType" linkCode="name" linkKeyCode="code"/>
 					<companyId type="1" name="Наименование инициатора" shortname="Инициатор" link="company" linkCode="shortName" visible="false"/>
 					<securityId type="1" name="Наименование инструмента" shortname="Инструмент" link="security" linkCode="shortName" visible="false"/>
 				</post>
@@ -1280,16 +1244,12 @@
 				</post>
 				<post destination="ECNR" group="Формирование реестров" name="Формирование реестра сделок">
 				</post>
-				<post destination="GRET" group="Формирование отчетности" name="Формирование отчетности PFX64/PFX65">
+				<post destination="GRET" group="Формирование отчетности" name="Формирование отчетности по сделкам">
 				</post>
 				<post destination="GREF" group="Формирование отчетности" name="Формирование итоговой отчетности">
 				</post>
 				<post destination="FDFF" group="Обмен с расчетной организацией" name="Формирование ДФ-05 с кодом 9 (финальный)">
 				</post>
-				<post destination="CHDF" group="Общее" name="Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21">
-				</post>
-				<post destination="CCLR" group="Клиринг" name="Завершение неудачных клиринговых сессий">
-				</post>
 			</actions>
         </launcher>
 
@@ -1298,7 +1258,7 @@
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<clearingDate type="6" name="Дата" shortname="Дата" searchable="true" sortable="true" visible="true"/>
-			<sessionStatus type="12" dbname="Код статуса клиринговой сессии" name="Статус клиринговой сессии" shortname="Шаг" searchable="true" sortable="true" visible="true" link="sessionStatus"/>
+			<sessionStatus type="12" dbname="Код статуса клиринговой сессии" name="Статус клиринговой сессии" shortname="Статус" searchable="true" sortable="true" visible="true" link="sessionStatus"/>
 			<companyId type="1" dbname="Идентификатор инициатора торгов" name="Наименование инициатора торгов" shortname="Инициатор" visible="false" searchable="true" sortable="true" link="company" linkCode="shortName"/>
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/>
 			<userId type="1" dbname="Идентификатор пользователя" name="Наименование пользователя" shortname="Пользователь" searchable="true" sortable="true" visible="true" link="userCls" linkCode="identifier"/>
@@ -1355,13 +1315,13 @@
 			<bankAccId type="2" length="12" name="Идентификатор расчетного счета/кода в клиринговой организации" shortname="Код позиции" searchable="true" sortable="true"/>
 			<section type="12" dbname="Код наименования секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="section"/>
 		</sTrades>
-		<executionDeposit name="Сделки на секции МКР" destination="execution-deposits" historyDestination="history" class="ru.clearing.classes.statics.data.execution.ExecutionDeposit" logUpdates="true" table="execution_deposit">
+		<executionDeposit name="Сделки" destination="execution-deposits" class="ru.clearing.classes.statics.data.execution.ExecutionDeposit" logUpdates="true" table="execution_deposit">
 			<exchangeExecutionId type="1" name="Идентификационный номер сделки в Торговой системе" shortname="Номер сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionTime type="4" name="Время заключения сделки в Торговой системе" shortname="Время заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<tradingDate type="6" name="Дата заключения сделки" shortname="Дата заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<tradingClearingRegistryId type="1" dbname="Идентификатор торгово-клирингового регистра" name="Торгово-клиринговый регистр" shortname="ТКР" visible="true" searchable="true" sortable="true" link="tradingClearingRegistry" linkCode="code"/>
 			<partyTradingClearingRegistry type="2" length="20" dbname="Торгово-клиринговый регистр " name="Торгово-клиринговый регистр " shortname="ТКР " searchable="true" sortable="true" ignore="true"/>
-			<market type="2" length="8" dbname="Код секции финансового инструмента" name="Секция финансового инструмента" shortname="Секция" visible="true" searchable="true" sortable="true" link="market" linkKeyCode="code" linkCode="description"/>
+			<market type="12" dbname="Код секции финансового инструмента" name="Секция финансового инструмента" shortname="Секция" visible="true" searchable="true" sortable="true" link="market" linkKeyCode="code" linkCode="description"/>
 			<price type="10" name="Ставка по депозиту" shortname="Ставка, %" visible="true" searchable="true" sortable="true"/>
 			<lots type="11" name="Количество лотов" shortname="Лоты" visible="true" searchable="true" sortable="true"/>
 			<quantity type="11" name="Количество штук" shortname="Штуки" visible="false" searchable="true" sortable="true"/>
@@ -1391,7 +1351,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" visible="false" searchable="true" sortable="true"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" visible="false" searchable="true" sortable="true"/>
 		</executionDeposit>
-		<executionFond name="Сделки на Фондовой секции" destination="execution-fonds" historyDestination="history" class="ru.clearing.classes.statics.data.execution.ExecutionFond" logUpdates="true" table="execution_fond">
+		<executionFond name="Сделки на Фондовой секции" destination="execution-fonds" class="ru.clearing.classes.statics.data.execution.ExecutionFond" logUpdates="true" table="execution_fond">
 			<id type="1" name="Идентификатор записи" shortname="ID" visible="false" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" visible="false" searchable="true" sortable="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" visible="false" searchable="true" sortable="true"/>
@@ -1402,9 +1362,9 @@
 			<tradingDate type="6" name="Дата заключения сделки" shortname="Дата заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<securitySymbol type="2" length="255" name="Код инструмента в Торговой Системе" shortname="Код инструмента" visible="true" searchable="true" sortable="true"/>
 			<securityId type="1" dbname="Идентификатор финансового инструмента" name="Финансовый инструмент" shortname="Код биржевого инструмента / товара" searchable="true" sortable="true" link="security" linkCode="securitySymbol" ignore="true"/>
-			<interestAmount type="11" name="НКД" shortname="НКД" visible="true" searchable="true" sortable="true"/>
+			<interestAmount type="11" name="Объем процентов" shortname="Проценты" visible="true" searchable="true" sortable="true"/>
 			<exchangeOrderId type="1" name="Идентификационный номер заявки в Торговой системе" shortname="Номер заявки" visible="true" searchable="true" sortable="true"/>
-			<price type="10" name="Цена, %" shortname ="Цена, %"  visible="true" searchable="true" sortable="true"/>
+			<price type="10" name="Ставка по депозиту" shortname="Ставка, %" visible="true" searchable="true" sortable="true"/>
 			<settlementAmount type="11" name="Объем сделки" shortname="Объем" visible="true" searchable="true" sortable="true"/>
 			<lots type="11" name="Количество лотов" shortname="Лоты" visible="true" searchable="true" sortable="true"/>
 			<quantity type="11" name="Количество штук" shortname="Штуки" visible="false" searchable="true" sortable="true"/>
@@ -1426,32 +1386,32 @@
 			<coverageStatus type="12" dbname="Код статуса достаточности обеспечения" name="Cтатус достаточности обеспечения" shortname="Обеспеченность" searchable="true" sortable="true" link="allowed"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 		</executionFond>
-		<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.DepoBalanceRegister" table="balance_depo_register">
+		<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" class="ru.clearing.classes.statics.data.register.DepoBalanceRegister" table="balance_depo_register">
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" ignore="true"/>
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
-            <createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true"/>
+			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" visible="true" searchable="true" sortable="true" link="company" linkCode="shortName"/> 
-			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session" ignore="true"/>
+			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<depoCode type="2" length="50" name="Код раздела субсчета/счета депо" shortname="Код счета депо" searchable="true" sortable="true"/> 
 			<quantity type="11" name="Количество" shortname="Количество" searchable="true" sortable="true"/> 
 			<securitySymbol type="2" length="255" name="Код ценной бумаги" shortname="Ценная бумага" searchable="true" sortable="true"/>
 		</depoBalanceRegister>
-		<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.MoneyBalanceRegister" table="money_balance_register">
+		<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" class="ru.clearing.classes.statics.data.register.MoneyBalanceRegister" table="money_balance_register">
 			<setHouseName type="2" length="255" name="Наименование РО" shortname="Наименование РО" searchable="true" sortable="true" visible="true"/>
 			<account type="2" length="50" name="Номер торгового/клирингового счета" shortname="Номер торгового/клирингового счета" searchable="true" sortable="true" visible="true"/>
-			<infoAccount type="2" length="50" name="Номер счета внутреннего учета СПВБ" shortname="Номер счета внутреннего учета СПВБ" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<infoAccount type="2" length="50" name="Номер счета внутреннего учета СПВБ" shortname="Номер счета внутреннего учета СПВБ" searchable="true" sortable="true" visible="true"/>
 			<remainderSum type="10" name="Остаток денежных средств" shortname="Остаток" searchable="true" sortable="true"/>
-			<blockedSum type="10" name="Сумма блокированных денежных средств" shortname="Блокированные" searchable="true" sortable="true" ignore="true"/>
+			<blockedSum type="10" name="Сумма блокированных денежных средств" shortname="Блокированные" searchable="true" sortable="true"/>
-			<unblockedSum type="10" name="Сумма свободных денежных средств" shortname="Свободные" searchable="true" sortable="true" ignore="true"/>
+			<unblockedSum type="10" name="Сумма свободных денежных средств" shortname="Свободные" searchable="true" sortable="true"/>
-			<inn type="2" length="255" name="Идентификационный номер налогоплательщика (ИНН)" shortname="ИНН" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<inn type="2" length="255" name="Идентификационный номер налогоплательщика (ИНН)" shortname="ИНН" searchable="true" sortable="true" visible="true"/>
-			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session" ignore="true"/>
+			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
-			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
             <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" ignore="true"/>
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true"/>
-			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
+			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true"/>
 		</moneyBalanceRegister>
-		<admittedLiabilitiesRegister name="Реестр обязательств, допущенных к клирингу" destination="admitted-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister" table="admitted_liabilities_register">
+		<admittedLiabilitiesRegister name="Реестр обязательств, допущенных к клирингу" destination="admitted-liabilities-registers" class="ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister" table="admitted_liabilities_register">
 			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<securitySymbol type="2" length="255" name="Финансовый инструмент" shortname="Код биржевого инструмента / товара" searchable="true" sortable="true" visible="true"/>
@@ -1465,7 +1425,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" visible="false"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" searchable="true" sortable="true" visible="false"/>
  		</admittedLiabilitiesRegister>
- 		<coveredLiabilitiesRegister name="Реестр обязательств, прошедших процедуру контроля обеспечения" destination="covered-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister" table="covered_Liabilities_register">
+ 		<coveredLiabilitiesRegister name="Реестр обязательств, прошедших процедуру контроля обеспечения" destination="covered-liabilities-registers" class="ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister" table="covered_Liabilities_register">
 			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<securitySymbol type="2" length="255" name="Финансовый инструмент" shortname="Код биржевого инструмента / товара" searchable="true" sortable="true" visible="true"/>
@@ -1479,7 +1439,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" visible="false"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" searchable="true" sortable="true" visible="false"/>
  		</coveredLiabilitiesRegister>
-		<moneyPaymentInstructionRegister name="Реестр распоряжений, направленных расчетной организации" destination="money-payment-instruction-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister" table="money_payment_instruction_register">
+		<moneyPaymentInstructionRegister name="Реестр распоряжений, направленных расчетной организации" destination="money-payment-instruction-registers" class="ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister" table="money_payment_instruction_register">
 			<creditLegAccount type="2" length="50" name="Счет отправителя" shortname="Счет отправителя" searchable="true" sortable="true" visible="true"/>
 			<creditLegAmount type="10" name="Сумма отправителя" shortname="Сумма отправителя" searchable="true" sortable="true" visible="true"/>
 			<creditLegCurrencyCode type="12" dbname="Код валюты отправителя" name="Наименование валюты отправителя" shortname="Валюта отправителя" searchable="true" sortable="true" visible="true" link="currency"/>
@@ -1491,7 +1451,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<clearingDate type="6" name="Дата расчета" shortname="Дата расчета" searchable="true" sortable="true" visible="true"/>
 		</moneyPaymentInstructionRegister>
-		<depoPaymentInstructionRegister name="Реестр распоряжений, направленных расчетному депозитарию" destination="depo-payment-instruction-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister" table="depo_payment_instruction_register">
+		<depoPaymentInstructionRegister name="Реестр распоряжений, направленных расчетному депозитарию" destination="depo-payment-instruction-registers" class="ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister" table="depo_payment_instruction_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1503,7 +1463,7 @@
 			<direction type="1" name="Направление" shortname="Направление" searchable="true" sortable="true" link="inOutDirection" ignore="true"/>	
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 		</depoPaymentInstructionRegister>
-		<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
+		<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" class="ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1521,7 +1481,7 @@
 			<sumLiabilities type="10" name="Сумма обязательств" shortname="Обязательства" searchable="true" sortable="true" visible="true"/>
 			<settlementDate type="6" name="Дата расчета" shortname="Расчет" searchable="true" sortable="true"/>
 		</excludeLiabilitiesRegister>
-		<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.LiabilitiesRegister" table="liabilities_register">
+		<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" class="ru.clearing.classes.statics.data.register.LiabilitiesRegister" table="liabilities_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1539,7 +1499,7 @@
 			<sumLiabilities type="10" name="Сумма обязательств" shortname="Обязательства" searchable="true" sortable="true" visible="true"/>
 			<settlementDate type="6" name="Дата расчета" shortname="Расчет" searchable="true" sortable="true"/>
 		</liabilitiesRegister>
-		<executionRegister name="Реестр сделок" destination="execution-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.ExecutionRegister" table="execution_register">
+		<executionRegister name="Реестр сделок" destination="execution-registers" class="ru.clearing.classes.statics.data.register.ExecutionRegister" table="execution_register">
 			<tradingDate type="6" name="Дата заключения сделки" shortname="Дата заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionId type="1" name="Идентификационный номер сделки в Торговой системе" shortname="Номер сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionTime type="4" name="Время заключения сделки в Торговой системе" shortname="Время заключения сделки" visible="true" searchable="true" sortable="true"/>
@@ -1630,16 +1590,16 @@
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<clearingDate type="6" name="Дата" shortname="Дата" searchable="true" sortable="true" visible="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" visible="true"/>
-			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true"/>
+			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время прочтения записи" shortname="Прочитано" searchable="true" sortable="true"/>
-			<senderId type="1" dbname="Идентификатор отправителя" name="Наименование отправителя" shortname="Отправитель" searchable="true" sortable="true" visible="true" link="userCls" linkCode="identifier"/>
+			<senderId type="1" dbname="Идентификатор компании-отправителя" name="Наименование компании-отправителя" shortname="Отправитель" searchable="true" sortable="true" link="company" ignore="true"/>
 			<addresseeId type="1" dbname="Идентификатор компании-получателя" name="Наименование компании-получателя" shortname="Получатель" searchable="true" sortable="true" link="company" ignore="true"/>
 			<objectType type="12" dbname="Код типа объекта" name="Наименование типа объекта" shortname="Объект" searchable="true" sortable="true" link="objectType" ignore="true"/>
 			<objectId type="1" name="Идентификатор объекта" shortname="ID объекта" searchable="true" sortable="true" ignore="true"/> 
-			<notificationStatus type="12" dbname="Код статуса сообщения" name="Наименование статуса сообщения" shortname="Статус" searchable="true" sortable="true" visible="true" link="notificationStatus"/>
+			<notificationStatus type="12" dbname="Код статуса сообщения" name="Наименование статуса сообщения" shortname="Статус" searchable="true" sortable="true" visible="true" link="notificationStatus" ignore="true"/>
 			<comment type="2" length="255" name="Текст сообщения" shortname="Сообщение" searchable="true" sortable="true" visible="true"/>
 			<priority type="12" dbname="Код приоритета отображения" name="Наименование приоритета отображения" shortname="Приоритет отображения" searchable="true" sortable="true" link="priority"/>
 			<actions>
-				<put name="Изменение статуса сообщения" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.NotificationUpdateAction">
+				<put name="Изменение статуса сообщения">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="notification" linkCode="id" required="true"/>
 					<notificationStatus type="12" name="Наименование статуса сообщения" shortname="Статус" link="notificationStatus" required="true"/>
 				</put>
@@ -1930,10 +1890,9 @@
 		</sDf52>
 		<sDf53 name="ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие)" destination="s-dfs/s-df53" class="ru.clearing.classes.statics.data.sdf.SDf53" table="s_df_53">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="false"/>
-			<acc_name field="accName" type="2" length="30" name="Наименование участника клиринга" shortname="Наименование УК" searchable="true" sortable="true" visible="true"/>
+			<acc_name type="2" length="30" name="Наименование участника клиринга" shortname="Наименование УК" searchable="true" sortable="true" visible="true"/>
 			<account type="2" length="25" name="Код счета участника клиринга" shortname="Код счета УК" searchable="true" sortable="true" visible="true"/>
 			<deal type="2" length="4" name="Биржевой код участника клиринга" shortname="Биржевой код УК" searchable="true" sortable="true" visible="true"/>
-			<date type="2" length="8" name="Дата изменения состояния счета" shortname="Дата изменения состояния счета" searchable="true" sortable="true" visible="true"/>
 			<status type="3" name="Статус счета" shortname="Статус" searchable="true" sortable="true" visible="true"/>
 			<result type="2" length="255" name="Код завершения операции" shortname="Код завершения операции" searchable="true" sortable="true" visible="true"/>
 			<generationTime type="4" name="Дата и время создания записи" shortname="Дата и время создания" searchable="true" sortable="true" visible="true"/>
@@ -2042,7 +2001,6 @@
 			<generationId type="1" name="Идентификатор взаимодействия" shortname="ID взаимодействия" searchable="true" sortable="true" visible="true"/>
 		</sDf56>
 		<sDf57 name="ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС)" destination="s-dfs/s-df57" class="ru.clearing.classes.statics.data.sdf.SDf57" table="s_df_57">
-			<generationTime type="4" name="Дата и время создания записи" shortname="Дата и время создания" searchable="true" sortable="true" visible="true"/>
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="false"/>
 			<dbfId type="1" name="Уникальный идентификатор платежного документа (транзакции)" shortname="ID платежного поручения" searchable="true" sortable="true" visible="true"/>
 			<deal_deb type="2" length="4" name="Биржевой код участника клиринга (плательщик)" shortname="Инициатор в КС" searchable="true" sortable="true" visible="true"/>
@@ -2082,6 +2040,7 @@
 			<acc_kr type="2" length="35" name="Счет получателя" shortname="Счет получателя" searchable="true" sortable="true" visible="true"/>
 			<specif type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" searchable="true" sortable="true" visible="true"/>
 			<fileName type="2" length="255" name="Наименование входящего файла" shortname="Наименование файла" searchable="true" sortable="true" visible="true"/>
+			<generationTime type="4" name="Дата и время создания записи" shortname="Дата и время создания" searchable="true" sortable="true" visible="true"/>
 			<generationId type="1" name="Идентификатор взаимодействия" shortname="ID взаимодействия" searchable="true" sortable="true" visible="true"/>
 		</sDf57>
 		<managementJournal name="Журнал мониторинга и контроля" destination="management-journals" class="ru.clearing.classes.statics.data.journal.ManagementJournal" table="management_journal">
@@ -2162,7 +2121,7 @@
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 		</contractRegister>
-		<operation name="Проводки" destination="operations" class="ru.clearing.classes.statics.data.payment.Operation" table="operation">
+		<operation name="Проводки" destination="operations" class="" table="operation">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" visible="false"/>
 			<addresseeId type="1" dbname="Идентификатор компании-получателя" name="Наименование компании-получателя" shortname="Получатель" searchable="true" sortable="true" link="company" linkCode="shortName"/>
 			<senderId type="1" dbname="Идентификатор компании-отправителя" name="Наименование компании-отправителя" shortname="Отправитель" searchable="true" sortable="true" link="company" linkCode="shortName"/>
@@ -2172,7 +2131,7 @@
 			<operationTypeId type="1" name="Тип проводки" shortname="Тип" searchable="true" sortable="true" link="operationType"/>
 			<operationStatus type="12" dbname="Код статуса обработки" name="Наименование статуса обработки" shortname="Статус" searchable="true" sortable="true" link="operationStatus"/>
 		</operation>
-		<marketDataLiquidation name="Статичная ценовая информация для ликвидации активов" destination="market-data-liquidations" class="ru.clearing.classes.statics.data.misc.MarketDataLiquidation" table="market_data_liquidation">
+		<marketDataLiquidation name="Статичная ценовая информация для ликвидации активов" destination="market-data-liquidations" class="" table="market_data_liquidation">
 			<id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="false"/>
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" visible="true" link="security" linkCode="securitySymbol"/>
 			<price type="10" name="Цена за 1 штуку ликвидационного актива" shortname="Цена за шт." searchable="true" sortable="true" visible="true"/>

clearing-parent/backend-api/src/main/resources/meta/xsl/ddl.xsl

@@ -43,7 +43,6 @@ DROP TABLE IF EXISTS <xsl:value-of select="$dbTableName"/>;
 CREATE TABLE <xsl:value-of select="$dbTableName"/>(<xsl:apply-templates select="*" mode="field"/>);
 COMMENT ON TABLE <xsl:value-of select="$dbTableName"/> IS '<xsl:value-of select="$dbNameComment"/>';
 <xsl:apply-templates select="*" mode="comment-enums"/>
-GRANT ALL PRIVILEGES ON TABLE <xsl:value-of select="$dbTableName"/> TO clearing;
 </xsl:template>
 
 <xsl:template match="*" mode="objects">
@@ -54,7 +53,6 @@ DROP TABLE IF EXISTS <xsl:value-of select="$dbTableName"/>;
 CREATE TABLE <xsl:value-of select="$dbTableName"/>(<xsl:apply-templates select="*[@name or @dbname or @type]" mode="field"/>);
 COMMENT ON TABLE <xsl:value-of select="$dbTableName"/> IS '<xsl:value-of select="$dbNameTComment"/>';
 <xsl:apply-templates select="*[@name or @dbname or @type]" mode="comment-objects"/>
-GRANT ALL PRIVILEGES ON TABLE <xsl:value-of select="$dbTableName"/> TO clearing;
 <xsl:if test="@logUpdates">
 
 -- History log of <xsl:value-of select="name()"/> - <xsl:value-of select="$dbNameTComment"/>
@@ -67,7 +65,6 @@ COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>_HISTORY.EVENT_TIME IS '
 COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
 COMMENT ON COLUMN <xsl:value-of select="$dbTableName"/>_HISTORY.EVENT_TYPE IS 'Тип изменения';
 <xsl:apply-templates select="*[@name or @dbname or @type]" mode="comment-history-objects"/>
-GRANT ALL PRIVILEGES ON TABLE <xsl:value-of select="$dbTableName"/>_HISTORY TO clearing;
 </xsl:if>
 </xsl:template>
 

clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/config/StateLoaderImplTestConfig.java

@@ -27,6 +27,6 @@ public class StateLoaderImplTestConfig {
 
     @Bean(name = "stateLoaderImplTest")
     public StateLoaderImpl createStateLoaderImpl(@Qualifier("responseFactoryTest") GetResponseFactory responseFactory) {
-        return new StateLoaderImpl(hazelcastServiceTest, null, responseFactory);
+        return new StateLoaderImpl(hazelcastServiceTest, responseFactory);
     }
 }

clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java

@@ -88,7 +88,6 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
         DepoAccountController.class,
         //account misc
         ClientCodeController.class,
-        AccountSymbolsController.class,
         //company
         CompanyRoleSetController.class,
         CompanyController.class,

clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountSymbolsControllerTest.java

@@ -1,66 +0,0 @@
-package ru.spcex.clearing.backendapi.controller.queue.account;
-
-import org.junit.jupiter.api.Test;
-import ru.clearing.classes.statics.data.account.AccountSymbols;
-import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
-import ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction;
-import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-
-
-class AccountSymbolsControllerTest extends AbstractControllerTest {
-    private static final String REST_URL = "/accounting/depo-accounts-symbols/";
-
-    /**
-     * {@link AccountSymbolsController#add(AccountSymbolsNewAction)}<br>
-     * Тест проверяет получение сущности {@link AccountSymbolsNewAction} по REST API и отправку в Apache Kafka.<br>
-     * Входной запрос {@link AccountSymbolsNewAction}: {111L, "VALUE-1234"}
-     */
-    @Test
-    void add() throws Exception {
-        //ARRANGE
-        AccountSymbolsNewAction accountSymbolsNewAction = new AccountSymbolsNewAction();
-        accountSymbolsNewAction.setAccountId(111L);
-        accountSymbolsNewAction.setAccountSymbolValue("VALUE-1234");
-
-        //ACT and ASSERT
-        checkAddingByRestApi(REST_URL, accountSymbolsNewAction);
-        checkSendedMessegeFromKafka(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_NEW, accountSymbolsNewAction);
-    }
-
-    /**
-     * {@link AccountSymbolsController#delete(Long)} <br>
-     * Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
-     * Входной запрос /accounting/depo-accounts-symbols/{@link Long}: - 0L<br>
-     */
-    @Test
-    void delete() throws Exception {
-        //ARRANGE
-        long id = currentId.getAndIncrement();
-        CommonDeleteAction deleteAction = new CommonDeleteAction();
-        deleteAction.setId(id);
-        //ACT and ASSERT
-        checkDeletingByRestApi(REST_URL, id);
-        checkSendedMessegeFromKafka(Consts.DESTINATION_DEPO_ACCOUNT_SYMBOLS_DELETE, deleteAction);
-    }
-
-    /**
-     * {@link ClientCodeController#getAll()} <br>
-     * Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClientCode.<br>
-     * Входной запрос /client-codes/ <br>
-     * Ответ CommonGetAllResponse <br>
-     */
-    @Test
-    void getAll() throws Exception {
-        //ARRANGE
-        AccountSymbols existAccountSymbols = new AccountSymbols();
-        existAccountSymbols.setAccountId(111L);
-        existAccountSymbols.setAccountSymbolValue("AAABBBVVCD");
-        existAccountSymbols.setId(currentId.get());
-
-        //ACT and ASSERT
-        checkGettingAllFromRestApi(IMDGDistributedNames.Map_AccountSymbols, existAccountSymbols, REST_URL);
-    }
-
-}

clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/meta/GetResponseFactoryTestConfiguration.java

@@ -20,7 +20,7 @@ import java.nio.file.Paths;
 public class GetResponseFactoryTestConfiguration {
     @Bean("metaJsonTestPath")
     public Resource metaJsonPath() {
-        Path path = Paths.get("src", "main", "resources", "meta", "meta.json");
+        Path path = Paths.get("src", "main", "resources", "meta.json");
         return new PathResource(path);
     }
 

clearing-parent/backend-api/src/test/resources/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.9.0.71",
+		"version": "3.7.0.45",
 		
 		"enums": {
 		
@@ -2361,41 +2361,7 @@
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	]
-			,"actions":[
+			
-			{"method":"post",
-				
-					"name": "Добавление роли участнику",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyRoleSetNewAction",
-				
-				"fields": [
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
-	,
-		{"code": "companyRole",
-			"type": 12,"dbname": "Код роли компании","name": "Наименование роли компании","shortname": "Роль","link": "companyRole","required": true
-		}
-	,
-		{"code": "workflowStatus",
-			"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "workflowStatus","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление роли участнику",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "companyRoleSet","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"security": {
@@ -2570,10 +2536,6 @@
 		{"code": "fullNameEng",
 			"type": 2,"length": 255,"name": "Полное наименование инструмента на английском","shortname": "Наименование на английском","searchable": true,"sortable": true,"visible": true,"extends": "security"
 		}
-	,
-		{"code": "clearingOrganization",
-			"type": 2,"length": 255,"name": "Клиринговая организация","shortname": "Клиринговая организация","searchable": true,"sortable": true,"visible": true,"filterable": "true","filterValue": "АО СПВБ"
-		}
 	,
 		{"code": "isin",
 			"type": 2,"length": 50,"name": "Наименование инструмента ISIN","shortname": "ISIN","searchable": true,"sortable": true,"visible": true,"extends": "security"
@@ -2773,7 +2735,7 @@
 			
 				"destination": "securities/traded-money-securities",
 			
-				"class": "ru.clearing.classes.statics.data.security.TradedMoneyMarketSecurity",
+				"class": "ru.clearing.classes.statics.data.misc.TradedMoneyMarketSecurity",
 			
 				"table": "traded_money_market_security",
 			
@@ -3038,13 +3000,9 @@
 		{"code": "maturityDate",
 			"type": 6,"name": "Дата погашения","shortname": "Погашение","searchable": true,"sortable": true
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал","searchable": true,"sortable": true
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал","searchable": true,"sortable": true
+			"type": 10,"name": "Номинал","shortname": "Номинал","searchable": true,"sortable": true
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3120,13 +3078,9 @@
 		{"code": "lotSize",
 			"type": 11,"name": "Размер лота","shortname": "Лот","visible": false
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал"
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал"
+			"type": 10,"name": "Текущий номинал","shortname": "Текущий номинал"
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3203,13 +3157,9 @@
 		{"code": "lotSize",
 			"field": "securityId","type": 11,"name": "Размер лота","shortname": "Лот","linkKeyCode": "securityId","linkCode": "lotSize","link": "listing","visible": false
 		}
-	,
-		{"code": "nominalForDate",
-			"type": 10,"name": "Текущее значение номинала","shortname": "Текущий номинал"
-		}
 	,
 		{"code": "nominalValue",
-			"type": 10,"name": "Номинал инструмента","shortname": "Номинал"
+			"type": 10,"name": "Текущий номинал","shortname": "Текущий номинал"
 		}
 	,
 		{"code": "nominalCurrency",
@@ -3328,11 +3278,11 @@
 			"type": 3,"name": "Номер купона","shortname": "Номер","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodStartDate",
+		{"code": "periodEndDate",
 			"type": 6,"name": "Начало периода действия","shortname": "Начало","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodEndDate",
+		{"code": "periodStartDate",
 			"type": 6,"name": "Окончание периода действия","shortname": "Окончание","searchable": true,"sortable": true,"visible": true
 		}
 	,
@@ -4060,7 +4010,7 @@
 			,"actions":[
 			{"method":"post",
 				
-					"name": "Разделение депозита",
+					"name": "Досрочное изъятие депозита",
 				
 					"destination": "registries/splitDeposit",
 				
@@ -4111,35 +4061,6 @@
 		{"code": "balance",
 			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
 		}
-	]
-			}
-		,
-			{"method":"post",
-				
-					"name": "Идентификация неразмеченных средств",
-				
-					"destination": "registries/identificationFunds",
-				
-					"confirmation": "balance,tradingClearingRegistryId",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "registry","linkCode": "id","required": true
-		}
-	,
-		{"code": "balance",
-			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
-		}
-	,
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
-	,
-		{"code": "tradingClearingRegistryId",
-			"type": 1,"name": "Торгово-клиринговый регистр","shortname": "Торгово-клиринговый регистр","link": "tradingClearingRegistry","linkCode": "code","required": true
-		}
 	]
 			}
 		,
@@ -4165,39 +4086,6 @@
 		{"code": "refundDate",
 			"type": 6,"name": "Дата возврата депозита","shortname": "Возврат депозита","visible": true,"enabled": true
 		}
-	]
-			}
-		,
-			{"method":"put",
-				
-					"name": "Установить отметку о получении выписки",
-				
-					"destination": "registries/changeStatusExtract",
-				
-					"confirmation": "shortName,contract,balance",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeStatusExtractActionNew",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "registry","linkCode": "id","required": true
-		}
-	,
-		{"code": "shortName",
-			"type": 2,"length": 255,"name": "Краткое наименование компании","shortname": "Компания","enabled": false
-		}
-	,
-		{"code": "contract",
-			"type": 2,"length": 255,"name": "Договор","shortname": "Номер договора","required": true,"enabled": false
-		}
-	,
-		{"code": "balance",
-			"type": 10,"name": "Текущий баланс","shortname": "Баланс","enabled": false
-		}
-	,
-		{"code": "registryStatus",
-			"type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","link": "registryStatus","visible": false
-		}
 	]
 			}
 		]
@@ -4255,7 +4143,7 @@
 			,"actions":[
 			{"method":"post",
 				
-					"name": "Добавление счета",
+					"name": "Добавление корреспондентского счета",
 				
 					"confirmation": "companyId,account,status",
 				
@@ -4267,7 +4155,7 @@
 		}
 	,
 		{"code": "account",
-			"type": 2,"length": 50,"name": "Номер счета","shortname": "Счет"
+			"type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","required": true
 		}
 	,
 		{"code": "status",
@@ -4282,7 +4170,7 @@
 		,
 			{"method":"put",
 				
-					"name": "Изменение счета",
+					"name": "Изменение корреспондентского счета",
 				
 					"confirmation": "companyId,account,status",
 				
@@ -4313,7 +4201,7 @@
 		,
 			{"method":"delete",
 				
-					"name": "Блокировка счета",
+					"name": "Блокировка корреспондентского счета",
 				
 					"confirmation": "companyId,account",
 				
@@ -4622,10 +4510,6 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
@@ -4658,76 +4542,12 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	]
 			
-		}
-	,
-		"accountSymbols": {
-			
-				"name": "Депо КС - РДЦ",
-			
-				"destination": "accounting/depo-accounts-symbols",
-			
-				"class": "ru.clearing.classes.statics.data.account.AccountSymbols",
-			
-				"logUpdates": "true",
-			
-				"table": "depo_account_symbols",
-			
-			"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
-		}
-	,
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","searchable": true,"sortable": true,"visible": true,"link": "account","linkCode": "account"
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","searchable": true,"sortable": true,"visible": true
-		}
-	]
-			,"actions":[
-			{"method":"post",
-				
-					"name": "Добавление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction",
-				
-				"fields": [
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","link": "account","linkCode": "account","required": true
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"clearingAccount": {
@@ -4754,10 +4574,6 @@
 		{"code": "companyId",
 			"type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "serviceStatus",
-			"field": "accountId","type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"linkKeyCode": "id","linkCode": "status","link": "account","extends": "account"
-		}
 	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
@@ -5323,7 +5139,7 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Запрос остатков по всем счетам (отправка ДФ-56 для получения ответа ДФ-01, ДФ-57)",
+					"name": "Запрос остатков по всем счетам (отправка ДФ-51, ДФ-56 для получения ответа ДФ-01, ДФ-57)",
 				
 				"fields": []
 			}
@@ -5334,15 +5150,11 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)",
+					"name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)",
 				
 				"fields": [
-		{"code": "fullBalance",
-			"type": 10,"name": "Текущий баланс (всего)","shortname": "Текущие средства (всего)","enabled": false
-		}
-	,
 		{"code": "balance",
-			"type": 10,"name": "Текущий баланс (свободно)","shortname": "Текущие средства (свободно)","enabled": false
+			"type": 10,"name": "Текущий баланс","shortname": "Текущие средства","enabled": false
 		}
 	,
 		{"code": "securitySymbol",
@@ -5358,7 +5170,7 @@
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true
+			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true,"enabled": false
 		}
 	,
 		{"code": "creditLeg_accountId",
@@ -5420,11 +5232,11 @@
 				
 				"fields": [
 		{"code": "section",
-			"type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code","required": true
+			"type": 12,"name": "Секция","shortname": "Секция","link": "section","linkCode": "name","linkKeyCode": "code"
 		}
 	,
 		{"code": "sessionType",
-			"type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code","required": true
+			"type": 12,"name": "Тип клиринговой сессии","shortname": "Тип клиринговой сессии","link": "sessionType","linkCode": "name","linkKeyCode": "code"
 		}
 	,
 		{"code": "companyId",
@@ -5553,7 +5365,7 @@
 				
 					"group": "Формирование отчетности",
 				
-					"name": "Формирование отчетности PFX64/PFX65",
+					"name": "Формирование отчетности по сделкам",
 				
 				"fields": []
 			}
@@ -5577,28 +5389,6 @@
 				
 					"name": "Формирование ДФ-05 с кодом 9 (финальный)",
 				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CHDF",
-				
-					"group": "Общее",
-				
-					"name": "Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21",
-				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CCLR",
-				
-					"group": "Клиринг",
-				
-					"name": "Завершение неудачных клиринговых сессий",
-				
 				"fields": []
 			}
 		]
@@ -5634,7 +5424,7 @@
 		}
 	,
 		{"code": "sessionStatus",
-			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Шаг","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
+			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
 		}
 	,
 		{"code": "companyId",
@@ -5866,12 +5656,10 @@
 	,
 		"executionDeposit": {
 			
-				"name": "Сделки на секции МКР",
+				"name": "Сделки",
 			
 				"destination": "execution-deposits",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionDeposit",
 			
 				"logUpdates": "true",
@@ -5898,9 +5686,17 @@
 		{"code": "partyTradingClearingRegistry",
 			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true,"ignore": true
 		}
+	,
+		{"code": "counterPartyTradingClearingRegistryId",
+			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code"
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistry",
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
+		}
 	,
 		{"code": "market",
-			"type": 2,"length": 8,"dbname": "Код секции финансового инструмента","name": "Секция финансового инструмента","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkKeyCode": "code","linkCode": "description"
+			"type": 12,"dbname": "Код секции финансового инструмента","name": "Секция финансового инструмента","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkKeyCode": "code","linkCode": "description"
 		}
 	,
 		{"code": "price",
@@ -5982,14 +5778,6 @@
 		{"code": "counterPartyId",
 			"type": 1,"dbname": "Идентификатор компании-партнера, с которой заключена сделка","name": "Наименование компании-партнера, с которой заключена сделка","shortname": "Партнер","visible": false,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "counterPartyTradingClearingRegistryId",
-			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code","ignore": true
-		}
-	,
-		{"code": "counterPartyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
-		}
 	,
 		{"code": "coverageStatus",
 			"type": 12,"dbname": "Код статуса достаточности обеспечения","name": "Cтатус достаточности обеспечения","shortname": "Обеспеченность","searchable": true,"sortable": true,"link": "allowed"
@@ -6024,8 +5812,6 @@
 			
 				"destination": "execution-fonds",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionFond",
 			
 				"logUpdates": "true",
@@ -6074,7 +5860,7 @@
 		}
 	,
 		{"code": "interestAmount",
-			"type": 11,"name": "НКД","shortname": "НКД","visible": true,"searchable": true,"sortable": true
+			"type": 11,"name": "Объем процентов","shortname": "Проценты","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "exchangeOrderId",
@@ -6082,7 +5868,7 @@
 		}
 	,
 		{"code": "price",
-			"type": 10,"name": "Цена, %","shortname": "Цена, %","visible": true,"searchable": true,"sortable": true
+			"type": 10,"name": "Ставка по депозиту","shortname": "Ставка, %","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "settlementAmount",
@@ -6110,7 +5896,15 @@
 		}
 	,
 		{"code": "partyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true,"ignore": true
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр ","name": "Торгово-клиринговый регистр ","shortname": "ТКР ","searchable": true,"sortable": true
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistryId",
+			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code"
+		}
+	,
+		{"code": "counterPartyTradingClearingRegistry",
+			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
 		}
 	,
 		{"code": "comment",
@@ -6132,14 +5926,6 @@
 		{"code": "counterPartyId",
 			"type": 1,"dbname": "Идентификатор компании-партнера, с которой заключена сделка","name": "Наименование компании-партнера, с которой заключена сделка","shortname": "Партнер","visible": false,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName"
 		}
-	,
-		{"code": "counterPartyTradingClearingRegistryId",
-			"type": 1,"dbname": "Идентификатор торгово-клирингового регистра партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true,"link": "tradingClearingRegistry","linkCode": "code","ignore": true
-		}
-	,
-		{"code": "counterPartyTradingClearingRegistry",
-			"type": 2,"length": 20,"dbname": "Торгово-клиринговый регистр партнера","name": "Торгово-клиринговый регистр партнера","shortname": "ТКР партнера","visible": true,"searchable": true,"sortable": true
-		}
 	,
 		{"code": "securityFullName",
 			"type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": true,"searchable": true,"sortable": true
@@ -6174,19 +5960,17 @@
 			
 				"destination": "depo-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister",
 			
 				"table": "balance_depo_register",
 			
 			"fields": [
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
-			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true
+			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true
 		}
 	,
 		{"code": "updatedAt",
@@ -6198,7 +5982,7 @@
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "depoCode",
@@ -6222,8 +6006,6 @@
 			
 				"destination": "money-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister",
 			
 				"table": "money_balance_register",
@@ -6238,7 +6020,7 @@
 		}
 	,
 		{"code": "infoAccount",
-			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "remainderSum",
@@ -6246,23 +6028,23 @@
 		}
 	,
 		{"code": "blockedSum",
-			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "unblockedSum",
-			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "inn",
-			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "companyFullName",
-			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "companyId",
@@ -6270,7 +6052,7 @@
 		}
 	,
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
@@ -6278,7 +6060,7 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
 		}
 	]
 			
@@ -6290,8 +6072,6 @@
 			
 				"destination": "admitted-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister",
 			
 				"table": "admitted_liabilities_register",
@@ -6354,8 +6134,6 @@
 			
 				"destination": "covered-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister",
 			
 				"table": "covered_Liabilities_register",
@@ -6418,8 +6196,6 @@
 			
 				"destination": "money-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister",
 			
 				"table": "money_payment_instruction_register",
@@ -6474,8 +6250,6 @@
 			
 				"destination": "depo-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister",
 			
 				"table": "depo_payment_instruction_register",
@@ -6530,8 +6304,6 @@
 			
 				"destination": "exclude-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister",
 			
 				"table": "exclude_liabilities_register",
@@ -6610,8 +6382,6 @@
 			
 				"destination": "liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister",
 			
 				"table": "liabilities_register",
@@ -6690,8 +6460,6 @@
 			
 				"destination": "execution-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExecutionRegister",
 			
 				"table": "execution_register",
@@ -7073,11 +6841,11 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время прочтения записи","shortname": "Прочитано","searchable": true,"sortable": true
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"dbname": "Идентификатор отправителя","name": "Наименование отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"visible": true,"link": "userCls","linkCode": "identifier"
+			"type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","ignore": true
 		}
 	,
 		{"code": "addresseeId",
@@ -7093,7 +6861,7 @@
 		}
 	,
 		{"code": "notificationStatus",
-			"type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus"
+			"type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus","ignore": true
 		}
 	,
 		{"code": "comment",
@@ -7109,8 +6877,6 @@
 				
 					"name": "Изменение статуса сообщения",
 				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.registry.NotificationUpdateAction",
-				
 				"fields": [
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "notification","linkCode": "id","required": true
@@ -8386,7 +8152,7 @@
 		}
 	,
 		{"code": "acc_name",
-			"field": "accName","type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
+			"type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "account",
@@ -8396,10 +8162,6 @@
 		{"code": "deal",
 			"type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true
 		}
-	,
-		{"code": "date",
-			"type": 2,"length": 8,"name": "Дата изменения состояния счета","shortname": "Дата изменения состояния счета","searchable": true,"sortable": true,"visible": true
-		}
 	,
 		{"code": "status",
 			"type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true
@@ -8857,10 +8619,6 @@
 				"table": "s_df_57",
 			
 			"fields": [
-		{"code": "generationTime",
-			"type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true
-		}
-	,
 		{"code": "id",
 			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false
 		}
@@ -9016,6 +8774,10 @@
 		{"code": "fileName",
 			"type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true,"visible": true
 		}
+	,
+		{"code": "generationTime",
+			"type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true,"visible": true
+		}
 	,
 		{"code": "generationId",
 			"type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true,"visible": true
@@ -9372,7 +9134,7 @@
 			
 				"destination": "operations",
 			
-				"class": "ru.clearing.classes.statics.data.payment.Operation",
+				"class": "",
 			
 				"table": "operation",
 			
@@ -9418,7 +9180,7 @@
 			
 				"destination": "market-data-liquidations",
 			
-				"class": "ru.clearing.classes.statics.data.misc.MarketDataLiquidation",
+				"class": "",
 			
 				"table": "market_data_liquidation",
 			

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountSymbols.java

@@ -1,33 +0,0 @@
-package ru.clearing.classes.statics.data.account;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-
-/**
- * Депо КС - РДЦ
- * <p>
- * DB table: ACCOUNT_SYMBOLS
- **/
-public class AccountSymbols extends SpcexObjectBase {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private Long accountId;
-    private String accountSymbolValue;
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(Long value) {
-        this.accountId = value;
-    }
-
-    public String getAccountSymbolValue() {
-        return accountSymbolValue;
-    }
-
-    public void setAccountSymbolValue(String value) {
-        this.accountSymbolValue = value;
-    }
-
-}

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountSymbolsHistory.java

@@ -1,28 +0,0 @@
-package ru.clearing.classes.statics.data.account;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessEvent;
-
-import java.io.Serial;
-
-/**
- * Изменение состояния объекта Депо КС - РДЦ
- * <p>
- * DB table: ACCOUNT_SYMBOLS_HISTORY
- **/
-public class AccountSymbolsHistory extends BusinessEvent<AccountSymbols> {
-    @Serial
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private AccountSymbols object;
-
-    @Override
-    public AccountSymbols getObject() {
-        return object;
-    }
-
-    @Override
-    public void setObject(AccountSymbols object) {
-        this.object = object;
-    }
-}

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/instrument/issue/FixedIncomeSecurity.java

@@ -18,7 +18,6 @@ public class FixedIncomeSecurity extends Security {
     private Long securityId;
     private String bondType;
     private LocalDate maturityDate;
-    private BigDecimal nominalForDate;
     private BigDecimal nominalValue;
     private String nominalCurrency;
     private BigDecimal coupon;
@@ -46,13 +45,6 @@ public class FixedIncomeSecurity extends Security {
         this.maturityDate=value;
     }
 
-    public BigDecimal getNominalForDate() {
-        return nominalForDate;
-    }
-    public void setNominalForDate(BigDecimal nominalForDate) {
-        this.nominalForDate = nominalForDate;
-    }
-
     public BigDecimal getNominalValue() {
         return nominalValue;
     }

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/Registry.java

@@ -204,16 +204,10 @@ public class Registry extends BusinessObject implements Cloneable {
     }
 
     public BigDecimal getBalance() {
-        if (balance == null) {
-            balance = BigDecimal.ZERO;
-        }
         return balance;
     }
 
     public void setBalance(BigDecimal balance) {
-        if (balance == null) {
-            balance = BigDecimal.ZERO;
-        }
         this.balance = balance;
     }
 

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf53.java

@@ -5,7 +5,6 @@ import ru.spcex.platform.classes.base.SpcexObjectBase;
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.LocalDate;
 
 /**
  * ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие)
@@ -17,7 +16,6 @@ public class SDf53 extends SpcexObjectBase {
 
     private String account;
     private String deal;
-    private String date;
     private Long status;
     private String result;
     private Instant generationTime;
@@ -41,14 +39,6 @@ public class SDf53 extends SpcexObjectBase {
         this.deal = value;
     }
 
-    public String getDate() {
-        return date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-
     public Long getStatus() {
         return status;
     }

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/security/MoneyMarketSecurity.java

@@ -20,7 +20,6 @@ public class MoneyMarketSecurity extends Security {
     private String convention;
     private String termType;
     private BigDecimal lotSize;
-    private String clearingOrganization;
 
     public Long getSecurityId() {
         return securityId;
@@ -93,12 +92,4 @@ public class MoneyMarketSecurity extends Security {
     public void setLotSize(BigDecimal lotSize) {
         this.lotSize = lotSize;
     }
-
-    public String getClearingOrganization() {
-        return clearingOrganization;
-    }
-
-    public void setClearingOrganization(String clearingOrganization) {
-        this.clearingOrganization = clearingOrganization;
-    }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/KafkaConfig.java

@@ -2,8 +2,6 @@ package ru.spcex.clearing.config;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
@@ -15,7 +13,6 @@ import ru.spcex.clearing.config.element.ClearingServiceSettings;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
 import ru.spcex.clearing.platform.messaging.config.KafkaProducerFactory;
-import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings;
 import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings;
 import ru.spcex.clearing.platform.messaging.service.RequestInfo;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
@@ -23,44 +20,13 @@ import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-
 @Configuration
 public class KafkaConfig {
-    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Autowired
-    private final KafkaConsumerSettings kafkaSettings;
-
-    public KafkaConfig(ClearingServiceSettings settings) {
-        this.kafkaSettings = settings.getKafkaConsumer();
-        Integer gtwTimeout = settings.getSessionStage().getInspectionGatewayTimeout();
-        if (gtwTimeout != null) {
-            int maxPollIntervalMs = gtwTimeout * 1000 + 1000;
-            log.debug("setting max.poll.interval.ms {}", maxPollIntervalMs);
-            this.kafkaSettings.setManuallyMaxPollIntervalMs(maxPollIntervalMs);
-        }
-    }
-
-
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    @Bean("kafkaConsumer")
+    @Bean
-    public Consumer<String, Object> createConsumer() {
+    public Consumer<String, Object> createConsumer(ClearingServiceSettings settings) {
-        return KafkaConsumerFactory.consumer(kafkaSettings);
+        return KafkaConsumerFactory.consumer(settings.getKafkaConsumer());
-    }
-
-    @Bean("kafkaConsumerGateway")
-    public Supplier<Consumer<String, Object>> getwaySessionConsumer() {
-        AtomicInteger groupId = new AtomicInteger(1);
-        return () -> {
-            KafkaConsumerSettings consumer = kafkaSettings;
-            KafkaConsumerSettings gatewayConsumer = new KafkaConsumerSettings();
-            gatewayConsumer.setBootstrapServers(consumer.getBootstrapServers());
-            gatewayConsumer.setSessionTimeoutMs(consumer.getSessionTimeoutMs());
-            gatewayConsumer.setAutoOffsetReset(consumer.getAutoOffsetReset());
-            gatewayConsumer.setEnableAutoCommit(consumer.getEnableAutoCommit());
-            gatewayConsumer.setGroupId(consumer.getGroupId() + "-gateway-" + groupId.getAndIncrement());
-            return KafkaConsumerFactory.consumer(gatewayConsumer);
-        };
     }
 
     @Autowired

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/RequestHelperConfiguration.java

@@ -1,15 +0,0 @@
-package ru.spcex.clearing.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import ru.spcex.clearing.error.ClearingError;
-import ru.spcex.clearing.util.services.RequestHelper;
-import ru.spcex.platform.utils.enumeration.IMessageResolver;
-
-@Configuration
-public class RequestHelperConfiguration {
-    @Bean
-    public RequestHelper reqHelper(IMessageResolver msgRslv) {
-        return new RequestHelper(msgRslv, ClearingError.GeneralError);
-    }
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java

@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Configuration;
 import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.account.AccountBalance;
 import ru.clearing.classes.statics.data.account.DepoAccount;
-import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.company.relation.Relation;
@@ -14,7 +13,6 @@ import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
 import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
 import ru.clearing.classes.statics.data.misc.STrades;
 import ru.clearing.classes.statics.data.misc.Session;
-import ru.clearing.classes.statics.data.payment.PaymentInstruction;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.classes.statics.data.sdf.*;
@@ -25,53 +23,53 @@ import ru.clearing.platform.dictionary.InOutDirectionDictionary;
 import ru.clearing.platform.dictionary.SectionDictionary;
 import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.payment.PIClearingOutbondActionNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.*;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryChangeRefundDateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryReturnDepositRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistrySplitDepositActionRequest;
 import ru.spcex.clearing.service.validation.*;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule;
 import ru.spcex.clearing.validation.common.rules.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
+import ru.spcex.clearing.validation.common.rules.SecurityPresentRule;
 import ru.spcex.platform.enumeration.ClearingCategory;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.imdg.validation.LogPrefixId;
-import ru.spcex.platform.imdg.validation.rule.AnltAccLoad;
 import ru.spcex.platform.imdg.validation.rule.PresentById;
+import ru.spcex.platform.utils.collection.Pair;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 @Configuration
 public class ValidationConfig {
 
     Imdg<Relation> imdgRelation;
     Imdg<Company> imdgCompany;
-    Imdg<FixedIncomeSecurity> fixedIncomeSecurityImdg;
+    List<Pair<String, Imdg<Security>>> imdgSecurities;
-    Imdg<EquitySecurity> equitySecurityImdg;
+    Imdg<MoneyMarketSecurity> imdgMoneyMarketSecurity;
+//    Imdg<FixedIncomeSecurity> fixedIncomeSecurityImdg;
+//    Imdg<EquitySecurity> equitySecurityImdg;
 
     Imdg<CompanySymbols> imdgCompanySymbols;
     Imdg<Registry> imdgRegistry;
     Imdg<Account> imdgAccount;
     Imdg<DepoAccount> imdgDepoAccount;
     Imdg<AccountBalance> imdgAccountBalance;
-    Imdg<Security> imdgSecurity;
-    Imdg<MoneyMarketSecurity> imdgMoneyMarketSecurity;
     Imdg<TradingClearingRegistry> imdgTradingClearingRegistry;
     Imdg<Session> imdgSession;
     Imdg<SectionDictionary> imdgSectionDictionary;
     Imdg<Statement> imdgStatement;
     Imdg<InOutDirectionDictionary> imdgInOutDirection;
-    Imdg<SDf55> sDf55Imdg;
-    Imdg<SDf54> sDf54Imdg;
-    Imdg<PaymentInstruction> pmtImdg;
-    Imdg<ClearingMemberCategory> ctgrImdg;
     ImdgProvider imdgProvider;
 
     public ValidationConfig(ImdgProvider imdgProvider) {
@@ -81,20 +79,16 @@ public class ValidationConfig {
         this.imdgRegistry = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         this.imdgAccount = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
         this.imdgAccountBalance = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);
-        this.imdgSecurity = imdgProvider.getImdg(IMDGDistributedNames.Map_Security, Security.class);
+        imdgSecurities = Arrays.stream(SecurityPresentRule.SUB_SECURITY_MAP_NAMES).map(sMapName -> new Pair<>(sMapName, imdgProvider.getImdg(sMapName, Security.class))).collect(Collectors.toList());
         this.imdgTradingClearingRegistry = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
         this.imdgSession = imdgProvider.getImdg(IMDGDistributedNames.Map_Session, Session.class);
         this.imdgSectionDictionary = imdgProvider.getImdg(IMDGDistributedNames.Map_SectionDictionary, SectionDictionary.class);
         this.imdgMoneyMarketSecurity = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class);
-        this.fixedIncomeSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class);
+//        this.fixedIncomeSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class);
-        this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class);
+//        this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class);
         this.imdgStatement = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
         this.imdgDepoAccount = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
         this.imdgInOutDirection = imdgProvider.getImdg(IMDGDistributedNames.Map_InOutDirectionDictionary, InOutDirectionDictionary.class);
-        this.sDf55Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf55, SDf55.class);
-        this.sDf54Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf54, SDf54.class);
-        this.pmtImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class);
-        this.ctgrImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
         this.imdgProvider = imdgProvider;
     }
 
@@ -129,12 +123,10 @@ public class ValidationConfig {
         return sTrades -> {
             ImdgValidationContext<STrades> context = new ImdgValidationContext<>();
             context.setValidatedObject(sTrades);
-            context.addImdg(IMDGDistributedNames.Map_Security, imdgSecurity);
+            for (Pair<String, Imdg<Security>> item: imdgSecurities)
+                context.addImdg(item.getFirst(), item.getSecond());
             context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
             context.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
-            context.addImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, fixedIncomeSecurityImdg);
-            context.addImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, imdgMoneyMarketSecurity);
-            context.addImdg(IMDGDistributedNames.Map_EquitySecurity, equitySecurityImdg);
             context.setLogPrefix(LogPrefixId.INSTANCE);
             return new ValidatorImpl<>(context,
                     STradesValidationRule.SecurityPresentFond,
@@ -149,7 +141,8 @@ public class ValidationConfig {
         return sTrades -> {
             ImdgValidationContext<STrades> context = new ImdgValidationContext<>();
             context.setValidatedObject(sTrades);
-            context.addImdg(IMDGDistributedNames.Map_Security, imdgSecurity);
+            for (Pair<String, Imdg<Security>> item: imdgSecurities)
+                context.addImdg(item.getFirst(), item.getSecond());
             context.addImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, imdgMoneyMarketSecurity);
             context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
             context.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
@@ -210,7 +203,6 @@ public class ValidationConfig {
             return new ValidatorImpl<>(context,
                     Sdf57ValidationRule.CompanyDebOrCredPresent,
                     Sdf57ValidationRule.AccountDebOrCredPresent,
-                    Sdf57ValidationRule.AccountAndCompanyMatch,
                     Sdf57ValidationRule.CurrencyCodeCheck
             );
         };
@@ -223,9 +215,8 @@ public class ValidationConfig {
             context.setValidatedObject(sDf21);
             context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
             context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
-            context.addImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, imdgMoneyMarketSecurity);
+            for (Pair<String, Imdg<Security>> item: imdgSecurities)
-            context.addImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, fixedIncomeSecurityImdg);
+                context.addImdg(item.getFirst(), item.getSecond());
-            context.addImdg(IMDGDistributedNames.Map_EquitySecurity, equitySecurityImdg);
             context.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
             context.setLogPrefix(LogPrefixId.INSTANCE);
             return new ValidatorImpl<>(context,
@@ -262,8 +253,8 @@ public class ValidationConfig {
             context.setValidatedObject(sDf08);
             context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
             context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
-            context.addImdg(IMDGDistributedNames.Map_EquitySecurity, equitySecurityImdg);
+//            for (Pair<String, Imdg<Security>> item: imdgSecurities)
-            context.addImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, fixedIncomeSecurityImdg);
+//                context.addImdg(item.getFirst(), item.getSecond());
             context.setLogPrefix(LogPrefixId.INSTANCE);
             return new ValidatorImpl<>(context,
                     Sdf08NewValidationRule.AccountPresent, Sdf08NewValidationRule.InstrumentPresent
@@ -304,9 +295,8 @@ public class ValidationConfig {
             context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
             context.addImdg(IMDGDistributedNames.Map_DepoAccount, imdgDepoAccount);
             context.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
-            context.addImdg(IMDGDistributedNames.Map_FixedIncomeSecurity , fixedIncomeSecurityImdg);
+            for (Pair<String, Imdg<Security>> item: imdgSecurities)
-            context.addImdg(IMDGDistributedNames.Map_MoneyMarketSecurity , imdgMoneyMarketSecurity);
+                context.addImdg(item.getFirst(), item.getSecond());
-            context.addImdg(IMDGDistributedNames.Map_EquitySecurity , equitySecurityImdg);
             context.addImdg(IMDGDistributedNames.Map_CompanySymbols, imdgCompanySymbols);
             context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
             context.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
@@ -330,14 +320,12 @@ public class ValidationConfig {
             ImdgValidationContext<RegistryReturnDepositRequest> context = new ImdgValidationContext<>();
             context.setValidatedObject(returnDepositRequest);
             context.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
-            context.addImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ctgrImdg);
             context.setLogPrefix(LogPrefixId.INSTANCE);
             return new ValidatorImpl<>(context,
                     new PresentById(IMDGDistributedNames.Map_Registry, ClearingError.RecordNotFound, true),
-                    ReturnDepositValidationRule.RgsWronCodeCheck,
+                    ReturnDepositValidationRule.RegistryCodeCheck,
-                    ReturnDepositValidationRule.CategoryCheck,
                     ReturnDepositValidationRule.BalanceCheck,
-                    ReturnDepositValidationRule.Dm_Check
+                    ReturnDepositValidationRule.DmxCheck
             );
         };
     }
@@ -356,46 +344,6 @@ public class ValidationConfig {
         };
     }
 
-    @Bean("statusExtractValidator")
-    public Function<RegistryChangeStatusExtractRequest, IValidator> statusExtractValidator() {
-        return statusExtractRequest -> {
-            ImdgValidationContext<RegistryChangeStatusExtractRequest> context = new ImdgValidationContext<>();
-            context.setValidatedObject(statusExtractRequest);
-            context.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
-            context.setLogPrefix(LogPrefixId.INSTANCE);
-            return new ValidatorImpl<>(context,
-                    StatusExtractValidationRule.Fields,
-                    new PresentById(IMDGDistributedNames.Map_Registry, ClearingError.RecordNotFound, true),
-                    StatusExtractValidationRule.RegistryCodeCheck,
-                    StatusExtractValidationRule.ContractCheck,
-                    StatusExtractValidationRule.RequestStatusValid,
-                    StatusExtractValidationRule.RegistryStatusValid
-            );
-        };
-    }
-
-    @Bean("identificationFundsValidator")
-    public Function<IdentificationFundsRequest, IValidator> identificationFundsValidator() {
-        return identificationFundsRequest -> {
-            ImdgValidationContext<IdentificationFundsRequest> context = new ImdgValidationContext<>();
-            context.setValidatedObject(identificationFundsRequest);
-            context.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
-            context.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
-            context.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
-            context.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
-            context.setLogPrefix(LogPrefixId.INSTANCE);
-            return new ValidatorImpl<>(context,
-                    IdentificationFundsValidationRule.Fields,
-                    new PresentById(IMDGDistributedNames.Map_Registry, ClearingError.RecordNotFound, true),
-                    IdentificationFundsValidationRule.RegistryCodeCheck,
-                    IdentificationFundsValidationRule.BalanceCheck,
-                    IdentificationFundsValidationRule.TcrCheck,
-                    IdentificationFundsValidationRule.AssetsCheck,
-                    new AnltAccLoad(ClearingError.GeneralError)
-            );
-        };
-    }
-
     @Bean("splitDepositValidator")
     public Function<RegistrySplitDepositActionRequest, IValidator> splitDepositValidator() {
         return refundDateRequest -> {
@@ -414,8 +362,7 @@ public class ValidationConfig {
                             IMDGDistributedNames.Map_InOutDirectionDictionary, InOutDirectionDictionary.class,
                             ClearingError.RequiredFieldEmpty, ClearingError.DictionaryNotFound, false),
                     SplitDepositRequestValidationRule.PositiveAmount,
-                    SplitDepositRequestValidationRule.CrossvalidateByRegistry,
+                    SplitDepositRequestValidationRule.CrossvalidateByRegistry
-                    SplitDepositRequestValidationRule.LoadContractIndexes
             );
         };
     }
@@ -427,7 +374,6 @@ public class ValidationConfig {
             ctx.setValidatedObject(pmtOut);
             ctx.addImdg(IMDGDistributedNames.Map_Company, imdgCompany);
             ctx.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
-            ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
             return new ValidatorImpl<>(ctx,
                     PaymentOutboundValidationRule.RequiredFields,
                     IdPresentRule.instance("senderId",
@@ -435,17 +381,15 @@ public class ValidationConfig {
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             ClearingError.RequiredFieldEmpty,
-                            ClearingError.WrongField),
+                            ClearingError.DictionaryNotFound),
                     IdPresentRule.instance("addresseeId",
                             PIClearingOutbondActionNewRequest::getAddresseeId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             ClearingError.RequiredFieldEmpty,
-                            ClearingError.WrongField),
+                            ClearingError.DictionaryNotFound),
                     PaymentOutboundValidationRule.CreditLegAccount,
-                    PaymentOutboundValidationRule.DebitLegAccount,
+                    PaymentOutboundValidationRule.DebitLegAccount);
-                    PaymentOutboundValidationRule.AddresseePresent,
-                    PaymentOutboundValidationRule.TcrPresent);
         };
     }
 
@@ -458,9 +402,8 @@ public class ValidationConfig {
             ctx.addImdg(IMDGDistributedNames.Map_Account, imdgAccount);
             ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
             ctx.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
-            ctx.addImdg(IMDGDistributedNames.Map_FixedIncomeSecurity , fixedIncomeSecurityImdg);
+            for (Pair<String, Imdg<Security>> item: imdgSecurities)
-            ctx.addImdg(IMDGDistributedNames.Map_MoneyMarketSecurity , imdgMoneyMarketSecurity);
+                ctx.addImdg(item.getFirst(), item.getSecond());
-            ctx.addImdg(IMDGDistributedNames.Map_EquitySecurity , equitySecurityImdg);
             return new ValidatorImpl<>(ctx,
                     Sdf20ValidationRule.Fields,
                     Sdf20ValidationRule.AccountPresent,
@@ -472,39 +415,6 @@ public class ValidationConfig {
         };
     }
 
-    @Bean
-    public Function<StatementRequest, IValidator> sdf55ExecutorValidation() {
-        return req -> {
-            ImdgValidationContext<StatementRequest> ctx = new ImdgValidationContext<>();
-            ctx.setValidatedObject(req);
-            ctx.addImdg(IMDGDistributedNames.Map_Registry, imdgRegistry);
-            ctx.addImdg(IMDGDistributedNames.Map_SDf55, sDf55Imdg);
-            ctx.addImdg(IMDGDistributedNames.Map_SDf54, sDf54Imdg);
-            ctx.addImdg(IMDGDistributedNames.Map_PaymentInstruction, pmtImdg);
-            ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry);
-            return new ValidatorImpl<>(ctx,
-                    Sdf55ValidationRule.Fields,
-                    Sdf55ValidationRule.GenerationIdFound,
-                    Sdf55ValidationRule.Sdf54Present,
-                    Sdf55ValidationRule.PaymentInstructionPresent,
-                    Sdf55ValidationRule.TcrPresent,
-                    Sdf55ValidationRule.AssetsPresent);
-        };
-    }
-
-    @Bean("terminateSessionValidator")
-    public Supplier<IValidator> terminateSessionValidator() {
-        return () -> {
-            ImdgValidationContext<Session> ctx = new ImdgValidationContext<>();
-            ctx.setLogPrefix(LogPrefixId.INSTANCE);
-            ctx.addImdg(IMDGDistributedNames.Map_Session, imdgSession);
-            return new ValidatorImpl<>(ctx,
-                    SessionTerminationValidationRule.SessionPresent,
-                    SessionTerminationValidationRule.StatusCheck
-                    );
-        };
-    }
-
     @Bean("userRoleVerification")
     public UserRoleVerification userRoleVerification(ImdgProvider imdgProvider, IMessageResolver msgs) {
         return new UserRoleVerification(imdgProvider, msgs, ClearingError.UserVerifyDenial);

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/element/ClearingServiceSettings.java

@@ -14,8 +14,6 @@ public class ClearingServiceSettings {
     private HazelcastClientParams hazelcast;
     private KafkaConsumerSettings kafkaConsumer;
     private KafkaProducerSettings kafkaProducer;
-    private SessionStageSettings sessionStage;
-    private TradeSettings trade = new TradeSettings();
 
     public HazelcastClientParams getHazelcast() {
         return hazelcast;
@@ -40,20 +38,4 @@ public class ClearingServiceSettings {
     public void setKafkaProducer(KafkaProducerSettings kafkaProducer) {
         this.kafkaProducer = kafkaProducer;
     }
-
-    public SessionStageSettings getSessionStage() {
-        return sessionStage;
-    }
-
-    public void setSessionStage(SessionStageSettings sessionStage) {
-        this.sessionStage = sessionStage;
-    }
-
-    public TradeSettings getTrade() {
-        return trade;
-    }
-
-    public void setTrade(TradeSettings trade) {
-        this.trade = trade;
-    }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/element/SessionStageSettings.java

@@ -1,14 +0,0 @@
-package ru.spcex.clearing.config.element;
-
-public class SessionStageSettings {
-    //inspection-gateway-timeout
-    private Integer inspectionGatewayTimeout = 10;
-
-    public Integer getInspectionGatewayTimeout() {
-        return inspectionGatewayTimeout;
-    }
-
-    public void setInspectionGatewayTimeout(Integer inspectionGatewayTimeout) {
-        this.inspectionGatewayTimeout = inspectionGatewayTimeout;
-    }
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/element/TradeSettings.java

@@ -1,14 +0,0 @@
-package ru.spcex.clearing.config.element;
-
-
-public class TradeSettings {
-    private Boolean valuation = false;
-
-    public Boolean getValuation() {
-        return valuation;
-    }
-
-    public void setValuation(Boolean valuation) {
-        this.valuation = valuation;
-    }
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java

@@ -32,7 +32,6 @@ import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
 
 @Configuration("sessionStateMachineFactory")
@@ -135,10 +134,6 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
         states
                 .withStates()
                     .initial(TaskType.StartRevise, context -> {
-                        Session existActiveSession = sessionImdg.getFirstObjectByFieldValues(Map.of("workflowStatus", SessionStatus.ACTV.getKey()));
-                        if (existActiveSession != null) {
-                            throw new RuntimeException("ActiveSessionIsPresent " + existActiveSession);
-                        }
                         Session newSession = new Session();
                         newSession.setSection(Section.FOND.getKey());
                         newSession.setSessionType(SessionType.IPOB.getKey());
@@ -152,16 +147,14 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
                     })
                     .states(new HashSet<>(Arrays.asList(TaskType.StartRevise,
                             TaskType.ContinueRevise,
-                            TaskType.StartRevisePart1,
                             TaskType.DealsPrepare,
                             TaskType.RequirementsAndObligationsCreate,
                             TaskType.ObligationsAdmission,
                             TaskType.InclusionToPool,
                             TaskType.InspectionObligations,
                             TaskType.FormingRegistersOnOS,
-                            TaskType.FormingPaymentInstruction,
+                            TaskType.FormingPaymentInstruction
 //                            TaskType.UnlockResources,
-                            TaskType.AgainRevise
 //                            TaskType.FinishingSession,
 //                            TaskType.EndStageNotification
                     )))
@@ -179,16 +172,11 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
                     .and()
                 .withExternal()
                     .event(SessionEvent.SdfReceived)
-                    .source(TaskType.ContinueRevise).target(TaskType.StartRevisePart1)
+                    .source(TaskType.ContinueRevise).target(TaskType.DealsPrepare)
                     .action(context -> {
                         log.info("SDF57 and SDF01 received, continue session");
                     })
                     .and()
-                .withExternal()
-                    .event(SessionEvent.Revise)
-                    .source(TaskType.StartRevisePart1).target(TaskType.DealsPrepare)
-                    .action(balanceReviseAction)
-                    .and()
                 .withExternal()
                     .source(TaskType.DealsPrepare).target(TaskType.RequirementsAndObligationsCreate)
                     .action(dealPrepareAction)
@@ -214,13 +202,8 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
                     .action(formingRegistersOnOSAction)
                     .and()
                 .withExternal()
-                    .source(TaskType.FormingPaymentInstruction).target(TaskType.AgainRevise)
+                    .source(TaskType.FormingPaymentInstruction).target(TaskType.FormingPaymentInstruction)
-                    .action(formingPaymentInstructionAction)
+                    .action(formingPaymentInstructionAction);
-                .and()
-                .withExternal()
-                    .event(SessionEvent.Revise)
-                    .source(TaskType.AgainRevise).target(TaskType.AgainRevise)
-                    .action(balanceReviseAction);
 
     }
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java

@@ -23,19 +23,11 @@ public enum ClearingError implements IErrorEnumId {
     SuchRecordAlreadyExists(5405L),
     TradingClearingRegistryNotFound(5418L),
     TradingClearingRegistryNotActive(5419L),
-     CategoryNotFound(5420L),
     ClearingUnavailableForCompany(5421L),
     InsecurityObligation(5422L),
     NewDealsNotFound(5423L),
     IdentifiedFundsExceedObligations(5424L),
     ObligationsAlreadyCalculated(5425L),
-    RefundDtLessThatValueDt(5426L),
-    ActiveSessionIsPresent(5428L),
-    AccountIsNotMatchedWithCompany(5429L),
-    RgsWrongCode(5430L),
-    RefundDateCannotBeChanged(5431L),
-    PlanBalanceReviseError(5432L),
-    XdepTimeIntervalNotMatch(5433L),
     //ошибки "перенесенные" из balance-service,
     CompanyNotFoundB(5211L),
     CurrencyNotFound(5213L),
@@ -46,8 +38,8 @@ public enum ClearingError implements IErrorEnumId {
     BalanceInsufficient(5222L),
     TCRegistryNotFound(3022L),
     WrongField(5004L),
-    GatewayTimeout(6003L),
+
-    GatewayNotApproved(6004L),
+    ActiveSessionIsPresent(-1L),
     ;
     private final Long id;
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/RgsError.java

@@ -1,20 +0,0 @@
-package ru.spcex.clearing.error;
-
-import ru.spcex.platform.utils.enumeration.IErrorEnumId;
-
-public enum RgsError implements IErrorEnumId {
-
-    A__tNotFound(5700L)
-
-    ;
-    private final Long id;
-
-    RgsError(Long id) {
-        this.id = id;
-    }
-
-    @Override
-    public Long getId() {
-        return id;
-    }
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/notification/NotificationSender.java

@@ -1,32 +0,0 @@
-package ru.spcex.clearing.notification;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.platform.enumeration.ObjectType;
-import ru.spcex.platform.enumeration.Priority;
-
-@Component
-public class NotificationSender {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final KafkaSender kafkaSender;
-
-    @Autowired
-    public NotificationSender(KafkaSender kafkaSender) {
-        this.kafkaSender = kafkaSender;
-    }
-
-    public void sendNotification(ObjectType objType, String comment, Priority priority) {
-        NotificationNewRequest reviseNotification = new NotificationNewRequest();
-        reviseNotification.setObjectType(objType.getKey());
-        reviseNotification.setComment(comment);
-        reviseNotification.setPriority(priority.getKey());
-        kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, reviseNotification);
-        log.info("notification {} sent {}", objType, comment);
-    }
-
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/AnltSearcher.java

@@ -17,10 +17,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IEnumId;
-import ru.spcex.platform.utils.text.TextUtil;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Component
 public class AnltSearcher {
@@ -56,10 +52,7 @@ public class AnltSearcher {
         ImdgPredicateBuilder pb = tradingClearingRegistryImdg.predicateBuilder();
         ImdgPredicate tcrPredicate = pb.and(
                 pb.equals("code", commentTcrStripped),
-                pb.or(
+                pb.equals("status", ServiceStatus.Active.getKey())
-                        pb.equals("status", ServiceStatus.Active.getKey()),
-                        pb.equals("status", ServiceStatus.Reopened.getKey())
-                )
         );
 
         TradingClearingRegistry tcr = tradingClearingRegistryImdg.getSingleObjectByPredicate(tcrPredicate);
@@ -87,19 +80,17 @@ public class AnltSearcher {
         return new AnltSearch(infoAcc, company, tcr);
     }
 
-    private static final Pattern tcrPattern = Pattern.compile("ТКР.*?([0-9A-Z-]{12})");
-
     private static String getTkrCodeFromComment(String comment) {
-        if (TextUtil.isEmpty(comment)) {
+        if (comment == null) {
             return null;
         }
         comment = comment.toUpperCase();
-        Matcher matcher = tcrPattern.matcher(comment);
+        int tcrIndex = comment.indexOf("ТКР");
-        if (matcher.find()) {
+        if (tcrIndex == -1) {
-            return matcher.group(1);
-        } else {
             return null;
         }
+        comment = comment.substring(tcrIndex + 3);
+        return comment.replaceAll("\\s+", "");
     }
 
     public static class AnltSearch {

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java

@@ -6,9 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.clearing.CreateRegistryRequest;
@@ -17,28 +15,24 @@ import ru.spcex.clearing.platform.messaging.domain.cud.clearing.SessionContinueE
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.gateway.AssetOperationApprovalRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.payment.PIClearingOutbondActionNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.*;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryChangeRefundDateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryReturnDepositRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistrySplitDepositActionRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.utilities.STradesImportedRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.service.executors.Sdf06Executor;
 import ru.spcex.clearing.service.executors.Sdf10Executor;
 import ru.spcex.clearing.service.payment.PaymentInstructionOutboundService;
 import ru.spcex.clearing.session.stage.*;
 import ru.spcex.clearing.session.stage.impl.BalanceRevise;
-import ru.spcex.clearing.statement.StatementServiceV2;
 import ru.spcex.platform.enumeration.Task;
-import ru.spcex.platform.utils.enumeration.IMessageResolver;
-import ru.spcex.platform.utils.error.ValidationException;
 
 import static ru.spcex.clearing.platform.messaging.domain.Consts.S_TRADES_IMPORTED;
 
 @Service
 public class EventsReceiver extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private final IMessageResolver errorResolver;
     private final ClearingService clearingService;
     private final RegistryService registryService;
     private final PrimaryAuctionBnSession primaryAuctionBnSession;
@@ -53,22 +47,18 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
     private final Sdf10Executor sdf10Executor;
     private final BalanceRevise balanceRevise;
     private final Sdf05Sender sdf05Sender;
-    private final StatementServiceV2 statementService;
-    private final SessionTerminator sessionTerminator;
     private final PaymentInstructionOutboundService pmtOutboundService;
 
     @Autowired
-    public EventsReceiver(@Qualifier("kafkaConsumer") Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaResponseQueue,
+    public EventsReceiver(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaResponseQueue,
-                          IMessageResolver errorResolver,
                           ClearingService clearingService,
                           RegistryService registryService,
                           PrimaryAuctionBnSession primaryAuctionBnSession,
                           SecondaryAuctionT0Session secondaryAuctionT0Session,
                           PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, ReturnDepositSession returnDepositSession, SessionManager sessionManager,
                           Sdf06Executor sdf06Executor,
-                          Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, SessionTerminator sessionTerminator, PaymentInstructionOutboundService pmtOutboundService) {
+                          Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, PaymentInstructionOutboundService pmtOutboundService) {
         super(kafkaQueue, kafkaResponseQueue);
-        this.errorResolver = errorResolver;
         this.clearingService = clearingService;
         this.registryService = registryService;
         this.primaryAuctionBnSession = primaryAuctionBnSession;
@@ -83,8 +73,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         this.sdf10Executor = sdf10Executor;
         this.balanceRevise = balanceRevise;
         this.sdf05Sender = sdf05Sender;
-        this.statementService = statementService;
-        this.sessionTerminator = sessionTerminator;
         this.pmtOutboundService = pmtOutboundService;
     }
 
@@ -107,22 +95,12 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
                 .forDestination(Consts.CONTINUE_CLEARING, callbacks::put);
 
         callback(LauncherCommandRequest.class)
-                .setFunction(r -> {
+                .setConsumer(sessionManager::defineAndStartSession)
-                    try {
-                        sessionManager.defineAndStartSession(r);
-                    } catch (ValidationException ve) {
-                        return makeErrorResponse(r, ve);
-                    }
-                    return null;
-                })
                 .forDestination(Task.startOfClearing.topic(), callbacks::put);
 
         callback(PIClearingOutbondActionNewRequest.class)
                 .setFunction(pmtOutboundService::sendOutBoundPayment)
                 .forDestination(Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION, callbacks::put);
-        callback(StatementRequest.class)
-                .setConsumer(statementService::processReq)
-                .forDestination(Consts.STATEMENT_PROCESS, callbacks::put);
         callback(SessionContinueEvent.class)
                 .setConsumer(req -> {
                     primaryAuctionBnSession.continueSession(req);
@@ -155,12 +133,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         callback(RegistryReturnDepositRequest.class)
                 .setFunction(registryService::returnDeposit)
                 .forDestination(Consts.REGISTRY_RETURN_DEPOSIT_ACTION, callbacks::put);
-        callback(RegistryChangeStatusExtractRequest.class)
-                .setFunction(registryService::changeStatusExtract)
-                .forDestination(Consts.REGISTRY_CHANGE_STATUS_EXTRACT_ACTION, callbacks::put);
-        callback(IdentificationFundsRequest.class)
-                .setFunction(registryService::identificationFunds)
-                .forDestination(Consts.REGISTRY_IDENTIFICATION_FUNDS, callbacks::put);
         callback(RegistryChangeRefundDateRequest.class)
                 .setFunction(registryService::changeRefundDate)
                 .forDestination(Consts.REGISTRY_CHANGE_REFUND_DATE_ACTION, callbacks::put);
@@ -186,21 +158,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         callback(LauncherCommandRequest.class)
                 .setConsumer(task -> sdf05Sender.sendSdf05("9"))
                 .forDestination(Task.sdf05WithCode9Final.topic(), callbacks::put);
-
-        callback(Object.class)
-                .setFunction(sessionTerminator::stopCurrentSession)
-                .forDestination(Consts.KILL_SESSION, callbacks::put);
-
         init();
     }
-
-    RequestInfoUpdate makeErrorResponse(BaseRequest<?> r, ValidationException ve) {
-        String errorText = errorResolver.resolve(ve.getEnumMsg());
-        log.error("Error at {}: {}", r, errorText);
-        RequestInfoUpdate errorMsg = new RequestInfoUpdate();
-        errorMsg.setId(r.getId());
-        errorMsg.setStatus(Status.Error);
-        errorMsg.setMessage(errorText);
-        return errorMsg;
-    }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/LauncherCommandReceiver.java

@@ -6,7 +6,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
@@ -18,7 +17,7 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi
 
     private final ClearingService clearingService;
     @Autowired
-    public LauncherCommandReceiver(@Qualifier("kafkaConsumer") Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaResponseQueue,
+    public LauncherCommandReceiver(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaResponseQueue,
                                    ClearingService clearingService) {
         super(kafkaQueue, kafkaResponseQueue);
         this.clearingService = clearingService;

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryService.java

@@ -4,34 +4,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.misc.Currency;
-import ru.clearing.classes.statics.data.payment.PaymentInstruction;
 import ru.clearing.classes.statics.data.registry.Registry;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
-import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.notification.NotificationSender;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationListRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.clearing.CreateRegistryRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.*;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryChangeRefundDateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistryReturnDepositRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.registry.RegistrySplitDepositActionRequest;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.platform.messaging.service.Status;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.clearing.service.builder.PaymentInstructionBuilderV2;
-import ru.spcex.clearing.service.integration.GatewayRequestCreator;
-import ru.spcex.clearing.service.registry.AssetTBFProcessing;
-import ru.spcex.clearing.service.registry.RegistryManager;
-import ru.spcex.clearing.service.schedule.TradingTimeService;
 import ru.spcex.clearing.service.validation.ValidationStored;
-import ru.spcex.clearing.session.stage.impl.GatewayRequester;
 import ru.spcex.clearing.session.stage.util.RegistryUtil;
 import ru.spcex.clearing.util.security.UserRoleVerification;
-import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -47,13 +32,10 @@ import ru.spcex.platform.utils.validation.IValidator;
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.LocalDate;
+import java.util.Collection;
-import java.util.*;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
 
 @Service
 public class RegistryService {
@@ -62,58 +44,26 @@ public class RegistryService {
     private final ImdgProvider imdgProvider;
     private final Imdg<TradingClearingRegistry> tradingClearingRegistryImdg;
     private final Imdg<Registry> registryImdg;
-    private final Imdg<Account> accImdg;
-    private final Imdg<Currency> currImdg;
-    private final Imdg<Company> cmpImdg;
-    private final Imdg<PaymentInstruction> pmtImdg;
     private final Function<RegistryReturnDepositRequest, IValidator> returnDepositVal;
     private final Function<RegistryChangeRefundDateRequest, IValidator> refundDateVal;
-    private final Function<RegistryChangeStatusExtractRequest, IValidator> statusExtractVal;
-    private final Function<IdentificationFundsRequest, IValidator> identificationFundsVal;
     private final Function<RegistrySplitDepositActionRequest, IValidator> splitDepositActionVal;
-    private final GatewayRequester gateway;
-    private final TradingTimeService trdTime;
-    private final NotificationSender notification;
-    private final KafkaSender kafkaSender;
 
     private final IMessageResolver msgResolver;
-    private final RequestHelper reqHelp;
     private final UserRoleVerification rights;
-    private final AssetTBFProcessing assets;
 
     public RegistryService(ImdgProvider imdgProvider,
                            @Qualifier("returnDepositValidator") Function<RegistryReturnDepositRequest, IValidator> returnDepositVal,
                            @Qualifier("refundDateValidator") Function<RegistryChangeRefundDateRequest, IValidator> refundDateVal,
-                           @Qualifier("identificationFundsValidator") Function<IdentificationFundsRequest, IValidator> identificationFundsVal,
                            @Qualifier("splitDepositValidator") Function<RegistrySplitDepositActionRequest, IValidator> splitDepositActionVal,
-                           @Qualifier("statusExtractValidator") Function<RegistryChangeStatusExtractRequest, IValidator> statusExtractVal,
+                           IMessageResolver msgResolver,
-                           GatewayRequester gateway,
+                           UserRoleVerification rights) {
-                           TradingTimeService tradingTimeService,
-                           NotificationSender notification,
-                           KafkaSender kafkaSender, IMessageResolver msgResolver,
-                           RequestHelper reqHelp,
-                           UserRoleVerification rights,
-                           AssetTBFProcessing assets) {
         this.imdgProvider = imdgProvider;
         this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
         this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
-        this.pmtImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PaymentInstruction, PaymentInstruction.class);
-        this.accImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        this.currImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Currency, Currency.class);
-        this.cmpImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.returnDepositVal = returnDepositVal;
         this.refundDateVal = refundDateVal;
-        this.identificationFundsVal = identificationFundsVal;
         this.splitDepositActionVal = splitDepositActionVal;
-        this.statusExtractVal = statusExtractVal;
-        this.gateway = gateway;
-        this.trdTime = tradingTimeService;
-        this.notification = notification;
-        this.kafkaSender = kafkaSender;
-        this.assets = assets;
-        this.gateway.setName("RgsService|DM*V");
         this.msgResolver = msgResolver;
-        this.reqHelp = reqHelp;
         this.rights = rights;
         rights.setRoleForVerification(UserRole.Admin);
     }
@@ -167,59 +117,6 @@ public class RegistryService {
             registryImdg.update(rgs);
             log.trace("TCR#id={} registry#id={} updated", tcr.getId(), rgs.getId());
         });
-
-        if (registries.stream().anyMatch(r -> RegistryInstrumentType.M.equalsByKey(r.getRegistryInstrumentType()))) {
-            log.info("assets size {} updated by TCR#id={}, will not create new assets",
-                    registries.size(), tcr.getId());
-            return;
-        } else if (tcr.getMoneyAccountId() == null) {
-            log.info("assets size {} updated by TCR#id={}, TCR#moneyAccountId 'null'. will not create AM**",
-                    registries.size(), tcr.getId());
-            return;
-        } else {
-            log.info("assets size {} updated by TCR#id={}, TCR#moneyAccountId {}. creating new AM**...",
-                    registries.size(), tcr.getId(), tcr.getMoneyAccountId());
-        }
-
-        Account acc = accImdg.getSingleObjectByID(tcr.getMoneyAccountId());
-        Currency currency = currImdg.getFirstObjectBySQL("currencyCode = '%s'".formatted(CurrencyCode.RUB.getKey()));
-        Company cmp = cmpImdg.getSingleObjectByID(tcr.getCompanyId());
-
-        if (acc == null) {
-            log.warn("TCR#id={} account {} not found", tcr.getId(), tcr.getMoneyAccountId());
-            return;
-        }
-        if (currency == null) {
-            log.warn("TCR#id={} currency {} not found", tcr.getId(), CurrencyCode.RUB.getKey());
-            return;
-        }
-        if (cmp == null) {
-            log.warn("TCR#id={} company {} not found", tcr.getId(), tcr.getCompanyId());
-            return;
-        }
-        log.debug("TCR#id={} account#id={} company#id={}, creating assets", tcr.getId(), acc.getId(), cmp.getId());
-
-        AssetTrio assets = this.assets.createMAssets(acc,
-                CurrencyCode.RUB.getKey(),
-                currency.getId(),
-                tcr.getTradingClearingRegistryType(),
-                tcr.getId(),
-                tcr.getCode(),
-                cmp);
-
-
-        Stream.of(assets.a__t(), assets.a__b(), assets.a__f())
-                .forEach(a -> {
-                    a.setRegistryStatus(RegistryStatus.PROC.getKey());
-                    registryImdg.insert(a);
-                });
-
-        log.debug("TCR#id={} created {}#id={} {}#id={} {}#id={}",
-                tcr.getId(),
-                assets.a__f().getRegistryCode(), assets.a__f().getId(),
-                assets.a__t().getRegistryCode(), assets.a__t().getId(),
-                assets.a__b().getRegistryCode(), assets.a__b().getId());
-
     }
 
     public RequestInfoUpdate returnDeposit(BaseRequest<RegistryReturnDepositRequest> req) {
@@ -232,144 +129,33 @@ public class RegistryService {
                     msgResolver.resolve(err.get()));
             return new RequestInfoUpdate(req.getId(), Status.Error, msgResolver.resolve(err.get()));
         }
-        Registry _m_t = validator.getStored(ValidationStored.ReturnDepositOm_t);
+        Registry tm_t = validator.getStored(Stored.PresentById);
-        if (_m_t == null) _m_t = validator.getStored(Stored.PresentById);
+        Registry dm_x = validator.getStored(ValidationStored.ReturnDepositDmx);
-
+        if (dm_x != null) {
-        Registry dm__ = validator.getStored(ValidationStored.ReturnDepositDm__);
+            dm_x.setSessionId(null);
-        if (dm__ != null) {
+            dm_x.setSessionType(null);
-            dm__.setSessionId(null);
+            dm_x.setBalance(requestPayload.getBalance());
-            dm__.setSessionType(null);
+            dm_x.setUpdated(Instant.now());
-            dm__.setBalance(safeBD(dm__.getBalance()).add(requestPayload.getBalance()));
+            registryImdg.update(dm_x);
-            dm__.setUpdated(Instant.now());
+            log.debug("updated dm*x.id={} by RegistryReturnDepositRequest.id={}",
-            registryImdg.update(dm__);
+                    dm_x.getId(),
-            log.debug("updated {}.id={} by RegistryReturnDepositRequest.id={}",
-                    dm__.getRegistryCode(),
-                    dm__.getId(),
                     req.getId());
         } else {
-            dm__ = _m_t.clone();
+            dm_x = tm_t.clone();
-            dm__.setRegistryDesignation(RegistryDesignation.D.getKey());
+            dm_x.setRegistryDesignation(RegistryDesignation.D.getKey());
-            RegistryManager.zeroState(dm__);
+            dm_x.setRegistryUnit(RegistryUnit.X.getKey());
-            dm__.setSettlementDate(LocalDate.now());
+            dm_x.setRegistryCode(RegistryUtil.clearingCode(dm_x));
-            dm__.setValueDate(null);
+            dm_x.setBalance(requestPayload.getBalance());
-            dm__.setRefundDate(null);
+            dm_x.setSessionId(null);
-            if (RegistryDesignation.T.equalsByKey(_m_t.getRegistryDesignation())) {
+            dm_x.setSessionType(null);
-                dm__.setRegistryUnit(RegistryUnit.X.getKey());
+            registryImdg.insert(dm_x);
-            } else {
+            log.debug("created dm*x.id={} by RegistryReturnDepositRequest.id={}",
-                dm__.setRegistryUnit(RegistryUnit.T.getKey());
+                    dm_x.getId(),
-            }
-            dm__.setRegistryCode(RegistryUtil.clearingCode(dm__));
-            dm__.setBalance(safeBD(dm__.getBalance()).add(requestPayload.getBalance()));
-            dm__.setSessionId(null);
-            dm__.setSessionType(null);
-            registryImdg.insert(dm__);
-            log.debug("created {}.id={} by RegistryReturnDepositRequest.id={}",
-                    dm__.getRegistryCode(),
-                    dm__.getId(),
                     req.getId());
         }
         return new RequestInfoUpdate(req.getId(), Status.Success, null);
     }
 
-    public RequestInfoUpdate changeStatusExtract(BaseRequest<RegistryChangeStatusExtractRequest> req) {
-        if (!rights.userHasRole(req.getUserId(), UserRole.Admin)) {
-            return reqHelp.error(req.getId(), ClearingError.UserVerifyDenial);
-        }
-        RegistryChangeStatusExtractRequest payload = req.getRequestPayload();
-        IValidator validator = statusExtractVal.apply(payload);
-        Optional<EnumMessage> err = validator.tillFirstError();
-        if (err.isPresent()) {
-            log.error("RegistryChangeStatusExtractRequest.id={} validation error: {}",
-                    req.getId(),
-                    msgResolver.resolve(err.get()));
-            return reqHelp.error(req.getId(), err.get());
-        }
-        Registry rgs = validator.getStored(Stored.PresentById);
-        if (trdTime.isTradingTime()) {
-            Long gtwReqId = kafkaSender.sendRequestToQueue(Consts.ASSET_OPERATION, gtwReq(rgs));
-            log.debug("send request to {} id={}", Consts.ASSET_OPERATION, gtwReqId);
-        } else {
-            log.debug("RegistryChangeStatusExtractRequest rgs.id={} not sending gateway request", rgs.getId());
-        }
-        rgs.setRegistryStatus(payload.getRegistryStatus());
-        log.debug("changing registry.id={} status to {}", rgs.getId(), payload.getRegistryStatus());
-        registryImdg.update(rgs);
-        assets.searchMoneyByAccAndCompany(rgs.getCompanyId(), rgs.getAccountId())
-                .ifPresentOrElse(
-                        astTrio -> assets.process(astTrio.a__b(),
-                                astTrio.a__t(),
-                                astTrio.a__f(),
-                                BigDecimal.ZERO),
-                        () -> log.error("RegistryChangeStatusExtractRequest rgs.id={} assets not found", rgs.getId()));
-        return reqHelp.success(req.getId());
-    }
-
-    private AssetOperationListRequest gtwReq(Registry rgs) {
-        AssetOperationRequest item = GatewayRequestCreator.from(rgs, InOutDirection.in);
-        AssetOperationListRequest gtwReq = new AssetOperationListRequest();
-        gtwReq.setAssetOperationRequests(Collections.singletonList(item));
-        return gtwReq;
-    }
-
-    public RequestInfoUpdate identificationFunds(BaseRequest<IdentificationFundsRequest> req) {
-        if (!rights.userHasRole(req.getUserId(), UserRole.Admin)) {
-            return reqHelp.error(req.getId(), ClearingError.UserVerifyDenial);
-        }
-        IdentificationFundsRequest payload = req.getRequestPayload();
-        IValidator validator = identificationFundsVal.apply(payload);
-        Optional<EnumMessage> err = validator.tillFirstError();
-        if (err.isPresent()) {
-            log.error("IdentificationFundsRequest.id={} validation error: {}",
-                    req.getId(),
-                    msgResolver.resolve(err.get()));
-            return reqHelp.error(req.getId(), err.get());
-        }
-        Registry dmau = validator.getStored(Stored.PresentById);
-        AnltSearcher.AnltSearch accCompTcr = validator.getStored(ValidationStored.IdentificationFundsTcrSearch);
-        AssetTrio asts = validator.getStored(ValidationStored.IdentificationFundsAssetTrio);
-        Account anltAcc = validator.getStored(Stored.AnltAccount);
-        BigDecimal dmauBalance = safeBD(dmau.getBalance());
-        BigDecimal dmauDebitBalance = safeBD(dmau.getDebit());
-        BigDecimal reqBalance = payload.getBalance();
-        BigDecimal am_tBalance = safeBD(asts.a__t().getBalance());
-        BigDecimal am_tCreditBalance = safeBD(asts.a__t().getCredit());
-
-        dmau.setBalance(dmauBalance.subtract(reqBalance));
-        dmau.setDebit(dmauDebitBalance.add(reqBalance));
-        asts.a__t().setBalance(am_tBalance.add(reqBalance));
-        asts.a__t().setCredit(am_tCreditBalance.add(reqBalance));
-        Instant now = Instant.now();
-        dmau.setUpdated(now);
-        asts.a__t().setUpdated(now);
-        //paymentInstruction
-        PaymentInstruction pmt = PaymentInstructionBuilderV2.builder(imdgProvider)
-                        .registry(asts.a__b())
-                        .sender(Sender.One.getId())
-                        .addressee(accCompTcr.getCompany().getId())
-                        .debitLegAccount(accCompTcr.getAccount())
-                        .creditLegAccount(anltAcc)
-                        .amount(payload.getBalance())
-                        .sessionId(null)
-                        .purpose("purpose")
-                        .build();
-        pmt.setTransactionStatus(TransactionStatus.ok.getKey());
-        pmtImdg.insert(pmt);
-        registryImdg.update(dmau);
-        registryImdg.update(asts.a__t());
-        assets.process(asts.a__b(), asts.a__t(), asts.a__f(), BigDecimal.ZERO);
-        log.debug("IdentificationFundsRequest.id={} dmau.id={} am*t.id={} payment_instruction.id={}",
-                req.getId(), dmau.getId(), asts.a__t().getId(), pmt.getId());
-        if (trdTime.isTradingTime()) {
-            log.trace("sending gateway request for IdentificationFundsRequest.id={} dmau.id={}",
-                    req.getId(), dmau.getId());
-            kafkaSender.sendRequestToQueue(Consts.ASSET_OPERATION,
-                    gatewayRequest(dmau, payload.getBalance(),
-                            accCompTcr.getCompany().getTradingCode(),
-                            asts.a__t().getTradingClearingRegistry()));
-        }
-        return reqHelp.success(req.getId());
-    }
-
     public RequestInfoUpdate changeRefundDate(BaseRequest<RegistryChangeRefundDateRequest> req) {
         RegistryChangeRefundDateRequest requestPayload = req.getRequestPayload();
         IValidator validator = refundDateVal.apply(requestPayload);
@@ -415,14 +201,8 @@ public class RegistryService {
         if (moneyPredicate.isEmpty() && depoPredicate.isEmpty()) {
             return Optional.empty();
         }
-        ImdgPredicate accIdPrdct;
-        if (moneyPredicate.isPresent() && depoPredicate.isPresent()) {
-            accIdPrdct = prdBldr.or(moneyPredicate.get(), depoPredicate.get());
-        } else {
-            accIdPrdct = prdBldr.and(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue()));
-        }
         return Optional.ofNullable(prdBldr.and(
-                accIdPrdct,
+                prdBldr.or(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue())),
                 prdBldr.equals("companyId", companyId),
                 prdBldr.sql("tradingClearingRegistryId == null")
         ));
@@ -447,70 +227,56 @@ public class RegistryService {
     }
 
 
-    public record RgsKey (Long companyId, Long accountId, Long securityId) {
-        public static RgsKey fromRgs(Registry rgs) {
-            return new RgsKey(rgs.getCompanyId(), rgs.getAccountId(), rgs.getSecurityId());
-        }
-    }
-
-    private Optional<Registry> find(List<Registry> group, RegistryTradingParams rgsCode) {
-        List<Registry> byCodeRes = group.stream()
-                .filter(rgs -> RegistryManager.equalsByCode(rgsCode, rgs))
-                .toList();
-
-        if (byCodeRes.size() > 1) {
-            Optional<Registry> any = group.stream().findFirst();
-            if (any.isEmpty()) throw new IllegalStateException(); //never
-            String err = "FATAL: found %d entries by code %s in group %s".formatted(
-                    byCodeRes.size(),
-                    rgsCode,
-                    RgsKey.fromRgs(any.get()).toString()
-            );
-            throw new IllegalStateException(err);
-        }
-        return byCodeRes.stream().findFirst();
-    }
-
     public void resetBalances() {
         Collection<Registry> registriesA = registryImdg.getCollectionObjectsByFieldValues(Map.of(
                 "registryDesignation", RegistryDesignation.A.getKey())
         );
 
-        Map<RgsKey, List<Registry>> allAssets = registriesA
+        for (Registry registry : registriesA) {
-                .stream()
+            if (RegistryUnit.B.equalsByKey(registry.getRegistryUnit())) {
-                .collect(Collectors.groupingBy(RgsKey::fromRgs));
+                registry.setBalance(BigDecimal.ZERO);
+            }
+            if (RegistryUnit.F.equalsByKey(registry.getRegistryUnit())) {
+                Optional<Registry> registryBOptional = registriesA.stream().filter(rgs ->
+                        rgs.getAccount() != null && rgs.getSecurityId() != null &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getCompanyId() != null &&
+                                RegistryUnit.B.equalsByKey(rgs.getRegistryUnit()) &&
+                                rgs.getSecurityId() != null && rgs.getSecurityId().equals(registry.getSecurityId()) &&
+                                rgs.getCompanyId() != null && rgs.getCompanyId().equals(registry.getCompanyId()) &&
+                                rgs.getAccount() != null && rgs.getAccount().equals(registry.getAccount()) &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getTradingClearingRegistryId().equals(registry.getTradingClearingRegistryId())
+                ).findFirst();
+                Optional<Registry> registryTOptional = registriesA.stream().filter(rgs ->
+                        rgs.getAccount() != null && rgs.getSecurityId() != null &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getCompanyId() != null &&
+                                RegistryUnit.T.equalsByKey(rgs.getRegistryUnit()) &&
+                                rgs.getSecurityId() != null && rgs.getSecurityId().equals(registry.getSecurityId()) &&
+                                rgs.getCompanyId() != null && rgs.getCompanyId().equals(registry.getCompanyId()) &&
+                                rgs.getAccount() != null && rgs.getAccount().equals(registry.getAccount()) &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getTradingClearingRegistryId().equals(registry.getTradingClearingRegistryId())
+                ).findFirst();
+                BigDecimal balanceB;
+                if (registryBOptional.isPresent()) {
+                    balanceB = registryBOptional.get().getBalance();
+                } else {
+                    balanceB = BigDecimal.ZERO;
+                }
+                registryTOptional.ifPresent(rgsT -> registry.setBalance(rgsT.getBalance().subtract(balanceB)));
+            }
+            if (RegistryUnit.T.equalsByKey(registry.getRegistryUnit())) {
+                registry.setOpenBalance(registry.getBalance());
+            }
 
-        Instant timestamp = Instant.now();
+            registry.setDebit(BigDecimal.ZERO);
-        for (Map.Entry<RgsKey, List<Registry>> entry : allAssets.entrySet()) {
+            registry.setSettledDebit(BigDecimal.ZERO);
-            RgsKey key = entry.getKey();
+            registry.setCredit(BigDecimal.ZERO);
-            List<Registry> group = entry.getValue();
+            registry.setSettledCredit(BigDecimal.ZERO);
-            Registry a__f = find(group, RegistryTradingParams.A__F).orElse(null);
+            registry.setPlanBalance(BigDecimal.ZERO);
-            Registry a__t = find(group, RegistryTradingParams.A__T).orElse(null);
+            registry.setCloseBalance(registry.getBalance());
-            Registry a__b = find(group, RegistryTradingParams.A__B).orElse(null);
+
-            if (a__t == null) {
+            registry.setUpdated(Instant.now());
-                log.warn("registry group {}: no A**T registry found.", key);
+            registryImdg.update(registry);
-                continue;
-            }
-            BigDecimal a__tBalance = safeBD(a__t.getBalance());
-            a__t.setOpenBalance(a__tBalance);
-            a__t.setCloseBalance(a__tBalance);
-            a__t.setCredit(BigDecimal.ZERO);
-            a__t.setDebit(BigDecimal.ZERO);
-            a__t.setSettledCredit(BigDecimal.ZERO);
-            a__t.setSettledDebit(BigDecimal.ZERO);
-            a__t.setUpdated(timestamp);
-            registryImdg.update(a__t);
-            if (a__f == null) {
-                a__f = assets.copy(a__t, RegistryUnit.F);
-                registryImdg.insert(a__f);
-            }
-            if (a__b != null) {
-                a__b.setBalance(BigDecimal.ZERO);
-                registryImdg.update(a__b);
-            }
-            assets.process(a__b, a__t, a__f, BigDecimal.ZERO);
         }
-
     }
 
 
@@ -521,7 +287,6 @@ public class RegistryService {
             return roleCheck;
         }
         Collection<Registry> baseRegistrys;
-        Integer index;
         {
             IValidator validator = splitDepositActionVal.apply(requestPayload);
             Optional<EnumMessage> err = validator.tillFirstError();
@@ -532,8 +297,6 @@ public class RegistryService {
                 return new RequestInfoUpdate(req.getId(), Status.Error, msgResolver.resolve(err.get()));
             }
             baseRegistrys = validator.getStored(ValidationStored.RegistrysByContract);
-            index = validator.getStored(ValidationStored.SplitDepositMaxNumber);
-            if (index == null) index = 0;
         }
 
         ImdgTransaction txCtx = imdgProvider.newTransaction();
@@ -550,13 +313,6 @@ public class RegistryService {
             log.debug("Process {} for {} registry", direction, baseRegistrys.size());
             Long groupId = null;
             for (Registry baseRegistry : baseRegistrys) {
-                String cntrctWithoutTilda;
-                {
-                    cntrctWithoutTilda = baseRegistry.getContract();
-                    if (cntrctWithoutTilda.contains("~")) {
-                        cntrctWithoutTilda = cntrctWithoutTilda.substring(0, cntrctWithoutTilda.indexOf("~"));
-                    }
-                }
                 log.trace("Registry[{}], groupId={}, ClearingCode={}", baseRegistry.getId(), baseRegistry.getGroupId(), baseRegistry.getClearingCode());
                 if (groupId == null)
                     groupId = baseRegistry.getGroupId();
@@ -575,9 +331,9 @@ public class RegistryService {
                 } else {
                     log.warn("Direction not set, do not change Balance");
                 }
-                firstRegistry.setContract(cntrctWithoutTilda + "~" + (index + 1));
+                firstRegistry.setContract(baseRegistry.getContract() + "~1");
-                firstRegistry.setParentId(baseRegistry.getId());
                 registryTMap.insert(firstRegistry);
+
                 // 2. Вторая группа
                 Registry secondRegistry = null;
                 if (InOutDirection.out == direction) {
@@ -586,10 +342,9 @@ public class RegistryService {
                     secondRegistry.setCreated(now);
                     secondRegistry.setUpdated(null);
                     secondRegistry.setBalance(requestPayload.getOutboundAmount());
-                    secondRegistry.setContract(cntrctWithoutTilda + "~" + (index + 2));
+                    secondRegistry.setContract(baseRegistry.getContract() + "~2");
                     secondRegistry.setRefundDate(requestPayload.getRefundDate());
                     secondRegistry.setSettlementDate(requestPayload.getRefundDate());
-                    secondRegistry.setParentId(baseRegistry.getId());
                     registryTMap.insert(secondRegistry);
                 }
 
@@ -617,16 +372,4 @@ public class RegistryService {
         return new RequestInfoUpdate(req.getId(), Status.Success, null);
     }
 
-    private AssetOperationListRequest gatewayRequest(Registry dmau, BigDecimal balance, String tradingCode, String tcrCode) {
-        AssetOperationListRequest gatewayRequest = new AssetOperationListRequest();
-        AssetOperationRequest req = GatewayRequestCreator.from(
-                dmau.getId(),
-                null,
-                balance,
-                InOutDirection.in,
-                tradingCode,
-                tcrCode);
-        gatewayRequest.setAssetOperationRequests(List.of(req));
-        return gatewayRequest;
-    }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Sdf54Creator.java

@@ -11,7 +11,10 @@ import ru.clearing.classes.statics.data.payment.PaymentInstruction;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.classes.statics.data.sdf.SDf54;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.CompanySymbol;
+import ru.spcex.platform.enumeration.Sender;
+import ru.spcex.platform.enumeration.Status;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -47,10 +50,24 @@ public class Sdf54Creator {
 
     public SDf54 create(PaymentInstruction paymentInstruction) {
         Instant now = Instant.now();
+        AccountType creditAccType = getAccountType(paymentInstruction.getCreditLeg_accountId());
+        AccountType debAccType = getAccountType(paymentInstruction.getDebitLeg_accountId());
+        String c_acc_deb = null;
         String c_acc_cred = null;
         Account anltAcc = accountImdg.getFirstObjectBySQL("accountType = '%s' and status = '%s'"
                 .formatted(AccountType.Anlt.getKey(), Status.Active.getKey()));
-//        c_acc_deb = c_acc_deb == null ? paymentInstruction.getCreditLeg_account() : c_acc_deb;
+        if (AccountType.Info.equals(creditAccType) ^ AccountType.Info.equals(debAccType)) {
+            if (anltAcc == null) {
+                throw new IllegalStateException("SDF54 creation error: paymentInstruction.creditLeg_accountId="
+                        + paymentInstruction.getCreditLeg_accountId() + " accountType 'Info' but no 'ANLT' account found");
+            }
+            if (AccountType.Info.equals(creditAccType)) {
+                c_acc_deb = anltAcc.getAccount();
+            } else {
+                c_acc_cred = anltAcc.getAccount();
+            }
+        }
+        c_acc_deb = c_acc_deb == null ? paymentInstruction.getCreditLeg_account() : c_acc_deb;
         c_acc_cred = c_acc_cred == null ? paymentInstruction.getDebitLeg_account() : c_acc_cred;
 
 
@@ -94,74 +111,42 @@ public class Sdf54Creator {
         if (anltAcc != null) {
             sDf54.setAcc_deb(anltAcc.getAccount());
         }
-        Account accDebAcc = accountImdg.getSingleObjectByID(paymentInstruction.getDebitLeg_accountId());
-        if (accDebAcc == null || !AccountStatus.ACTIVE.equalsByKey(accDebAcc.getStatus())) {
-            log.warn("paymentInstruction[{}].DebitLeg_accountId={} account not exist or not active.", paymentInstruction.getId(), paymentInstruction.getDebitLeg_accountId());
-        }
         BankAccount bnkAcc = bankAccountImdg.getFirstObjectBySQL("accountId = %d".formatted(paymentInstruction.getDebitLeg_accountId()));
         if (bnkAcc != null) {
             sDf54.setInn_cred(bnkAcc.getTaxpayerIdentificationNumber());
             sDf54.setKpp_cred(bnkAcc.getTaxRegistrationReasonCode());
-            c_acc_cred = bnkAcc.getCorrespondentAccount();
-        } else {
-            log.warn("Bank account not found for DebitLeg_accountId={}", paymentInstruction.getDebitLeg_accountId());
         }
         sDf54.setAcc_kr_1(paymentInstruction.getDebitLeg_account());
-
-        {
-            Account prcCorrAcc = accountImdg.getFirstObjectBySQL("companyId=%d and accountType = '%s' and status = '%s'"
-                    .formatted(Sender.Prc.getId(), AccountType.Corr.getKey(), Status.Active.getKey()));
-            if (prcCorrAcc == null) {
-                log.warn("Account for PRC CORR not found");
-            } else {
-                sDf54.setC_acc_deb(prcCorrAcc.getAccount());
-            }
-        }
         //**********************
 
-        sDf54.setSend_type("срочно");
+
         sDf54.setDoc_type("002");
         sDf54.setDocnm_ref(docnmRefFormatter.format(TimeUtil.toDateTime(now)));
+        sDf54.setC_acc_deb(c_acc_deb);
+
 
-//        Account rBnkAccount = accountImdg.getFirstObjectBySQL("companyId=%s and accountType = '%s' and status = '%s'"
-//                .formatted(paymentInstruction.getAddresseeId(), AccountType.Bank.getKey(), Status.Active.getKey()));
-//        BankAccount rBnkAcc = rBnkAccount == null ? null : bankAccountImdg.getFirstObjectBySQL("accountId = %d".formatted(rBnkAccount.getId()));
-        if (bnkAcc != null) {
-            sDf54.setRbankcode(bnkAcc.getBankIdentificationCode());
-            SpecifUtil.fillSegmentsBy35Symbols(bnkAcc.getCorrespondentAccountName(),
-                    sDf54::setRbanknam1,
-                    sDf54::setRbanknam2,
-                    sDf54::setRbanknam3,
-                    sDf54::setRbanknam4,
-                    sDf54::setRbanknam5);
-        }
 
         sDf54.setC_acc_cred(c_acc_cred);
 
-        {
+        String addresseeSbankName = "";
-            Company company1 = companyImdg.getSingleObjectByID(Sender.One.getId());
+        if (paymentInstruction.getAddresseeId().equals(1L)) {
-            if (company1 != null) { // "АО СПВБ" company.shortName[id = 1]
+            addresseeSbankName = paymentInstruction.getAddresseeBankName();
-                SpecifUtil.fillSegmentsBy35Symbols(company1.getShortName(),
+        } else {
-                        sDf54::setSclientn1,
+            Company company = companyImdg.getSingleObjectByID(paymentInstruction.getAddresseeId());
-                        sDf54::setSclientn2,
+            if (company != null) {
-                        sDf54::setSclientn3,
+                addresseeSbankName = company.getShortName();
-                        sDf54::setSclientn4);
-            } else {
-                log.warn("Company id=1 not exist");
-            }
-        }
-        {
-            if (bnkAcc != null) {
-                SpecifUtil.fillSegmentsBy35Symbols(bnkAcc.getBankName(),
-                        sDf54::setRclientn1,
-                        sDf54::setRclientn2,
-                        sDf54::setRclientn3,
-                        sDf54::setRclientn4);
             }
         }
 
+        SpecifUtil.fillSegmentsBy35Symbols(addresseeSbankName,
+                sDf54::setRbanknam1,
+                sDf54::setRbanknam2,
+                sDf54::setRbanknam3,
+                sDf54::setRbanknam4,
+                sDf54::setRbanknam5);
+
         sDf54.setPay_date(payDateFormatter.format(TimeUtil.toLocalDate(paymentInstruction.getPaymentDate())));
-        sDf54.setPay_val(CurrencyCode.RUB.getKey());
+        sDf54.setPay_val("RUR");
         String sumDeb = paymentInstruction.getDebitLeg_amount() != null ? paymentInstruction.getDebitLeg_amount().toString() : "";
         sDf54.setSum_deb(BigDecimalUtil.limitDecimalPlaces(sumDeb, 2));
         sDf54.setSpecif_1(paymentInstruction.getPaymentPurpose());