DM_X search: statuses PROC/MNG

optional max-poll-interval-ms setting

clearing-parent/account-service/pom.xml

@@ -32,6 +32,14 @@
             <groupId>ru.spcex.clearing</groupId>
             <artifactId>classes</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>security-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>clearing-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -41,6 +49,11 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <!-- TEST -->
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>test-clearing</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -65,14 +78,6 @@
             <artifactId>spring-boot-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ru.spcex.clearing</groupId>
-            <artifactId>security-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ru.spcex.clearing</groupId>
-            <artifactId>clearing-validation</artifactId>
-        </dependency>
 
     </dependencies>
 

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

@@ -7,10 +7,13 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
 import ru.spcex.clearing.account.config.settings.AccountServiceSettings;
 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.KafkaProducerSettings;
 import ru.spcex.clearing.platform.messaging.service.RequestInfo;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.platform.imdg.api.Imdg;
@@ -33,13 +36,24 @@ public class KafkaConfig {
         return KafkaProducerFactory.producer(settings.getKafkaProducer());
     }
 
+    @Bean
+    public ProducerFactory<String, Object> pf(AccountServiceSettings settings) {
+        KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
+        return KafkaProducerFactory.producerFactory(kafkaSettings);
+    }
+
+    @Bean
+    public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) {
+        return new KafkaTemplate<>(pf);
+    }
+
    @Autowired
     @Bean
-    public KafkaSender kafkaSender(Producer<String, Object> kafkaProducer, ImdgProvider imdgProvider) {
+    public KafkaSender kafkaSender(KafkaTemplate<String, Object> kafkaTemplate, ImdgProvider imdgProvider) {
         ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
         return KafkaSender
                 .setup()
-                .producer(kafkaProducer)
+                .setKafkaTemplate(kafkaTemplate)
                 .idGenerator(imdgIdGenerator::nextId)
                 .imdgProvider(s -> {
                     Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);

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

@@ -0,0 +1,101 @@
+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

@@ -12,18 +12,18 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAcco
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountUpdateRequest;
 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.FieldRequiredRule;
 import ru.spcex.clearing.validation.common.rules.IdPresentRule;
+import ru.spcex.clearing.validation.common.rules.specific.FieldRequiredSpecificRule;
+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.enumeration.WorkflowStatus;
 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.IErrorEnumId;
+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;
 
@@ -54,12 +54,19 @@ public class AccountValidationConfig {
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.CompanyNotFound,
-                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
-                    FieldRequiredRule.instance("account",
+                            AccountError.CompanyNotFound
+//                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive
+                    ),
+                    FieldRequiredSpecificRule.instance("account",
                             CorrespondentAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty,
+                            AccountError.AccountFieldNotSet,
+                            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
                                 );
@@ -69,29 +76,37 @@ public class AccountValidationConfig {
                                 ImdgPredicate finalPredicate = pb.and(accountValuePredicate, accountStatusPredicate);
                                 Collection<Account> accounts = accountImdg.getCollectionObjectsByPredicate(finalPredicate);
                                 if (accounts.isEmpty()) return null;
-                                return AccountError.AccountAlreadyExist;
+                                return new EnumMessage(AccountError.AccountAlreadyExist, accounts.stream().findFirst().get().getAccount());
                             }),
                     DictionaryPresentRule.instance("status",
                             CorrespondentAccountNewRequest::getStatus,
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
-                            false,
-                            statusValue -> {
-                                if (ServiceStatus.Active.equalsByKey(statusValue.getCode())) return null;
-                                return AccountError.WrongFieldValue;
-                            }),
+                            AccountError.DictionaryNotFound,
+                            false
+//                           , statusValue -> {
+//                                if (ServiceStatus.Active.equalsByKey(statusValue.getCode())) return null;
+//                                return AccountError.WrongFieldValue;
+//                            }
+                    ),
                     DictionaryPresentRule.instance("accountType",
                             CorrespondentAccountNewRequest::getAccountType,
                             IMDGDistributedNames.Map_AccountTypeDictionary,
                             AccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
+                            AccountError.DictionaryNotFound,
                             accountType -> {
-                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
+                                if (IEnumKey.contains(accountType.getCode(), AccountType.Corr, AccountType.Info)) 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)
             );
         };
     }
@@ -106,6 +121,7 @@ public class AccountValidationConfig {
             Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_Account);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             addImdg.accept(IMDGDistributedNames.Map_AccountTypeDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("id",
@@ -113,13 +129,7 @@ public class AccountValidationConfig {
                             IMDGDistributedNames.Map_Account,
                             Account.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.AccountNotFound,
-                            account -> {
-                                String statusFromRequest = correspondentAccountUpdateRequest.getStatus();
-                                if (statusFromRequest != null && !statusFromRequest.equalsIgnoreCase(account.getStatus()))
-                                    return AccountError.WrongFieldValue;
-                                return null;
-                            }),
+                            AccountError.AccountNotFound),
                     IdPresentRule.instance("companyId",
                             CorrespondentAccountUpdateRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
@@ -128,26 +138,29 @@ public class AccountValidationConfig {
                             AccountError.CompanyNotFound,
                             false,
                             company -> {
-                                IErrorEnumId error = WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive;
-                                error = Objects.equals(company.getId(), correspondentAccountUpdateRequest.getCompanyId()) ? error : AccountError.WrongFieldValue;
-                                return error;
+                                if (Objects.equals(company.getId(), correspondentAccountUpdateRequest.getCompanyId()))
+                                    return null;
+                                return AccountError.WrongFieldValue;
                             }),
                     DictionaryPresentRule.instance("status",
                             CorrespondentAccountUpdateRequest::getStatus,
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue),
+                            AccountError.DictionaryNotFound,
+                            false),
                     DictionaryPresentRule.instance("accountType",
                             CorrespondentAccountUpdateRequest::getAccountType,
                             IMDGDistributedNames.Map_AccountTypeDictionary,
-                            ServiceStatusDictionary.class,
+                            AccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
-                            accountType -> {
-                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
-                                return AccountError.WrongFieldValue;
-                            })
+                            AccountError.DictionaryNotFound,
+                            false
+//                            accountType -> {
+//                                if (AccountType.Corr.equalsByKey(accountType.getCode())) return null;
+//                                return AccountError.WrongFieldValue;
+//                            }
+                    )
             );
         };
     }
@@ -162,15 +175,16 @@ public class AccountValidationConfig {
             Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
             addImdg.accept(IMDGDistributedNames.Map_Account);
             return new ValidatorImpl<>(context,
-                    IdPresentRule.instance("id",
+                    IdPresentSpecificRule.instance("id",
                             CommonIdRequest::getId,
                             IMDGDistributedNames.Map_Account,
                             Account.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.AccountNotFound,
                             account -> {
-                                if (WorkflowStatus.Active.equalsByKey(account.getStatus())) return null;
-                                return AccountError.AccountNotActive;
+                                if (AccountStatus.BLOCKED.equalsByKey(account.getStatus()))
+                                    return new EnumMessage(AccountError.AccountNotActive, account.getAccount());
+                                return null;
                             })
             );
         };

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

@@ -6,23 +6,24 @@ import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.account.BankAccount;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.platform.dictionary.CurrencyCodeDictionary;
+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.BankAccountNewRequest;
 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;
+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.enumeration.WorkflowStatus;
 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;
 
@@ -45,6 +46,7 @@ public class BankAccountValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Account);
             addImdg.accept(IMDGDistributedNames.Map_BankAccount);
             addImdg.accept(IMDGDistributedNames.Map_Company);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             addImdg.accept(IMDGDistributedNames.Map_CurrencyCodeDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("companyId",
@@ -53,40 +55,31 @@ public class BankAccountValidationConfig {
                             Company.class,
                             AccountError.RequiredFieldEmpty,
                             AccountError.CompanyNotFound,
-                            company -> WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? null : AccountError.CompanyNotActive),
-                    FieldRequiredRule.instance("account",
+                            false),
+                    FieldNotBlankRequiredRule.instance("account",
                             BankAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty,
-                            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.Bank.getKey());
-                                ImdgPredicate finalPredicate = pb.and(accountValuePredicate,
-                                        accountStatusPredicate,
-                                        accountTypePredicate);
-                                Collection<Account> accounts = accountImdg.getCollectionObjectsByPredicate(finalPredicate);
-                                if (accounts.isEmpty()) return null;
-                                return AccountError.AccountAlreadyExist;
-                            }),
+                            AccountError.RequiredFieldEmpty
+                    ),
+                    new SameAccountValidationRule<>(AccountType.Bank, BankAccountNewRequest::getAccount),
                     DictionaryPresentRule.instance("currency",
                             BankAccountNewRequest::getCurrency,
                             IMDGDistributedNames.Map_CurrencyCodeDictionary,
                             CurrencyCodeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue),
+                            AccountError.DictionaryNotFound),
                     FieldRequiredRule.instance("bankIdentificationCode",
                             BankAccountNewRequest::getBankIdentificationCode,
                             AccountError.RequiredFieldEmpty),
                     FieldRequiredRule.instance("bankName",
                             BankAccountNewRequest::getBankName,
                             AccountError.RequiredFieldEmpty),
-                    FieldRequiredRule.instance("destination",
-                            BankAccountNewRequest::getDestination,
-                            AccountError.RequiredFieldEmpty)
+                    DictionaryPresentRule.instance("status",
+                            BankAccountNewRequest::getStatus,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary,
+                            ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.DictionaryNotFound,
+                            false)
             );
         };
     }
@@ -117,7 +110,7 @@ public class BankAccountValidationConfig {
                                 );
                                 Account account = accountImdg.getSingleObjectByID(accountId);
                                 if (account == null) return AccountError.AccountNotFound;
-                                if (!AccountStatus.ACTIVE.equalsByKey(account.getStatus())) return AccountError.AccountNotActive;
+//                                if (!AccountStatus.ACTIVE.equalsByKey(account.getStatus())) return AccountError.AccountNotActive;
                                 return null;
                             }),
                     DictionaryPresentRule.instance("currency",
@@ -125,7 +118,7 @@ public class BankAccountValidationConfig {
                             IMDGDistributedNames.Map_CurrencyCodeDictionary,
                             CurrencyCodeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
+                            AccountError.DictionaryNotFound,
                             false)
             );
         };
@@ -142,7 +135,7 @@ public class BankAccountValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_BankAccount);
             addImdg.accept(IMDGDistributedNames.Map_Account);
             return new ValidatorImpl<>(context,
-                    IdPresentRule.instance("id",
+                    IdPresentSpecificRule.instance("id",
                             CommonIdRequest::getId,
                             IMDGDistributedNames.Map_BankAccount,
                             BankAccount.class,
@@ -154,8 +147,10 @@ public class BankAccountValidationConfig {
                                         IMDGDistributedNames.Map_Account, Account.class
                                 );
                                 Account account = accountImdg.getSingleObjectByID(accountId);
-                                if (account == null) return AccountError.AccountNotFound;
-                                if (!AccountStatus.ACTIVE.equalsByKey(account.getStatus())) return AccountError.AccountNotActive;
+                                if (account == null)
+                                    return new EnumMessage(AccountError.AccountNotFound, accountId);
+                                if (AccountStatus.BLOCKED.equalsByKey(account.getStatus()))
+                                    return new EnumMessage(AccountError.AccountNotActive, account.getAccount());
                                 return null;
                             })
             );

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

@@ -5,17 +5,19 @@ import org.springframework.context.annotation.Configuration;
 import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.platform.dictionary.ClearingAccountTypeDictionary;
+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.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;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.enumeration.AccountType;
 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.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@@ -43,38 +45,33 @@ public class ClearingAccountValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_ClearingAccount);
             addImdg.accept(IMDGDistributedNames.Map_ClearingAccountTypeDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("companyId",
                             ClearingAccountNewRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.CompanyNotFound,
-                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null),
-                    FieldRequiredRule.instance("account",
+                            AccountError.CompanyNotFound
+//                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null
+                    ),
+                    FieldNotBlankRequiredRule.instance("account",
                             ClearingAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty,
-                            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 AccountError.AccountAlreadyExist;
-                            }),
+                            AccountError.RequiredFieldEmpty),
+                    new SameAccountValidationRule<>(AccountType.Clrn, ClearingAccountNewRequest::getAccount),
                     DictionaryPresentRule.instance("clearingAccountType",
                             ClearingAccountNewRequest::getClearingAccountType,
                             IMDGDistributedNames.Map_ClearingAccountTypeDictionary,
                             ClearingAccountTypeDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue)
+                            AccountError.DictionaryNotFound),
+                    DictionaryPresentRule.instance("status",
+                            ClearingAccountNewRequest::getStatus,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary,
+                            ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.DictionaryNotFound,
+                            false)
             );
         };
     }
@@ -97,6 +94,8 @@ public class ClearingAccountValidationConfig {
                             ClearingAccountUpdateRequest::getAccount,
                             AccountError.RequiredFieldEmpty,
                             accountValue -> {
+                                if (accountValue.isBlank())
+                                    return AccountError.RequiredFieldEmpty;
                                 Imdg<Account> accountImdg = context.obtainMap(
                                         IMDGDistributedNames.Map_Account, Account.class
                                 );
@@ -125,7 +124,7 @@ public class ClearingAccountValidationConfig {
                                 Imdg<Company> companyImdg = context.obtainMap(
                                         IMDGDistributedNames.Map_Company, Company.class
                                 );
-                                Company company = companyImdg.getSingleObjectByFieldValues(Map.of("tradingCode", dealValue));
+                                Company company = companyImdg.getFirstObjectByFieldValues(Map.of("tradingCode", dealValue));
                                 if (company == null) return AccountError.WrongFieldValue;
                                 return null;
                             })

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

@@ -1,13 +1,12 @@
-package ru.spcex.clearing.company.config.validation;
+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.ClientCode;
 import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
-import ru.clearing.platform.dictionary.WorkflowStatusDictionary;
-import ru.spcex.clearing.company.error.CompanyErrors;
+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.ClientCodeNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeUpdateRequest;
@@ -38,44 +37,44 @@ public class ClientCodeValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_Account);
             addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry);
-            addImdg.accept(IMDGDistributedNames.Map_WorkflowStatusDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<>(context,
-                    FieldRequiredRule.instance("companyId", ClientCodeNewRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
+                    FieldRequiredRule.instance("companyId", ClientCodeNewRequest::getCompanyId, AccountError.RequiredFieldEmpty),
                     IdPresentRule.instance("companyId",
                             ClientCodeNewRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.CompanyNotFound),
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.CompanyNotFound),
 
                     IdPresentRule.instance("moneyAccountId",
                             ClientCodeNewRequest::getMoneyAccountId,
                             IMDGDistributedNames.Map_Account,
                             Account.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.AccountNotFound,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.AccountNotFound,
                             false,
                             acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId())
-                                    ? null : CompanyErrors.AccountNotFound
+                                    ? null : AccountError.AccountNotFound
                             ),
                     IdPresentRule.instance("depoAccountId",
                             ClientCodeNewRequest::getDepoAccountId,
                             IMDGDistributedNames.Map_Account,
                             Account.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.AccountNotFound,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.AccountNotFound,
                             false,
                             acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId())
-                                    ? null : CompanyErrors.AccountNotFound
+                                    ? null : AccountError.AccountNotFound
                     ),
 
 
                     DictionaryPresentRule.instance("stauts",
                             ClientCodeNewRequest::getStatus,
-                            IMDGDistributedNames.Map_WorkflowStatusDictionary,
-                            WorkflowStatusDictionary.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.DictionaryNotFound,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary,
+                            ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.DictionaryNotFound,
                             false)
             );
         };
@@ -91,51 +90,51 @@ public class ClientCodeValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_Account);
             addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry);
-            addImdg.accept(IMDGDistributedNames.Map_WorkflowStatusDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<ImdgValidationContext<ClientCodeUpdateRequest>>(context,
                     IdPresentRule.instance("id",
                             ClientCodeUpdateRequest::getId,
                             IMDGDistributedNames.Map_ClientCode,
                             ClientCode.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.RecordNotFound
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.RecordNotFound
                     ),
 
-                    FieldRequiredRule.instance("companyId", ClientCodeUpdateRequest::getCompanyId, CompanyErrors.RequiredFieldEmpty),
+                    FieldRequiredRule.instance("companyId", ClientCodeUpdateRequest::getCompanyId, AccountError.RequiredFieldEmpty),
                     IdPresentRule.instance("companyId",
                             ClientCodeUpdateRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.CompanyNotFound),
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.CompanyNotFound),
 
                     IdPresentRule.instance("moneyAccountId",
                             ClientCodeUpdateRequest::getMoneyAccountId,
                             IMDGDistributedNames.Map_Account,
                             Account.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.AccountNotFound,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.AccountNotFound,
                             false,
                             acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId())
-                                    ? null : CompanyErrors.AccountNotFound
+                                    ? null : AccountError.AccountNotFound
                     ),
                     IdPresentRule.instance("depoAccountId",
                             ClientCodeUpdateRequest::getDepoAccountId,
                             IMDGDistributedNames.Map_Account,
                             Account.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.AccountNotFound,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.AccountNotFound,
                             false,
                             acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId())
-                                    ? null : CompanyErrors.AccountNotFound
+                                    ? null : AccountError.AccountNotFound
                     ),
 
                     DictionaryPresentRule.instance("stauts",
                             ClientCodeUpdateRequest::getStatus,
-                            IMDGDistributedNames.Map_WorkflowStatusDictionary,
-                            WorkflowStatusDictionary.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.DictionaryNotFound,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary,
+                            ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.DictionaryNotFound,
                             false)
             );
         };
@@ -154,8 +153,8 @@ public class ClientCodeValidationConfig {
                             CommonDeleteRequest::getId,
                             IMDGDistributedNames.Map_ClientCode,
                             ClientCode.class,
-                            CompanyErrors.RequiredFieldEmpty,
-                            CompanyErrors.RecordNotFound)
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.RecordNotFound)
             );
         };
     }

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

@@ -4,18 +4,18 @@ 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.company.Company;
+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.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.enumeration.WorkflowStatus;
 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.validation.IValidator;
 import ru.spcex.platform.utils.validation.ValidatorImpl;
@@ -39,35 +39,30 @@ public class DepoAccountValidationConfig {
             addImdg.accept(IMDGDistributedNames.Map_Company);
             addImdg.accept(IMDGDistributedNames.Map_Account);
             addImdg.accept(IMDGDistributedNames.Map_DepoAccount);
+            addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
             return new ValidatorImpl<>(context,
                     IdPresentRule.instance("companyId",
                             DepoAccountNewRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.CompanyNotFound,
-                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null),
-                    FieldRequiredRule.instance("account",
+                            AccountError.CompanyNotFound
+//                            company -> !WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()) ? AccountError.CompanyNotActive : null
+                    ),
+                    FieldNotBlankRequiredRule.instance("account",
                             DepoAccountNewRequest::getAccount,
-                            AccountError.RequiredFieldEmpty,
-                            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 AccountError.AccountAlreadyExist;
-                            }),
+                            AccountError.RequiredFieldEmpty),
+                    new SameAccountValidationRule<>(AccountType.Depo, DepoAccountNewRequest::getAccount),
                     FieldRequiredRule.instance("depoAccountType",
                             DepoAccountNewRequest::getDepoAccountType,
-                            AccountError.RequiredFieldEmpty)
+                            AccountError.RequiredFieldEmpty),
+                    DictionaryPresentRule.instance("status",
+                            DepoAccountNewRequest::getStatus,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary,
+                            ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty,
+                            AccountError.DictionaryNotFound,
+                            false)
             );
         };
     }

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

@@ -2,20 +2,23 @@ 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;
@@ -33,6 +36,9 @@ 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,
@@ -43,16 +49,17 @@ public class InformationAccountValidationConfig {
                             company -> {
                                 if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus()))
                                     return AccountError.CompanyNotActive;
-                                Long companyId = company.getId();
-                                Imdg<InformationAccount> informationAccountImdg = context.obtainMap(
-                                        IMDGDistributedNames.Map_InformationAccount, InformationAccount.class
-                                );
-                                Collection<InformationAccount> infoAccounts = informationAccountImdg.getCollectionObjectsByFieldValues(
-                                        Map.of("companyId", companyId)
-                                );
-                                if (infoAccounts.isEmpty()) return null;
-                                return AccountError.InfoAccountAlreadyExist;
-                            })
+                                return null;
+                            }),
+                    FieldNotBlankRequiredRule.instance("account", InformationAccountNewRequest::getAccount,
+                            AccountError.RequiredFieldEmpty),
+                    DictionaryPresentRule.instance("status", InformationAccountNewRequest::getStatus,
+                            IMDGDistributedNames.Map_ServiceStatusDictionary, ServiceStatusDictionary.class,
+                            AccountError.RequiredFieldEmpty, AccountError.DictionaryNotFound, false),
+                    DictionaryPresentRule.instance("accountType", InformationAccountNewRequest::getAccountType,
+                            IMDGDistributedNames.Map_AccountTypeDictionary, AccountTypeDictionary.class,
+                            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

@@ -0,0 +1,46 @@
+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

@@ -2,10 +2,10 @@ 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.ClearingAccount;
+import ru.clearing.classes.statics.data.account.Account;
 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.errors.AccountError;
@@ -16,14 +16,22 @@ import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingR
 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.specific.IdPresentSpecificRule;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.enumeration.ServiceStatus;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.CompanySymbol;
 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.Collection;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -39,32 +47,63 @@ public class TradingClearingRegistryValidationConfig {
             context.setValidatedObject(tradingClearingRegistryNewRequest);
             Consumer<String> addImdg = (s) -> context.addImdg(s, imdgForValidation.get(s));
             addImdg.accept(IMDGDistributedNames.Map_Company);
+            addImdg.accept(IMDGDistributedNames.Map_CompanySymbols);
+            addImdg.accept(IMDGDistributedNames.Map_Account);
             addImdg.accept(IMDGDistributedNames.Map_ClearingAccount);
             addImdg.accept(IMDGDistributedNames.Map_DepoAccount);
             addImdg.accept(IMDGDistributedNames.Map_InformationAccount);
             addImdg.accept(IMDGDistributedNames.Map_ServiceStatusDictionary);
+            addImdg.accept(IMDGDistributedNames.Map_TradingClearingRegistry);
             return new ValidatorImpl<>(context,
-                    IdPresentRule.instance("companyId",
+                    IdPresentSpecificRule.instance("companyId",
                             TradingClearingRegistryNewRequest::getCompanyId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.CompanyNotFound),
+                            AccountError.CompanyNotFound,
+                            true,
+                            company -> {
+                                Imdg<CompanySymbols> companySymbolsImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
+                                CompanySymbols symbol = companySymbolsImdg.getFirstObjectByFieldValues(Map.of(
+                                        "companyId", company.getId(),
+                                        "companySymbol", CompanySymbol.CLRC.getKey()
+                                ));
+                                if (symbol == null)
+                                    return new EnumMessage(AccountError.ClearingCompanySymbolNotFound, company.getShortName());
+                                return null;
+                            }),
                     FieldRequiredRule.instance("moneyAccountId",
                             TradingClearingRegistryNewRequest::getMoneyAccountId,
                             AccountError.RequiredFieldEmpty,
                             moneyAccountId -> {
-                                Imdg<ClearingAccount> clearingAccountImdg = context.obtainMap(
-                                        IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class
+                                Imdg<Account> accountImdg = context.obtainMap(
+                                        IMDGDistributedNames.Map_Account, Account.class
                                 );
-                                ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(moneyAccountId);
-                                if (clearingAccount == null) {
-                                    Imdg<InformationAccount> informationAccountImdg = context.obtainMap(
-                                            IMDGDistributedNames.Map_InformationAccount, InformationAccount.class
-                                    );
-                                    InformationAccount infoAccount = informationAccountImdg.getSingleObjectByID(moneyAccountId);
-                                    if (infoAccount == null) return AccountError.AccountNotFound;
+                                Account account = accountImdg.getSingleObjectByID(moneyAccountId);
+                                if (account == null) {
+                                    return AccountError.AccountNotFound;
+                                } else {
+                                    if (AccountType.Clrn.equalsByKey(account.getAccountType()) || AccountType.Info.equalsByKey(account.getAccountType())) {
+                                        // ok
+                                    } else {
+                                        // неправильный тип
+                                        return AccountError.AccountNotFound;
                                     }
+                                }
+//                                Imdg<ClearingAccount> clearingAccountImdg = context.obtainMap(
+//                                        IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class
+//                                );
+//                                ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByFieldValues(
+//                                        Map.of("accountId",moneyAccountId)
+//                                );
+//                                if (clearingAccount == null) {
+//                                    Imdg<InformationAccount> informationAccountImdg = context.obtainMap(
+//                                            IMDGDistributedNames.Map_InformationAccount, InformationAccount.class
+//                                    );
+//                                    InformationAccount infoAccount = informationAccountImdg.getSingleObjectByFieldValues(
+//                                            Map.of("accountId",moneyAccountId));
+//                                    if (infoAccount == null) return AccountError.AccountNotFound;
+//                                }
                                 return null;
                             }),
                     FieldRequiredRule.instance("depoAccountId",
@@ -74,7 +113,9 @@ public class TradingClearingRegistryValidationConfig {
                             depoAccountId -> {
                                 if (depoAccountId == null) return null;
                                 Imdg<DepoAccount> depoAccountImdg = context.obtainMap(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
-                                DepoAccount depoAccount = depoAccountImdg.getSingleObjectByID(depoAccountId);
+                                DepoAccount depoAccount = depoAccountImdg.getFirstObjectByFieldValues(
+                                        Map.of("accountId", depoAccountId)
+                                );
                                 if (depoAccount == null) return AccountError.AccountNotFound;
                                 return null;
                             }),
@@ -83,17 +124,49 @@ public class TradingClearingRegistryValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
-                            false,
-                            statusValue -> {
-                                String statusCode = statusValue.getCode();
-                                if (ServiceStatus.Active.equalsByKey(statusCode)) return null;
-                                return AccountError.WrongFieldValue;
-                            })
+                            AccountError.DictionaryNotFound,
+                            false),
+                    new newTCRDuplicateCheck()
             );
         };
     }
 
+    static class newTCRDuplicateCheck implements IValidationRule<ImdgValidationContext<TradingClearingRegistryNewRequest>> {
+        @Override
+        public Optional<EnumMessage> validate(ImdgValidationContext<TradingClearingRegistryNewRequest> context) {
+            TradingClearingRegistryNewRequest validatedObject = context.getValidatedObject();
+            Imdg<TradingClearingRegistry> tcrMap = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
+
+            if (validatedObject.getMoneyAccountId() == null) {
+                return of(AccountError.RequiredFieldEmpty, "MoneyAccountId");
+            }
+            //Map<String, Comparable<?>> query = new HashMap<>();
+//            query.put("moneyAccountId", validatedObject.getMoneyAccountId());
+//            if (validatedObject.getDepoAccountId() != null) {
+//                query.put("depoAccountId", validatedObject.getDepoAccountId());
+//            }
+            ImdgPredicateBuilder pb = tcrMap.predicateBuilder();
+            ImdgPredicate query = pb.equals("moneyAccountId", validatedObject.getMoneyAccountId());
+            if (validatedObject.getDepoAccountId() != null) {
+                query = pb.or(query, pb.equals("depoAccountId", validatedObject.getDepoAccountId()));
+            }
+
+            Collection<TradingClearingRegistry> existTCR = tcrMap.getCollectionObjectsByPredicate(query);
+
+            if (existTCR.isEmpty()) {
+                return empty();
+            } else {
+                Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
+                Account account = accountImdg.getSingleObjectByID(validatedObject.getMoneyAccountId());
+                if (account == null && validatedObject.getDepoAccountId() != null) account = accountImdg.getSingleObjectByID(validatedObject.getDepoAccountId());
+                return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getAccount());
+//                String tcrIds = existTCR.stream().map(tcr -> String.valueOf(tcr.getId())).collect(Collectors.joining(";"));
+//                return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, tcrIds);
+            }
+        }
+    }
+
+
     @Bean("tradingClearingRegistryUpdateRequest")
     public Function<TradingClearingRegistryUpdateRequest, IValidator> tradingClearingRegistryUpdateRequestValidator(
             Map<String, Imdg<? extends SpcexObjectBase>> imdgForValidation
@@ -116,7 +189,7 @@ public class TradingClearingRegistryValidationConfig {
                             IMDGDistributedNames.Map_ServiceStatusDictionary,
                             ServiceStatusDictionary.class,
                             AccountError.RequiredFieldEmpty,
-                            AccountError.WrongFieldValue,
+                            AccountError.DictionaryNotFound,
                             false)
             );
         };

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

@@ -6,11 +6,9 @@ import org.springframework.context.annotation.Configuration;
 import ru.clearing.classes.statics.data.account.*;
 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.registry.TradingClearingRegistry;
-import ru.clearing.platform.dictionary.AccountTypeDictionary;
-import ru.clearing.platform.dictionary.ClearingAccountTypeDictionary;
-import ru.clearing.platform.dictionary.CurrencyCodeDictionary;
-import ru.clearing.platform.dictionary.ServiceStatusDictionary;
+import ru.clearing.platform.dictionary.*;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
@@ -31,6 +29,7 @@ public class ValidationConfig {
         BiConsumer<String, Class<? extends SpcexObjectBase>> addImdg = (s, aClass) -> imdg.put(s, imdgProvider.getImdg(s, aClass));
 
         addImdg.accept(IMDGDistributedNames.Map_Company, Company.class);
+        addImdg.accept(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
         addImdg.accept(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
         addImdg.accept(IMDGDistributedNames.Map_ClearingAccountTypeDictionary, ClearingAccountTypeDictionary.class);
         addImdg.accept(IMDGDistributedNames.Map_Account, Account.class);
@@ -42,6 +41,10 @@ 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);
 
         return imdg;
     }

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

@@ -6,7 +6,9 @@ public enum AccountError implements IErrorEnumId {
     GeneralError(5000L),
     UserVerifyDenial(5001L),
     RequiredFieldEmpty(5002L),
+    DictionaryNotFound(5003L),
     WrongFieldValue(5004L),
+    RecordNotFound(5006L),
     AccountAlreadyExist(5010L),
     AccountNotFound(5011L),
     AccountNotActive(5012L),
@@ -17,7 +19,11 @@ public enum AccountError implements IErrorEnumId {
     DepoAccountNotFound(5017L),
     MoneyAccountNotFound(5018L),
     ClearingCategoryNotFound(5019L),
-    TradingClearingRegistryNotFound(5022L),
+    ClearingCompanySymbolNotFound(5022L), // Для компании %s отсутствует клиринговый код».
+    AccountForTradingClearingRegistryAlreadyUsed(5023L),
+    AccountFieldNotSet(5024L),
+    AccountDepoTypeRequired(5025L),
+    TradingClearingRegistryNotFound(3022L),
     ;
 
     private final Long id;

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

@@ -0,0 +1,106 @@
+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,6 +9,9 @@ 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;
@@ -17,10 +20,7 @@ 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.account.sdf01.AccountTerminationRequest;
 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;
@@ -28,10 +28,10 @@ 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.ClearingCategory;
-import ru.spcex.platform.enumeration.ServiceStatus;
+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.ImdgTransaction;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
@@ -40,14 +40,14 @@ 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.List;
+import java.util.Map;
 import java.util.function.Function;
 
 @Service
 public class AccountService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
+    private final ImdgProvider imdgProvider;
     private final Imdg<Account> accountMap;
     private final Imdg<ClearingMemberCategory> clearingMemberCategoryMap;
     private final Imdg<Relation> relationMap;
@@ -55,6 +55,8 @@ 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;
@@ -67,6 +69,8 @@ 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")
@@ -74,6 +78,8 @@ 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
         );
@@ -87,6 +93,7 @@ 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;
@@ -94,18 +101,20 @@ public class AccountService extends QueueConsumer implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() {
-        callback(AccountSdf01Request.class)
-                .setConsumer(this::accountNewSdf01)
-                .forDestination(Consts.ACCOUNT_NEW_SDF01, callbacks::put);
+        imdgProvider.waitAvailable();
         callback(CorrespondentAccountNewRequest.class)
-                .setConsumer(this::accountCorrespondentNew)
+                .setFunction(this::accountCorrespondentNew)
                 .forDestination(Consts.DESTINATION_CORRESPONDENT_ACCOUNT_NEW, callbacks::put);
         callback(CorrespondentAccountUpdateRequest.class)
-                .setConsumer(this::correspondentAccountUpdate)
+                .setFunction(this::correspondentAccountUpdate)
                 .forDestination(Consts.DESTINATION_CORRESPONDENT_ACCOUNT_UPDATE, callbacks::put);
         callback(CommonIdRequest.class)
-                .setConsumer(this::correspondentAccountBlock)
+                .setFunction(this::correspondentAccountBlock)
                 .forDestination(Consts.DESTINATION_CORRESPONDENT_ACCOUNT_BLOCK, callbacks::put);
+
+        callback(AccountTerminationRequest.class)
+                .setFunction(this::accountTerminationForCompany)
+                .forDestination(Consts.ACCOUNT_TERMINATION, callbacks::put);
         init();
     }
 
@@ -125,19 +134,105 @@ 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());
+            log.trace("Status not set in request. Use default: {}", account.getStatus());
+        } else {
             account.setStatus(req.getStatus());
+        }
         account.setCreated(now);
         account.setUpdated(now);
 
-        requestInfoUpdate = fillAccountFromRelation(account, userRequest.getId());
+        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), false);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
-        Long newId = accountMap.insert(account);
+        Long newId = null;
+        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");
 
@@ -150,6 +245,10 @@ 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());
 
@@ -182,88 +281,50 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         return null;
     }
 
-    @Deprecated
-    public RequestInfoUpdate accountNewSdf01(BaseRequest<AccountSdf01Request> userRequest) {
-        log.debug("AccountSdf01Request received");
 
-        AccountSdf01Request req = userRequest.getRequestPayload();
-        List<AccountSdfToStatementRequestPart> accountToStatement = new ArrayList<>();
-        for (AccountSdfRequestPart accountReq : req.getAccounts()) {
-            Account account = new Account();
-            account.setAccount(accountReq.getAccount());
-            account.setCompanyId(accountReq.getCompanyId());
-            account.setAccountType(accountReq.getAccountType());
-            accountMap.insert(account);
-            AccountSdfToStatementRequestPart responsePart = responsePart(accountReq.getSdfId());
-            accountToStatement.add(responsePart);
+    public RequestInfoUpdate accountTerminationForCompany(BaseRequest<AccountTerminationRequest> userRequest) {
+        log.debug("AccountTerminationRequest received, id={}", userRequest.getId());
+
+        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
+        if (requestInfoUpdate != null) return requestInfoUpdate; // never - system
+
+        AccountTerminationRequest req = userRequest.getRequestPayload();
+        final Long companyId = req.getCompanyId();
+        Collection<Account> accounts = accountMap.getCollectionObjectsBySQL("companyId=" + companyId);
+        log.trace("Found {} accounts (will be terminated) by company {}", accounts.size(), companyId);
+        int blockCount = 0;
+        ImdgTransaction tx = imdgProvider.newTransaction();
+        boolean txOk = false;
+        try {
+            tx.beginTransaction();
+            for (Account account : accounts) {
+                //Account account = accountMap.getSingleObjectByID(request.getId());
+                if (!ServiceStatus.Blocked.equalsByKey(account.getStatus())) {
+                    account.setStatus(ServiceStatus.Blocked.getKey());
+                    account.setUpdated(Instant.now());
+                    accountMap.update(account);
+                    blockCount++;
                 }
-        sendStatementRequestBack(req.getGroupingSdf01Id(), accountToStatement);
-        log.debug("successfully processed, grouping id={}, processed number={}", req.getGroupingSdf01Id(), accountToStatement.size());
+            }
+            txOk = true;
+        } finally {
+            if (txOk)
+                tx.commitTransaction();
+            else
+                tx.beginTransaction();
+        }
+        log.debug("For company {} block {} account (of {} account)", companyId, blockCount, accounts.size());
 
+        Long reqId = kafkaSender.sendRequestToQueue(Consts.ACCOUNT_TERMINATION_STEP2, req);
+        log.info("On termination request id={} send to next step {} new request id={}",
+                userRequest.getId(), Consts.ACCOUNT_TERMINATION_STEP2, reqId);
+
+        log.debug("successfully processed, account termination");
         return null;
     }
 
-    public void accountUpdateWithBrake(BaseRequest<AccountSdf01Request> userRequest) {
-
-    }
-
-    public AccountSdfToStatementRequestPart responsePart(Long sdf01Id) {
-        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
-        responsePart.setSdfId(sdf01Id);
-        responsePart.setErrorCode(null);
-        responsePart.setErrorText(null);
-        return responsePart;
-    }
-
-    public void sendStatementRequestBack(Long groupingSdf01Id, List<AccountSdfToStatementRequestPart> results) {
-        StatementRequest request = new StatementRequest();
-        request.setGroupId(groupingSdf01Id);
-        request.setAccountCreationResults(results);
-        kafkaSender.sendRequestToQueue(Consts.STATEMENT_PROCESS, request);
-    }
-
-    /**
-     * Заполняет поля relationId и companyId из соответствующей записи Relation
-     *
-     * @param requestId Идентификатор запроса для вывода лога
-     */
-    public RequestInfoUpdate fillAccountFromRelation(Account account, Long requestId) {
-        Long companyId = account.getCompanyId();
-        ImdgPredicateBuilder clearingMemberCategoryPredicateBuilder = clearingMemberCategoryMap.predicateBuilder();
-        ImdgPredicate companyIdEquals = clearingMemberCategoryPredicateBuilder.equals("companyId", companyId);
-        Collection<ClearingMemberCategory> clearingMemberCategories = clearingMemberCategoryMap.getCollectionObjectsByPredicate(companyIdEquals);
-
-        if (clearingMemberCategories.isEmpty())
-            return makeError(AccountError.ClearingCategoryNotFound, "clearingMemberCategory[companyId]", requestId);
-        if (clearingMemberCategories.size() > 1)
-            log.warn("ClearingMemberCategory for companyId {} contains multiply elements, use first", companyId);
-        ClearingMemberCategory clearingMemberCategory = clearingMemberCategories.iterator().next();
-
-        ImdgPredicateBuilder relationPredicateBuilder = relationMap.predicateBuilder();
-        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 {
-            return makeError(AccountError.ClearingCategoryNotFound, "relation[consumerId = companyId].service", requestId);
-        }
-        ImdgPredicate finalRelationPredicate = relationPredicateBuilder.and(consumerIdPredicate, servicePredicate);
-        Collection<Relation> relations = relationMap.getCollectionObjectsByPredicate(finalRelationPredicate);
-
-        if (relations.isEmpty()) return makeError(AccountError.WrongFieldValue, "companyId", requestId);
-        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(AccountError accountError, String fieldName, Long reqId) {
-        String errMsg = messageResolver.resolve(new EnumMessage(accountError, fieldName));
+    private RequestInfoUpdate makeError(Long reqId, AccountError accountError, Object... args) {
+        String errMsg = messageResolver.resolve(new EnumMessage(accountError, args));
         return new RequestInfoUpdate()
                 .setId(reqId)
                 .setStatus(Status.Error)

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

@@ -0,0 +1,122 @@
+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

@@ -22,6 +22,7 @@ import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 import ru.spcex.platform.enumeration.AccountType;
 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,7 +41,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
     private final UserRoleVerification userRoleVerification;
     private final ValidationHelper validationHelper;
 
-    private final AccountService accountService;
+    private final AccountHelper accountService;
 
     private final Function<BankAccountNewRequest, IValidator> bankAccountNewRequestValidator;
     private final Function<BankAccountUpdateRequest, IValidator> bankAccountUpdateRequestValidator;
@@ -52,7 +53,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
                               ImdgProvider imdgProvider,
                               UserRoleVerification userRoleVerification,
                               ValidationHelper validationHelper,
-                              AccountService accountService,
+                              AccountHelper accountService,
                               @Qualifier("bankAccountNewRequestValidator")
                                       Function<BankAccountNewRequest, IValidator> bankAccountNewRequestValidator,
                               @Qualifier("bankAccountUpdateRequestValidator")
@@ -101,11 +102,16 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
         Account account = new Account();
         account.setAccount(req.getAccount());
         account.setAccountType(AccountType.Bank.getKey());
-        account.setStatus(ServiceStatus.Active.getKey());
+        if (req.getStatus() == null) {
+            log.trace("Status not set in request. Use default: {}", account.getStatus());
+            account.setStatus(WorkflowStatus.Active.getKey());
+        } else {
+            account.setStatus(req.getStatus());
+        }
         account.setCompanyId(req.getCompanyId());
         account.setCreated(now);
         account.setUpdated(now);
-        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId());
+        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), false);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         Long bankAccountId = -1L;
@@ -114,6 +120,8 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
         boolean txOk = false;
         imdgTransaction.beginTransaction();
         try {
+            Imdg<BankAccount> bankAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class);
+            Imdg<Account> accountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
             accountId = accountMap.insert(account);
 
             BankAccount bankAccount = new BankAccount();
@@ -174,6 +182,8 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
         boolean txOk = false;
         imdgTransaction.beginTransaction();
         try {
+            Imdg<BankAccount> bankAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class);
+            Imdg<Account> accountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
             accountMap.update(account);
             bankAccountMap.update(bankAccount);
             txOk = true;
@@ -210,26 +220,9 @@ public class BankAccountService extends QueueConsumer implements InitializingBea
         account.setStatus(ServiceStatus.Blocked.getKey());
         account.setUpdated(Instant.now());
 
-        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
-        boolean txOk = false;
-        imdgTransaction.beginTransaction();
-        try {
         accountMap.update(account);
-            bankAccountMap.delete(bankAccount);
-            txOk = true;
-        } finally {
-            if (txOk) {
-                imdgTransaction.commitTransaction();
-                log.debug("successfully processed, new bank account id {}, account id {}",
-                        bankAccount.getId(),
-                        account.getId());
-            } else {
-                log.debug("failed block, bank account id {}, new account id {}",
-                        bankAccount.getId(),
-                        account.getId());
-                imdgTransaction.rollbackTransaction();
-            }
-        }
+        //без изменений bankAccountMap.update(bankAccount);
+
         log.debug("successfully block, existing bankAccount with id {}", bankAccount.getId());
         return null;
     }

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

@@ -1,5 +1,7 @@
 package ru.spcex.clearing.account.service;
 
+import org.apache.commons.lang3.tuple.MutableTriple;
+import org.apache.commons.lang3.tuple.Triple;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
 import org.slf4j.Logger;
@@ -10,51 +12,78 @@ 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.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;
 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.registry.TradingClearingRegistryNewRequest;
+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.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;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.enumeration.ServiceStatus;
+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.ImdgTransaction;
 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.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
-import java.util.Map;
+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 AccountService accountService;
+    private final AccountHelper accountService;
+    private final SDFProcessService sdfProcessService;
     private final ValidationHelper validationHelper;
     private final ImdgProvider imdgProvider;
-    private final Imdg<Account> accountImdg;
-    private final Imdg<ClearingAccount> clearingAccountImdg;
     private final IMessageResolver messageResolver;
     private final RequestHelper requestHelper;
     private final Function<ClearingAccountNewRequest, IValidator> clearingAccountNewRequestValidator;
     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,
-                                  AccountService accountService,
+                                  AccountHelper accountService,
+                                  SDFProcessService sdfProcessService,
                                   ValidationHelper validationHelper,
                                   ImdgProvider imdgProvider,
                                   IMessageResolver messageResolver,
@@ -66,25 +95,44 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         super(kafkaQueue, kafkaResponseQueue);
         this.kafkaSender = kafkaSender;
         this.accountService = accountService;
+        this.sdfProcessService = sdfProcessService;
         this.validationHelper = validationHelper;
         this.imdgProvider = imdgProvider;
-        this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        this.clearingAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
         this.messageResolver = messageResolver;
         this.requestHelper = requestHelper;
         this.clearingAccountNewRequestValidator = clearingAccountNewRequestValidator;
         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
     public void afterPropertiesSet() throws Exception {
-        init();
         callback(ClearingAccountNewRequest.class)
                 .setFunction(this::clearingAccountNew)
                 .forDestination(Consts.DESTINATION_CLEARING_ACCOUNT_NEW, callbacks::put);
         callback(ClearingAccountUpdateRequest.class)
                 .setFunction(this::clearingAccountUpdate)
                 .forDestination(Consts.DESTINATION_CLEARING_ACCOUNT_UPDATE, callbacks::put);
+        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();
     }
 
     public RequestInfoUpdate clearingAccountNew(BaseRequest<ClearingAccountNewRequest> userRequest) {
@@ -99,11 +147,16 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         Account account = new Account();
         account.setAccount(req.getAccount());
         account.setAccountType(AccountType.Clrn.getKey());
-        account.setStatus(ServiceStatus.Active.getKey());
+        if (req.getStatus() == null) {
+            account.setStatus(WorkflowStatus.Active.getKey());
+            log.trace("Status not set in request. Use default: {}", account.getStatus());
+        } else {
+            account.setStatus(req.getStatus());
+        }
         account.setCompanyId(req.getCompanyId());
         account.setCreated(now);
         account.setUpdated(now);
-        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId());
+        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), true);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         Long clearingAccountId = -1L;
@@ -113,6 +166,8 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         imdgTransaction.beginTransaction();
         ClearingAccount clearingAccount = null;
         try {
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            Imdg<ClearingAccount> clearingAccountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
             accountId = accountImdg.insert(account);
 
             clearingAccount = new ClearingAccount();
@@ -124,10 +179,6 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         } finally {
             if (txOk) {
                 imdgTransaction.commitTransaction();
-                TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest();
-                request.setMoneyAccountId(accountId);
-                request.setCompanyId(clearingAccount.getCompanyId());
-                kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, request);
                 log.debug("successfully processed, new clearing account id {}, account id {}", clearingAccountId, accountId);
             } else {
                 log.debug("failed insert, new clearing account id {}, new account id {} (if id = -1 then insert is failed)",
@@ -146,6 +197,14 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         ClearingAccountUpdateRequest req = userRequest.getRequestPayload();
+
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
+        boolean txOk = false;
+        imdgTransaction.beginTransaction();
+        try {
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            Imdg<ClearingAccount> clearingAccountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
+
             ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
             ImdgPredicate accountValuePredicate = pb.equals("account", req.getAccount());
             ImdgPredicate accountStatusPredicate = pb.equals("status", ServiceStatus.Active.getKey());
@@ -157,7 +216,7 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
             Account account = accountImdg.getCollectionObjectsByPredicate(finalPredicate).iterator().next();
             Long accountId = account.getId();
 
-        ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByFieldValues(Map.of("accountId", accountId));
+            ClearingAccount clearingAccount = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", accountId));
             if (clearingAccount == null)
                 return requestHelper.makeErrorResponse(userRequest, AccountError.AccountNotFound, account.getAccount());
 
@@ -168,7 +227,391 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
             account.setUpdated(Instant.now());
 
             accountImdg.update(account);
+            txOk = true;
+        } finally {
+            if (txOk) imdgTransaction.commitTransaction();
+            else imdgTransaction.rollbackTransaction();
+        }
 
         return null;
     }
+
+
+    public RequestInfoUpdate accountNewSdf01(BaseRequest<AccountSdf01Request> userRequest) {
+        log.debug("AccountSdf01Request received, id={}", userRequest.getId());
+
+        AccountSdf01Request req = userRequest.getRequestPayload();
+        List<AccountSdfToStatementRequestPart> accountToStatement = new ArrayList<>();
+
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
+        boolean txOk = false;
+        imdgTransaction.beginTransaction();
+        try {
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            Imdg<ClearingAccount> clearingAccountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
+
+            accountsLoop:
+            for (AccountSdfRequestPart accountReq : req.getAccounts()) {
+                Instant now = Instant.now();
+                Account account = new Account();
+                account.setAccount(accountReq.getAccount());
+                account.setAccountType(AccountType.Clrn.getKey());
+                account.setStatus(ServiceStatus.Active.getKey());
+                account.setCompanyId(accountReq.getCompanyId());
+                account.setCreated(now);
+                account.setUpdated(now);
+                RequestInfoUpdate requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), true);
+                if (requestInfoUpdate != null) {
+                    log.warn("Error fill new account from relation. {}", /*account.getId(),*/ requestInfoUpdate.getMessage());
+                    {
+                        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                        responsePart.setSdfId(accountReq.getSdfId());
+                        responsePart.setErrorCode(AccountError.ClearingCategoryNotFound.getId()); // see accountService.fillAccountFromRelation
+                        responsePart.setErrorText(requestInfoUpdate.getMessage());
+                        accountToStatement.add(responsePart);
+                        continue accountsLoop;
+                    }
+                }
+
+                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
+                    log.debug("Account {} already exists", accountReq.getAccount());
+                    {
+                        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                        responsePart.setSdfId(accountReq.getSdfId());
+                        responsePart.setErrorCode(null);
+                        responsePart.setErrorText(null);
+                        accountToStatement.add(responsePart);
+                        continue accountsLoop;
+                    }
+                }
+
+                Long clearingAccountId = -1L;
+                Long accountId = -1L;
+                ClearingAccount clearingAccount = null;
+                accountId = accountImdg.insert(account);
+
+                clearingAccount = new ClearingAccount();
+                clearingAccount.setCompanyId(accountReq.getCompanyId());
+                clearingAccount.setAccountId(accountId);
+                clearingAccount.setClearingAccountType(accountReq.getAccountType());
+                clearingAccountId = clearingAccountImdg.insert(clearingAccount);
+                log.debug("New account {}, clearingAccount {} was created.", accountId, clearingAccountId);
+
+                {
+                    AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                    responsePart.setSdfId(accountReq.getSdfId());
+                    responsePart.setErrorCode(null);
+                    responsePart.setErrorText(null);
+                    accountToStatement.add(responsePart);
+                }
+            }
+            txOk = true;
+        } finally {
+            if (txOk) {
+                imdgTransaction.commitTransaction();
+            } else {
+                log.debug("failed insert, new clearing accounts. Request id={}", userRequest.getId());
+                imdgTransaction.rollbackTransaction();
+            }
+        }
+
+
+        sendStatementRequestBack(req.getGroupingSdf01Id(), req.getGroupingSdf02Id(), accountToStatement);
+        log.debug("successfully processed, grouping id={}, processed number={}", req.getGroupingSdf01Id(), accountToStatement.size());
+
+        return null;
+    }
+
+    public RequestInfoUpdate accountUpdateSdf52(BaseRequest<StatementRequest> systemRequest) {
+        log.debug("accountUpdateSdf52 StatementRequest received, id={}", systemRequest.getId());
+
+        StatementRequest req = systemRequest.getRequestPayload();
+        Long groupId = req.getGroupId();
+        if (SdfTable.SDF_52 != req.getTable()) {
+            log.warn("Unsupported table {} received on accountUpdateSdf52. Expected only {}.",
+                    req.getTable(), SdfTable.SDF_52);
+        }
+        Collection<SDf52> sdfs = sdfProcessService.sdfsByGroupId(groupId);
+        if (sdfs.isEmpty()) {
+            log.info("Do not processing SDF52: S_DF52 not found by groupId={}", groupId);
+            return null;
+        }
+        log.info("start processing {} SDF52: groupId={}", sdfs.size(), groupId);
+
+        List<Pair<SDf52, Account>> toUpdate = new ArrayList<>();
+        List<Triple<SDf52, Account, String>> toProcessSDF53 = new ArrayList<>();
+        { // 1. Выборка данных
+            for (SDf52 sDf52 : sdfs) {
+                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,
+                            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,
+                            makeSdfErrorText(AccountError.CompanyNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND)));
+                    continue;
+                }
+                Map<String, Comparable<?>> accountQuery = Map.of(
+                        "accountType", AccountType.Clrn.getKey(),
+                        "account", sDf52.getAccount(),
+                        "companyId", company.getId()
+                );
+                Account account = sDf52.getAccount() == null ? null : accountImdg.getFirstObjectByFieldValues(accountQuery);
+                if (account == null) {
+                    if (SDFProcessService.SDF52_STATUS_3Open.equals(sDf52.getStatus())) {
+                        log.debug("By generationId={} s_df52[{}].status={}, but account not found (query: {}). COntinuse with result OK for status 3",
+                                groupId, sDf52.getId(), sDf52.getStatus(), accountQuery);
+                    } else {
+                        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;
+
+        // 2. обновление данных
+        Instant now = Instant.now();
+        AccountStatus newStatus = sdfProcessService.parseSdf52Status(sdf.getStatus());
+        if (newStatus == null) {
+            throw new IllegalArgumentException("Can not parse sdf status " + sdf.getStatus());
+        }
+        // За долгое время ожидания пользователя счёт мог быть обновлён, прочитать его ещё раз
+        account = accountImdg.getSingleObjectByID(account.getId());
+        if (!newStatus.equalsByKey(account.getStatus())) {
+            // Обновление счёта
+            String oldStatus = account.getStatus();
+            account.setStatus(newStatus.getKey());
+            account.setUpdated(now);
+            accountImdg.update(account);
+            log.trace("S_DF52[{}] do update status to {} for account[{}]",
+                    sdf.getId(), newStatus.getKey(), account.getId());
+            if (AccountStatus.ACTIVE.equalsByKey(oldStatus) && AccountStatus.ACTIVE != newStatus) { // счёт заблокировали - значит блокируем ТКР, наоборот не надо.
+                // Отправка в ТКР
+                TradingClearingRegistryUpdateRequest tcrReq = new TradingClearingRegistryUpdateRequest();
+                tcrReq.setMoneyAccountId(account.getId());
+                tcrReq.setCompanyId(account.getCompanyId());
+                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++;
+        } else {
+            log.info("Account[{}] \"{}\" do not updated - same status \"{}\"", account.getId(), account.getAccount(), newStatus);
+        }
+
+        log.debug("successfully processed, grouping id={}. Updated {} accounts.",
+                groupId, countOfUpdated);
+        return null;
+    }
+
+    protected String makeSdfErrorText(IErrorEnumId clrError, String sdfCode) {
+        if (clrError == null) return sdfCode;
+        sdfCode = clrError.getId().toString();
+        if (sdfCode.length() > 3)
+            sdfCode = sdfCode.substring(sdfCode.length() - 3);
+        return sdfCode;
+    }
+
+    public void sendStatementRequestBack(Long groupingSdf01Id, Long groupSdf02Id, List<AccountSdfToStatementRequestPart> results) {
+        final String destination = Consts.STATEMENT_PROCESS;
+        StatementRequest request = new StatementRequest();
+        request.setGroupId(groupingSdf01Id);
+        request.setChildGenerationId(groupSdf02Id);
+        request.setAccountCreationResults(results);
+        request.setContinueSdf(true);
+        request.setTable(SdfTable.SDF_01); // по нему запрос получили
+        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/ClientCodeService.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.company.service;
+package ru.spcex.clearing.account.service;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
@@ -6,15 +6,13 @@ import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
 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.clearing.classes.statics.data.account.ClientCode;
-import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
-import ru.spcex.clearing.company.error.CompanyErrors;
+import ru.spcex.clearing.account.errors.AccountError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
@@ -24,26 +22,24 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeUpdateR
 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.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.platform.messaging.service.Status;
 import ru.spcex.clearing.util.security.UserRoleVerification;
-import ru.spcex.clearing.util.services.exchangers.BiDirectionQueueExchanger;
+import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
 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.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
-import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgIdGeneratorHazelcast;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
-import ru.spcex.platform.utils.error.ClearingBaseException;
 import ru.spcex.platform.utils.log.ExceptionUtils;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -51,12 +47,12 @@ import java.util.concurrent.Future;
 import java.util.function.Function;
 
 @Service
-public class ClientCodeService extends QueueConsumer implements InitializingBean, DisposableBean {
+public class ClientCodeService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Producer<String, Object> kafkaProducer;
     private final ImdgId idGenerator;
+    private final ImdgProvider imdgProvider;
     private final Imdg<ClientCode> clientCodeMap;
-    private final Imdg<Company> companyMap;
     private final Imdg<TradingClearingRegistry> tradingClearingRegistryMap;
 
 
@@ -66,61 +62,85 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
     private final ValidationHelper validationHelper;
     private final UserRoleVerification userRoleVerification;
     private final IMessageResolver messageResolver;
+    private final RequestHelper requestHelper;
 
-    BiDirectionQueueExchanger<BaseRequest<TradingClearingRegistryNewRequest>> accountServiceExchanger;
+    protected TradingClearingRegistryService tradingClearingRegistryService;
 
     @Autowired
-    public ClientCodeService(Consumer<String, Object> kafkaQueue1, Consumer<String, Object> kafkaQueue2,
+    public ClientCodeService(Consumer<String, Object> kafkaQueue,
                              Producer<String, Object> kafkaProducer,
                              ImdgProvider imdgProvider,
                              ValidationHelper validationHelper,
                              IMessageResolver messageResolver,
+                             RequestHelper requestHelper,
+                             TradingClearingRegistryService tradingClearingRegistryService,
                              UserRoleVerification userRoleVerification,
                              @Qualifier("clientCodeNewRequestValidator") Function<ClientCodeNewRequest, IValidator> clientCodeNewRequestValidator,
                              @Qualifier("clientCodeUpdateRequestValidator") Function<ClientCodeUpdateRequest, IValidator> clientCodeUpdateRequestValidator,
                              @Qualifier("clientCodeDeleteRequestValidator") Function<CommonDeleteRequest, IValidator> clientCodeDeleteRequestValidator) {
-        super(kafkaQueue1, kafkaProducer);
+        super(kafkaQueue, kafkaProducer);
         this.kafkaProducer = kafkaProducer;
+        this.imdgProvider = imdgProvider;
         this.idGenerator = imdgProvider.getImdgIdGenerator();
         this.clientCodeMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class);
-        this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.tradingClearingRegistryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
         this.clientCodeNewRequestValidator = clientCodeNewRequestValidator;
         this.clientCodeUpdateRequestValidator = clientCodeUpdateRequestValidator;
         this.clientCodeDeleteRequestValidator = clientCodeDeleteRequestValidator;
         this.validationHelper = validationHelper;
+        this.requestHelper = requestHelper;
         this.messageResolver = messageResolver;
         this.userRoleVerification = userRoleVerification;
-
-        this.accountServiceExchanger = new BiDirectionQueueExchanger<>(kafkaQueue2, kafkaProducer,
-                Consts.DESTINATION_TRADING_CLEARING_REGISTRY_NEW,
-                Consts.REQUEST_INFO_UPDATE, true, // REQUEST_INFO_UPDATE - стандартная очередь, для результатов всех реквестов. DESTINATION_TRADING_CLEARING_REGISTRY_REPLY,
-                60000
-        );
+        this.tradingClearingRegistryService = tradingClearingRegistryService;
     }
 
     @Override
     public void afterPropertiesSet() {
+        imdgProvider.waitAvailable();
+
         callback(ClientCodeNewRequest.class)
-                .setConsumer(this::clientCodeNew)
+                .setFunction(this::clientCodeNew)
                 .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW, callbacks::put);
         callback(ClientCodeNewRequest.class)
-                .setConsumer(this::clientCodeNewFromApiUmCompany)
+                .setFunction(this::clientCodeNewFromApiUmCompany)
                 .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, callbacks::put);
 
         callback(ClientCodeUpdateRequest.class)
-                .setConsumer(this::clientCodeUpdate)
+                .setFunction(this::clientCodeUpdate)
                 .forDestination(Consts.DESTINATION_CLIENT_CODE_UPDATE, callbacks::put);
         callback(CommonDeleteRequest.class)
-                .setConsumer(this::clientCodeDelete)
+                .setFunction(this::clientCodeDelete)
                 .forDestination(Consts.DESTINATION_CLIENT_CODE_DELETE, callbacks::put);
         init();
 
     }
 
-    @Override
-    public void destroy() {
-        accountServiceExchanger.close();
+    /**
+     * Проверки
+     * 3.5.1  если не была найдена запись в tradingClearingRegistry по companyId, moneyAccountId, depoAccountId и tradingClearingRegistryType=B (п 3.5.1)
+     * 3.5.2 если не заполнены   поля moneyAccountId ИЛИ moneyAccountId и depoAccountId
+     * @param userRequest
+     * @param moneyAccountId  req.getMoneyAccountId()
+     * @param depoAccountId req.getDepoAccountId()
+     * @param companyId req.getCompanyId()
+     * @return
+     */
+    RequestInfoUpdate crossValidate(BaseRequest<?> userRequest, Long moneyAccountId, Long depoAccountId, Long companyId) {
+        if (moneyAccountId == null) { // Если не заполнены moneyAccountId ИЛИ moneyAccountId и depoAccountId
+            EnumMessage error = null;
+            if (companyId == null) {
+                error = new EnumMessage(AccountError.RequiredFieldEmpty, "companyId");
+            } else {
+                TradingClearingRegistry tcr = tradingClearingRegistryMap.getFirstObjectByFieldValues(Map.of("companyId", companyId));
+                if (tcr==null) {
+                    error=new EnumMessage(AccountError.TradingClearingRegistryNotFound, companyId);
+                }
+            }
+            if (error != null) {
+                return requestHelper.makeErrorResponse(userRequest, error);
+            }
+        }
+        return null;
     }
 
     protected RequestInfoUpdate clientCodeNew(BaseRequest<ClientCodeNewRequest> userRequest) {
@@ -133,17 +153,21 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         ClientCodeNewRequest req = userRequest.getRequestPayload();
+        // дополнительная проверка
+        requestInfoUpdate = crossValidate(userRequest, req.getMoneyAccountId(), req.getDepoAccountId(), req.getCompanyId());
+        if (requestInfoUpdate != null) return requestInfoUpdate;
 
         boolean doCreateTCR = checkNeedCreateTCR(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
         if (doCreateTCR) {
             try {
-                createAndWaitTCR(userRequest.getId(), null,
+                requestInfoUpdate = createAndWaitTCR(userRequest.getId(), null,
                         req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
-            } catch (ClearingBaseException e) {
+                if (requestInfoUpdate != null) return requestInfoUpdate;
+            } catch (Exception e) {
                 log.error("Can not wait creation of TCR. request id={};CompanyId={}, MoneyAccountId={}, DepoAccountId={}; {}",
                         userRequest.getId(), req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId(),
                         e.toString());
-                return makeErrorResponse(userRequest, CompanyErrors.GeneralError, "Can not create TCR at this moment");
+                return makeErrorResponse(userRequest, AccountError.GeneralError, "Can not create TCR: " + e.getMessage());
             }
         }
 
@@ -156,7 +180,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
 
 
     protected RequestInfoUpdate clientCodeNewFromApiUmCompany(BaseRequest<ClientCodeNewRequest> userRequest) {
-        log.debug("ClientCodeNewRequest received {}", userRequest.getId());
+        log.debug("ClientCodeNewRequest (UM_COMPANY) received {}", userRequest.getId());
 
         RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
         if (requestInfoUpdate != null) return requestInfoUpdate;
@@ -166,17 +190,21 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
 
 
         ClientCodeNewRequest req = userRequest.getRequestPayload();
+        // дополнительная проверка
+        requestInfoUpdate = crossValidate(userRequest, req.getMoneyAccountId(), req.getDepoAccountId(), req.getCompanyId());
+        if (requestInfoUpdate != null) return requestInfoUpdate;
 
         boolean doCreateTCR = checkNeedCreateTCR(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
         if (doCreateTCR) {
             try {
-                createAndWaitTCR(userRequest.getId(), null,
+                requestInfoUpdate = createAndWaitTCR(userRequest.getId(), null,
                         req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
-            } catch (ClearingBaseException e) {
+                if (requestInfoUpdate != null) return requestInfoUpdate;
+            } catch (Exception e) {
                 log.error("Can not wait creation of TCR. request id={};CompanyId={}, MoneyAccountId={}, DepoAccountId={}; {}",
                         userRequest.getId(), req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId(),
                         e.toString());
-                return makeErrorResponse(userRequest, CompanyErrors.GeneralError, "Can not create TCR at this moment");
+                return makeErrorResponse(userRequest, AccountError.GeneralError, "Can not create TCR at this moment" + e.getMessage());
             }
         }
 
@@ -196,24 +224,28 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
 
         requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, clientCodeUpdateRequestValidator);
         if (requestInfoUpdate != null) return requestInfoUpdate;
+        // дополнительная проверка
+        requestInfoUpdate = crossValidate(userRequest, req.getMoneyAccountId(), req.getDepoAccountId(), req.getCompanyId());
+        if (requestInfoUpdate != null) return requestInfoUpdate;
 
 
         log.debug("ClientCodeUpdateRequest received, id={}", req.getId());
         ClientCode clientCode = clientCodeMap.getSingleObjectByID(req.getId());
         if (clientCode == null) {
-            return makeErrorResponse(userRequest, CompanyErrors.RecordNotFound, req.getId());
+            return makeErrorResponse(userRequest, AccountError.RecordNotFound, req.getId());
         }
 
         boolean doCreateTCR = checkNeedCreateTCR(req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
         if (doCreateTCR) {
             try {
-                createAndWaitTCR(userRequest.getId(), clientCode.getId(),
+                requestInfoUpdate = createAndWaitTCR(userRequest.getId(), clientCode.getId(),
                         req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId());
-            } catch (ClearingBaseException e) {
+                if (requestInfoUpdate != null) return requestInfoUpdate;
+            } catch (Exception e) {
                 log.error("Can not wait creation of TCR. request id={};CompanyId={}, MoneyAccountId={}, DepoAccountId={}; {}",
                         userRequest.getId(), req.getCompanyId(), req.getMoneyAccountId(), req.getDepoAccountId(),
                         e.toString());
-                return makeErrorResponse(userRequest, CompanyErrors.GeneralError, "Can not create TCR at this moment");
+                return makeErrorResponse(userRequest, AccountError.GeneralError, "Can not create TCR: " + e.getMessage());
             }
         }
 
@@ -224,13 +256,8 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         return null;
     }
 
-    private RequestInfoUpdate makeErrorResponse(BaseRequest<?> req, CompanyErrors err, Object... arg) {
-        String errMsg = messageResolver.resolve(new EnumMessage(err, arg));
-        return new RequestInfoUpdate()
-                .setId(req.getId())
-                .setStatus(ru.spcex.clearing.platform.messaging.service.Status.Error)
-                .setMessage(errMsg);
-
+    private RequestInfoUpdate makeErrorResponse(BaseRequest<?> req, AccountError err, Object... arg) {
+        return requestHelper.makeErrorResponse(req, err, arg);
     }
 
     protected RequestInfoUpdate clientCodeDelete(BaseRequest<CommonDeleteRequest> userRequest) {
@@ -245,11 +272,13 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
 
         ClientCode clientCode = clientCodeMap.getSingleObjectByID(req.getId());
         if (clientCode.getMoneyAccountId() != null) {
-            log.debug("Delete clientCode.id = {}: send message to account-service", clientCode.getId());
+            log.debug("Blocking clientCode.id = {}: send message to account-service", clientCode.getId());
             sendBlockTCR(clientCode.getTradingClearingRegistryId(), clientCode.getMoneyAccountId());
         }
-        log.debug("Delete clientCode.id={}", clientCode.getId());
-        clientCodeMap.delete(clientCode);
+        log.debug("Blocking clientCode.id={}", clientCode.getId());
+        clientCode.setUpdated(Instant.now());
+        clientCode.setStatus(WorkflowStatus.Blocked.getKey());
+        clientCodeMap.update(clientCode);
 
         return null;
     }
@@ -260,9 +289,9 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         query.put("moneyAccountId", moneyAccountId);
         query.put("tradingClearingRegistryType", TradingClearingRegistryType.Client_B.getKey());
         if (depoAccountId != null) {
-            query.put("depoAaccountId", depoAccountId); // todo опечатка в поле класса, см. meta.xml!
+            query.put("depoAccountId", depoAccountId);
         }
-        TradingClearingRegistry result = tradingClearingRegistryMap.getSingleObjectByFieldValues(query);
+        TradingClearingRegistry result = tradingClearingRegistryMap.getFirstObjectByFieldValues(query);
         log.trace("TradingClearingRegistry by: {}; {}found", query, result == null ? "not " : "");
         return result;
     }
@@ -280,8 +309,8 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         }
     }
 
-    protected void createAndWaitTCR(Long reqId, Long clientCode,
-                                    Long companyId, Long moneyAccountId, Long depoAccountId) throws ClearingBaseException {
+    protected RequestInfoUpdate createAndWaitTCR(Long reqId, Long clientCode,
+                                    Long companyId, Long moneyAccountId, Long depoAccountId) {
         log.debug("For request {}, clientCode={} need create TCR: companyId={}, moneyAccountId={}, depoAccountId={}",
                 reqId, clientCode == null ? "new" : clientCode,
                 companyId, moneyAccountId, depoAccountId);
@@ -295,16 +324,13 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
 //        requestPayload.setStatus(WorkflowStatus.Active.getKey());
         requestPayload.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey());
         request.setRequestPayload(requestPayload);
-        try {
-            Long reply = accountServiceExchanger.exchange(request);
-            if (reply == null) {
-                throw new ClearingBaseException(CompanyErrors.GeneralError, "Waiting account-service timeout");
-            }
-            // примечание: ошибка и сбой (непредвиденное завершение программы) не приведёт к необратимым последствиям,
-            // т.к. пользователь сможет повторить запрос, а созданный на предыдущем запросе ТКР уже будет создан и найдётся.
-        } catch (InterruptedException e) {
-            throw new ClearingBaseException(CompanyErrors.GeneralError, "Waiting account-service timeout");
+
+        // Следующий вызываемый метод обязательно должен быть synchronized.
+        RequestInfoUpdate reply = tradingClearingRegistryService.tradingClearingRegistryNew(request);
+        if (reply != null && Status.Error.equals(reply.getStatus())) {
+            log.warn("tradingClearingRegistryService return error: " + reply.getMessage());
         }
+        return reply;
     }
 
     protected void sendBlockTCR(Long tradingClearingRegistryId, Long moneyAccountId) {
@@ -319,6 +345,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         requestPayload.setStatus(WorkflowStatus.Blocked.getKey());
         request.setRequestPayload(requestPayload);
 
+        log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE, LogFormatter.toStringWrapper(request));
         try {
             sendMessage(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE, request);
         } catch (Exception e) {

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

@@ -9,23 +9,29 @@ 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.DepoAccount;
+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.DepoAccountNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
+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.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.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.AccountType;
-import ru.spcex.platform.enumeration.ServiceStatus;
+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.ImdgTransaction;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Function;
 
 @Service
@@ -35,17 +41,15 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
     private final KafkaSender kafkaSender;
     private final ValidationHelper validationHelper;
     private final ImdgProvider imdgProvider;
-    private final AccountService accountService;
+    private final AccountHelper accountService;
     private final Function<DepoAccountNewRequest, IValidator> depoAccountNewRequestValidator;
-    private final Imdg<Account> accountImdg;
-    private final Imdg<DepoAccount> depoAccountImdg;
 
     public DepoAccountService(Consumer<String, Object> kafkaQueue,
                               Producer<String, Object> kafkaProducer,
                               KafkaSender kafkaSender,
                               ValidationHelper validationHelper,
                               ImdgProvider imdgProvider,
-                              AccountService accountService,
+                              AccountHelper accountService,
                               @Qualifier("depoAccountNewRequestValidator")
                                       Function<DepoAccountNewRequest, IValidator> depoAccountNewRequestValidator) {
         super(kafkaQueue, kafkaProducer);
@@ -54,15 +58,17 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
         this.imdgProvider = imdgProvider;
         this.accountService = accountService;
         this.depoAccountNewRequestValidator = depoAccountNewRequestValidator;
-        this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        this.depoAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
     }
 
     @Override
     public void afterPropertiesSet() throws Exception {
         callback(DepoAccountNewRequest.class)
-                .setConsumer(this::depoAccountNew)
+                .setFunction(this::depoAccountNew)
                 .forDestination(Consts.DESTINATION_DEPO_ACCOUNT_NEW, callbacks::put);
+        callback(AccountSdf01Request.class)
+                .setFunction(this::accountNewSdf08)
+                .forDestination(Consts.ACCOUNT_NEW_SDF08, callbacks::put);
+
         init();
     }
 
@@ -79,11 +85,16 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
         Account account = new Account();
         account.setAccount(req.getAccount());
         account.setAccountType(AccountType.Depo.getKey());
-        account.setStatus(ServiceStatus.Active.getKey());
+        if (req.getStatus() == null) {
+            account.setStatus(WorkflowStatus.Active.getKey());
+            log.trace("Status not set in request. Use default: {}", account.getStatus());
+        } else {
+            account.setStatus(req.getStatus());
+        }
         account.setCompanyId(req.getCompanyId());
         account.setCreated(now);
         account.setUpdated(now);
-        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId());
+        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), true);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         Long depoAccountId = -1L;
@@ -93,21 +104,23 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
         imdgTransaction.beginTransaction();
         DepoAccount depoAccount = null;
         try {
+            Imdg<Account> accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            Imdg<DepoAccount> depoAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
             accountId = accountImdg.insert(account);
 
             depoAccount = new DepoAccount();
             depoAccount.setCompanyId(req.getCompanyId());
             depoAccount.setAccountId(accountId);
+            if (account.getAccount() != null && account.getAccount().contains("BC")) {
+                depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
+            } else {
                 depoAccount.setDepoAccountType(req.getDepoAccountType());
+            }
             depoAccountId = depoAccountImdg.insert(depoAccount);
             txOk = true;
         } finally {
             if (txOk) {
                 imdgTransaction.commitTransaction();
-                TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest();
-                request.setDepoAccountId(accountId);
-                request.setCompanyId(depoAccount.getCompanyId());
-                kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, request);
                 log.debug("successfully processed, new depo account id {}, account id {}", depoAccountId, accountId);
             } else {
                 log.debug("failed insert, new depo account id {}, new account id {} (if id = -1 then insert is failed)",
@@ -118,4 +131,107 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
         }
         return null;
     }
+
+    public RequestInfoUpdate accountNewSdf08(BaseRequest<AccountSdf01Request> userRequest) {
+        log.debug("AccountSdf08Request received, id={}", userRequest.getId());
+
+        AccountSdf01Request req = userRequest.getRequestPayload();
+        List<AccountSdfToStatementRequestPart> accountToStatement = new ArrayList<>();
+
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
+        boolean txOk = false;
+        imdgTransaction.beginTransaction();
+        try {
+            Imdg<Account> accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            Imdg<DepoAccount> depoAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
+            accountsLoop:
+            for (AccountSdfRequestPart accountReq : req.getAccounts()) {
+
+//                DepoAccountNewRequest req = userRequest.getRequestPayload();
+
+                Instant now = Instant.now();
+                Account account = new Account();
+                account.setAccount(accountReq.getAccount());
+                account.setAccountType(AccountType.Depo.getKey());
+                account.setStatus(ServiceStatus.Active.getKey());
+                account.setCompanyId(accountReq.getCompanyId());
+                account.setCreated(now);
+                account.setUpdated(now);
+                RequestInfoUpdate requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), true);
+                if (requestInfoUpdate != null) {
+                    log.warn("Error fill new account from relation. {}", /*account.getId(),*/ requestInfoUpdate.getMessage());
+                    {
+                        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                        responsePart.setSdfId(accountReq.getSdfId());
+                        responsePart.setErrorCode(AccountError.ClearingCategoryNotFound.getId()); // see accountService.fillAccountFromRelation
+                        responsePart.setErrorText(requestInfoUpdate.getMessage());
+                        accountToStatement.add(responsePart);
+                        continue accountsLoop;
+                    }
+                }
+                if (accountImdg.getFirstObjectBySQL("account = '%s'".formatted(accountReq.getAccount())) != null) {
+                    log.debug("Account {} already exists", accountReq.getAccount());
+                    {
+                        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                        responsePart.setSdfId(accountReq.getSdfId());
+                        responsePart.setErrorCode(null);
+                        responsePart.setErrorText(null);
+                        accountToStatement.add(responsePart);
+                        continue accountsLoop;
+                    }
+                }
+
+                Long depoAccountId = -1L;
+                Long accountId = -1L;
+
+                    accountId = accountImdg.insert(account);
+
+                DepoAccount depoAccount = new DepoAccount();
+                depoAccount.setCompanyId(accountReq.getCompanyId());
+                depoAccount.setAccountId(accountId);
+                if (account.getAccount() != null && account.getAccount().contains("BC")) {
+                    depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
+                } else {
+                    depoAccount.setDepoAccountType(accountReq.getAccountType());
+                }
+                depoAccountId = depoAccountImdg.insert(depoAccount);
+
+
+
+                log.debug("New account {}, depoAccount {} was created.", accountId, depoAccountId);
+
+                {
+                    AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
+                    responsePart.setSdfId(accountReq.getSdfId());
+                    responsePart.setErrorCode(null);
+                    responsePart.setErrorText(null);
+                    accountToStatement.add(responsePart);
+                }
+            }
+            txOk = true;
+        } finally {
+            if (txOk) {
+                imdgTransaction.commitTransaction();
+            } else {
+                log.debug("failed insert, new clearing accounts. Request id={}", userRequest.getId());
+                imdgTransaction.rollbackTransaction();
+            }
+        }
+
+        sendStatementRequestBack(req.getGroupingSdf01Id(), req.getGroupingSdf02Id(), accountToStatement);
+        log.debug("successfully processed, grouping id={}, processed number={}", req.getGroupingSdf01Id(), accountToStatement.size());
+
+        return null;
+    }
+
+    public void sendStatementRequestBack(Long groupingSdf01Id, Long groupingSdf02Id, List<AccountSdfToStatementRequestPart> results) {
+        StatementRequest request = new StatementRequest();
+        request.setGroupId(groupingSdf01Id);
+        request.setChildGenerationId(groupingSdf02Id);
+        request.setContinueSdf(true); //fixme????
+        request.setAccountCreationResults(results);
+        request.setTable(SdfTable.SDF_08); // по нему запрос получили
+        log.debug("Send message to kafka \"{}\": {}", Consts.STATEMENT_PROCESS, LogFormatter.toStringWrapper(request));
+        kafkaSender.sendRequestToQueue(Consts.STATEMENT_PROCESS, request);
+    }
 }

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

@@ -1,5 +1,6 @@
 package ru.spcex.clearing.account.service;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
 import org.slf4j.Logger;
@@ -16,55 +17,73 @@ 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.InformationAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.reports.NotificationRequest;
+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;
 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;
 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.IMessageResolver;
+import ru.spcex.platform.utils.log.ExceptionUtils;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
 import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 public class InformationAccountService extends QueueConsumer implements InitializingBean {
     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 AccountService accountService;
+    private final AccountHelper accountHelper;
     private final RequestHelper requestHelper;
     private final Function<InformationAccountNewRequest, IValidator> infoAccountNewRequestValidator;
     private final Imdg<InformationAccount> informationAccountImdg;
     private final Imdg<Account> accountImdg;
+    /**
+     * Кэш-счётчик сквозных номеров счетов.
+     * См. accountNextId()
+     */
+    protected AtomicLong infoCounter;
 
     @Autowired
     public InformationAccountService(Consumer<String, Object> kafkaQueue,
                                      Producer<String, Object> kafkaResponseQueue,
                                      KafkaSender kafkaSender,
                                      IMessageResolver messageResolver,
+                                     UserRoleVerification userRoleVerification,
                                      ImdgProvider imdgProvider,
                                      ValidationHelper validationHelper,
-                                     AccountService accountService,
+                                     AccountHelper accountHelper,
                                      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.accountService = accountService;
+        this.accountHelper = accountHelper;
         this.requestHelper = requestHelper;
         this.infoAccountNewRequestValidator = infoAccountNewRequestValidator;
         this.informationAccountImdg = imdgProvider.getImdg(
@@ -78,22 +97,32 @@ public class InformationAccountService extends QueueConsumer implements Initiali
     @Override
     public void afterPropertiesSet() throws Exception {
         callback(InformationAccountNewRequest.class)
-                .setConsumer(this::informationAccountNew)
+                .setFunction(this::informationAccountNew)
                 .forDestination(Consts.DESTINATION_INFORMATION_ACCOUNT_NEW, callbacks::put);
+        callback(InformationAccountNewRequest.class)
+                .setFunction(this::informationAccountSystemNew)
+                .forDestination(Consts.INFORMATION_ACCOUNT_SYSTEM_NEW, callbacks::put);
         init();
     }
 
+    @Deprecated
     public RequestInfoUpdate informationAccountNew(BaseRequest<InformationAccountNewRequest> userRequest) {
         log.debug("InformationAccountNewRequest received");
 
-        RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, infoAccountNewRequestValidator);
+        RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
+        if (requestInfoUpdate != null) return requestInfoUpdate;
+        requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, infoAccountNewRequestValidator);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
+        InformationAccountNewRequest req = userRequest.getRequestPayload();
+
         Long newId = informationAccountImdg.nextIDSequenceFor();
-        String accountValue = generateInfoAccount(newId);
+        Long infoSequenceId = accountNextId();
+        String accountValue = generateInfoAccount(infoSequenceId);
+        log.trace("New info-account id={}, sequenceId={}, account={}", newId, infoSequenceId, accountValue);
 
         ImdgPredicateBuilder accountPredicateBuilder = accountImdg.predicateBuilder();
-        ImdgPredicate companyIdPredicate = accountPredicateBuilder.equals("companyId", 1);
+        ImdgPredicate companyIdPredicate = accountPredicateBuilder.equals("companyId", 1L);
         ImdgPredicate accountTypePredicate = accountPredicateBuilder.equals("accountType", AccountType.Anlt.getKey());
         ImdgPredicate andPredicate = accountPredicateBuilder.and(companyIdPredicate, accountTypePredicate);
         Collection<Account> accountsAnlt = accountImdg.getCollectionObjectsByPredicate(andPredicate);
@@ -106,13 +135,19 @@ public class InformationAccountService extends QueueConsumer implements Initiali
 
         Instant now = Instant.now();
         Account account = new Account();
-        account.setAccount(accountValue);
+        account.setAccount(req.getAccount());
         account.setAccountType(AccountType.Info.getKey());
-        account.setStatus(ServiceStatus.Active.getKey());
-        account.setCompanyId(userRequest.getRequestPayload().getCompanyId());
+        if (req.getStatus() == null) {
+            account.setStatus(WorkflowStatus.Active.getKey());
+            log.trace("Status not set in request. Use default: {}", account.getStatus());
+        } else {
+            account.setStatus(req.getStatus());
+        }
+        account.setCompanyId(req.getCompanyId());
         account.setCreated(now);
         account.setUpdated(now);
-        requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId());
+
+        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), true);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
@@ -122,22 +157,21 @@ public class InformationAccountService extends QueueConsumer implements Initiali
         Long accountId = -1L;
         InformationAccount informationAccount = null;
         try {
+            Imdg<InformationAccount> informationAccountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class);
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+
             accountId = accountImdg.insert(account);
 
             informationAccount = new InformationAccount();
             informationAccount.setId(newId);
             informationAccount.setAccountId(accountId);
             informationAccount.setClearingAccountId(anltAccount.getId());
-            informationAccount.setCompanyId(userRequest.getRequestPayload().getCompanyId());
+            informationAccount.setCompanyId(req.getCompanyId());
             informationAccountId = informationAccountImdg.insert(informationAccount);
             txOk = true;
         } finally {
             if (txOk) {
                 imdgTransaction.commitTransaction();
-                TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest();
-                request.setMoneyAccountId(informationAccountId);
-                request.setCompanyId(informationAccount.getCompanyId());
-                kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, request);
                 log.debug("successfully processed, new information account id {}, new account id {}",
                         informationAccountId,
                         accountId);
@@ -152,8 +186,164 @@ public class InformationAccountService extends QueueConsumer implements Initiali
         return null;
     }
 
+
+    public RequestInfoUpdate informationAccountSystemNew(BaseRequest<InformationAccountNewRequest> userRequest) {
+        log.debug("InformationAccountNewRequest received (system), request id={}", userRequest.getId());
+
+        RequestInfoUpdate requestInfoUpdate;
+//        RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, infoAccountNewRequestValidator);
+//        if (requestInfoUpdate != null) return requestInfoUpdate;
+        final Long forCompanyId = userRequest.getRequestPayload().getCompanyId();
+
+        ImdgPredicateBuilder pb = accountImdg.predicateBuilder();
+        { // Проверка существования счёта
+            Collection<Account> accountsAnlt = accountImdg.getCollectionObjectsByFieldValues(Map.of(
+                    "companyId", forCompanyId,
+                    "accountType", AccountType.Info.getKey()
+            ));
+            if (!accountsAnlt.isEmpty()) {
+                String trueMessage = messageResolver.resolve(new EnumMessage(AccountError.InfoAccountAlreadyExist, forCompanyId));
+                log.warn("{}", trueMessage);
+                return null;
+            }
+        }
+
+
+        Long newId = informationAccountImdg.nextIDSequenceFor();
+        Long infoSequenceId = accountNextId(); // требуется последовательность n+1
+        String accountValue = generateInfoAccount(infoSequenceId);
+        log.trace("New info-account id={}, sequenceId={}, account={}", newId, infoSequenceId, accountValue);
+
+        Long anltAccountId = null;
+        {
+            ImdgPredicate andPredicate = pb.and(
+                    pb.equals("companyId", 1L),
+                    pb.equals("accountType", AccountType.Anlt.getKey())
+            );
+            Collection<Account> accountsAnlt = accountImdg.getCollectionObjectsByPredicate(andPredicate);
+            if (accountsAnlt.isEmpty()) {
+                log.error("Account with {} not exist.", andPredicate);
+                return requestHelper.makeErrorResponse(userRequest, AccountError.WrongFieldValue, "clearingAccountId");
+            } else if (accountsAnlt.size() > 1) {
+                log.warn("Account for companyId 1 and accountType=ANLT contains multiply elements, use first");
+            }
+            Account anltAccount = accountsAnlt.iterator().next();
+            anltAccountId = anltAccount.getId();
+        }
+
+        Instant now = Instant.now();
+        Account account = new Account();
+        account.setAccount(accountValue);
+        account.setAccountType(AccountType.Info.getKey());
+        account.setStatus(ServiceStatus.Active.getKey());
+        account.setCompanyId(forCompanyId);
+        account.setCreated(now);
+        account.setUpdated(now);
+        requestInfoUpdate = accountHelper.fillAccountFromRelation(account, userRequest.getId(), false);
+        if (requestInfoUpdate != null) {
+            log.debug("Stop make new account, cause error: {}", requestInfoUpdate.getMessage());
+            return requestInfoUpdate;
+        }
+
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
+        imdgTransaction.beginTransaction();
+        boolean txOk = false;
+        Long informationAccountId = -1L;
+        Long accountId = -1L;
+        InformationAccount informationAccount = null;
+        try {
+            Imdg<InformationAccount> informationAccountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class);
+            Imdg<Account> accountImdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+            accountId = accountImdg.insert(account);
+
+            informationAccount = new InformationAccount();
+            informationAccount.setId(newId);
+            informationAccount.setAccountId(accountId);
+            informationAccount.setClearingAccountId(anltAccountId);
+            informationAccount.setCompanyId(userRequest.getRequestPayload().getCompanyId());
+            informationAccountId = informationAccountImdg.insert(informationAccount);
+            txOk = true;
+        } finally {
+            if (txOk) {
+                imdgTransaction.commitTransaction();
+                log.debug("successfully processed, new information account id {}, new account id {}",
+                        informationAccountId,
+                        accountId);
+            } else {
+                log.debug("failed insert, new information account id {}, new account id {} (if id = -1 then insert is failed)",
+                        informationAccountId,
+                        accountId);
+                imdgTransaction.rollbackTransaction();
+            }
+        }
+
+        // send to kafka
+        sendNotificationToReport(informationAccount, account);
+
+        return null;
+    }
+
+
+    /**
+     * Формирование уведолмения о регистрации УК
+     */
+    protected void sendNotificationToReport(InformationAccount informationAccount, Account account) {
+        NotificationRequest request = new NotificationRequest();
+        request.setConsumerId(account.getCompanyId());
+        log.debug("Send message to kafka \"{}\": {}", Consts.CREATE_NOTIFICATION_NTCR, LogFormatter.toStringWrapper(request));
+        kafkaSender.sendRequestToQueue(Consts.CREATE_NOTIFICATION_NCMP, request);
+    }
+
     public String generateInfoAccount(Long id) {
         return "%d%d%08d%d".formatted(39911, 810, id, 7000);
     }
 
+
+    /**
+     * Сквозной номер инфо-счетов
+     *
+     * @return infoCounter++
+     */
+    public synchronized Long accountNextId() {
+        if (infoCounter == null) synchronized (this) {
+            if (infoCounter == null) {
+                log.debug("Init account-information counter.");
+                Collection<Account> allInfoAcc = accountImdg.getCollectionObjectsByFieldValues(Map.of("accountType", AccountType.Info.getKey()));
+                if (allInfoAcc.isEmpty()) {
+                    infoCounter = new AtomicLong(1);
+                    log.debug("No account information on map. n={}", infoCounter.get());
+                } else {
+                    Pattern accPattern = Pattern.compile("39911810([0-9]{8})7000");
+                    int maxN = 1;
+                    int parsedCount = 0;
+                    String lastAccount = null; // for debug
+                    for (Account acc : allInfoAcc) {
+                        try {
+                            String number = acc.getAccount();
+                            if (StringUtils.isEmpty(number)) continue;
+                            lastAccount = number;
+                            Matcher m = accPattern.matcher(number);
+                            if (m.find()) {
+                                String seqNumber = m.group(1);
+                                if (StringUtils.isNotEmpty(seqNumber)) {
+                                    int accN = Integer.parseInt(seqNumber);
+                                    if (accN > maxN) maxN = accN;
+                                }
+                                parsedCount++;
+                            }
+                        } catch (Exception errParse) {
+                            log.warn("Error parse account {}: {}", acc.getId(), ExceptionUtils.getStackTrace(errParse));
+                        }
+                    }
+                    infoCounter = new AtomicLong(maxN);
+                    log.debug("Parsed {} information accounts ({} pattern match) in map. n={}",
+                            allInfoAcc.size(), parsedCount, infoCounter.get());
+                    if (parsedCount == 0 && lastAccount != null)
+                        log.debug("Last unparseable account: {}", lastAccount);
+                }
+            }
+        }
+        return infoCounter.incrementAndGet();
+    }
+
 }

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

@@ -0,0 +1,160 @@
+package ru.spcex.clearing.account.service;
+
+import org.apache.commons.lang3.tuple.Triple;
+import org.apache.kafka.clients.producer.Producer;
+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_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;
+    protected final KafkaSender kafkaSender;
+
+    protected final ImdgProvider imdgProvider;
+    protected final ImdgId idGenerator;
+
+    private final Imdg<SDf52> sdf52Imdg;
+
+    public SDFProcessService(
+            Producer<String, Object> kafkaResponseQueue,
+            KafkaSender kafkaSender,
+            ImdgProvider imdgProvider) {
+        this.kafkaResponseQueue = kafkaResponseQueue;
+        this.kafkaSender = kafkaSender;
+        this.imdgProvider = imdgProvider;
+        this.idGenerator = imdgProvider.getImdgIdGenerator();
+
+        this.sdf52Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf52, SDf52.class);
+    }
+
+    public Collection<SDf52> sdfsByGroupId(Long generationId) {
+        Collection<SDf52> sdfs = sdf52Imdg.getCollectionObjectsByFieldValues(Map.of(
+                "generationId", generationId
+        ));
+        return sdfs;
+    }
+
+    public void process(StatementRequest req, List<Triple<SDf52, Account, String>> toProcessSDF53) {
+        final Long generationId = req.getGroupId();
+        log.info("Create S_DF53 generationId={} by {} S_DF_52",
+                generationId, toProcessSDF53.size());
+        ImdgTransaction imdgTransaction = imdgProvider.newTransaction();
+        boolean txOk = false;
+        imdgTransaction.beginTransaction();
+        HashSet<String> fileNames = new HashSet<>();
+        try { // 2. обновление данных, в транзакции
+            Imdg<SDf53> sdf53Imdg = imdgTransaction.getImdg(IMDGDistributedNames.Map_SDf53, SDf53.class);
+
+            Instant now = Instant.now();
+            for (Triple<SDf52, Account, String> item : toProcessSDF53) {
+                SDf53 sDf53 = createBy(item.getLeft(), item.getRight(), now, generationId);
+                sdf53Imdg.insert(sDf53);
+                fileNames.add(item.getLeft().getFileName());
+            }
+
+            txOk = true;
+        } finally {
+            if (txOk) {
+                imdgTransaction.commitTransaction();
+            } else {
+                log.debug("failed create new SDF53, rollback transaction. sdf52 generationId={}", generationId);
+                imdgTransaction.rollbackTransaction();
+            }
+        }
+
+        if (fileNames.size() > 1)
+            log.warn("generationId={}, too many different file names in S_DF52: {}", generationId, fileNames);
+        String fileNameSingle = fileNames.stream().filter(Objects::nonNull).findAny().orElse(null);
+        log.info("Send export command for SDF53 generationId={} with source file name {}",
+                generationId, (fileNameSingle == null ? null : "\"" + fileNameSingle + "\""));
+        messageStatementToExport53(generationId, fileNameSingle);
+    }
+
+    SDf53 createBy(SDf52 sdf52, String result, Instant now, Long newGenerationId) {
+        SDf53 newSdf = new SDf53();
+        newSdf.setId(idGenerator.nextId());
+        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);
+        newSdf.setGenerationId(sdf52.getGenerationId());
+        if (!Objects.equals(newGenerationId, newSdf.getGenerationId())) { // never
+            log.warn("Different GenerationId={} for sdf53[{}] and GenerationId={} for group of sdf52",
+                    newSdf.getGenerationId(), newSdf.getId(), newGenerationId
+            );
+        }
+        newSdf.setInSDfId(sdf52.getId());
+        return newSdf;
+    }
+
+
+    /**
+     * @param status sdf.getStatus()
+     * @return AccountStatus или null
+     */
+    public AccountStatus parseSdf52Status(Long status) {
+        if (SDF52_STATUS_1Unblocked.equals(status) || SDF52_STATUS_3Open.equals(status)) {
+            return AccountStatus.ACTIVE;
+        } else if (SDF52_STATUS_0Blocked.equals(status)) {
+            return AccountStatus.BLOCKED;
+        }
+        if (SDF52_STATUS_2Closed.equals(status)) {
+            return AccountStatus.CLOSE;
+        }
+        return null;
+    }
+
+
+    void messageStatementToExport53(Long groupId, String fileName) {
+        final String destination = Consts.EXPORT_PROCESS; // dbf-exporter
+        ExportToFileRequest request = new ExportToFileRequest();
+        request.setNameOfTable("DF-53"); // SdfTable.SDF_53
+        request.setSdfGroupId(groupId);
+        request.setFileName(fileName);
+        Long msgId = kafkaSender.sendRequestToQueue(destination, request);
+        log.debug("Send ExportToFileRequest({}, {}) message id={} to kafka \"{}\"",
+                groupId, request.getNameOfTable(), msgId, destination);
+    }
+
+}

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

@@ -18,30 +18,30 @@ 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.ClientCodeNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.clearing.CreateRegistryRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.reports.NotificationRequest;
+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;
 import ru.spcex.platform.enumeration.ServiceStatus;
 import ru.spcex.platform.enumeration.TradingClearingRegistryPurpose;
 import ru.spcex.platform.enumeration.TradingClearingRegistryType;
 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.IMessageResolver;
 import ru.spcex.platform.utils.validation.IValidator;
 
 import java.time.Instant;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 
 @Service
@@ -51,6 +51,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
     private final ValidationHelper validationHelper;
     private final UserRoleVerification userRoleVerification;
 
+    private final ImdgProvider imdgProvider;
     private final Imdg<TradingClearingRegistry> tradingClearingRegistryImdg;
     private final Imdg<DepoAccount> depoAccountImdg;
     private final Imdg<ClearingAccount> clearingAccountImdg;
@@ -62,12 +63,16 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
     private final Function<TradingClearingRegistryUpdateRequest, IValidator> tradingClearingRegistryUpdateRequestValidator;
     private final RequestHelper requestHelper;
     private final Function<TradingClearingRegistryNewRequest, IValidator> tradingClearingRegistryNewRequestValidator;
+    private final Function<TradingClearingRegistryNewRequest, IValidator> tradingClearingRegistryAutoNewRequestValidator;
     private final Function<CommonIdRequest, IValidator> tradingClearingRegistryBlockRequestValidator;
 
     private final IMessageResolver messageResolver;
+    private final Producer<String, Object> kafkaProducer;
+    private final KafkaSender kafkaSender;
 
     public TradingClearingRegistryService(Consumer<String, Object> kafkaQueue,
                                           Producer<String, Object> kafkaProducer,
+                                          KafkaSender kafkaSender,
                                           ImdgProvider imdgProvider,
                                           ValidationHelper validationHelper,
                                           UserRoleVerification userRoleVerification,
@@ -80,19 +85,21 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
                                           @Qualifier("tradingClearingRegistryBlockRequest")
                                                   Function<CommonIdRequest, IValidator> tradingClearingRegistryBlockRequestValidator) {
         super(kafkaQueue, kafkaProducer);
+        this.kafkaProducer = kafkaProducer;
+        this.kafkaSender = kafkaSender;
         this.validationHelper = validationHelper;
         this.userRoleVerification = userRoleVerification;
         this.requestHelper = requestHelper;
-        this.tradingClearingRegistryNewRequestValidator = tradingClearingRegistryNewRequestValidator;
-        this.tradingClearingRegistryImdg = imdgProvider.getImdg(
-                IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class
-        );
+        this.imdgProvider = imdgProvider;
+        this.tradingClearingRegistryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
         this.depoAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
         this.clearingAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
         this.informationAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_InformationAccount, InformationAccount.class);
         this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
         this.relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
+        this.tradingClearingRegistryNewRequestValidator = tradingClearingRegistryNewRequestValidator;
+        this.tradingClearingRegistryAutoNewRequestValidator = tradingClearingRegistryNewRequestValidator; // без relation.
         this.tradingClearingRegistryUpdateRequestValidator = tradingClearingRegistryUpdateRequestValidator;
         this.tradingClearingRegistryBlockRequestValidator = tradingClearingRegistryBlockRequestValidator;
         this.messageResolver = messageResolver;
@@ -100,27 +107,29 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        init();
-        callback(TradingClearingRegistryNewRequest.class)
-                .setConsumer(this::tradingClearingRegistryAutoNew)
+        imdgProvider.waitAvailable();
+        callback(TradingClearingRegistryNewRequest.class) // todo deprecated - unused.
+                .setFunction(this::tradingClearingRegistryAutoNew)
                 .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, callbacks::put);
         callback(TradingClearingRegistryNewRequest.class)
-                .setConsumer(this::tradingClearingRegistryNew)
+                .setFunction(this::tradingClearingRegistryNew)
                 .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_NEW, callbacks::put);
         callback(TradingClearingRegistryUpdateRequest.class)
-                .setConsumer(this::tradingClearingRegistryUpdate)
+                .setFunction(this::tradingClearingRegistryUpdate)
                 .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE, callbacks::put);
         callback(CommonIdRequest.class)
-                .setConsumer(this::tradingClearingRegistryBlock)
+                .setFunction(this::tradingClearingRegistryBlock)
                 .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_BLOCK, callbacks::put);
+        init();
     }
 
+    @Deprecated
     public RequestInfoUpdate tradingClearingRegistryAutoNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
         log.debug("TradingClearingRegistryNewRequest received");
         RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
-        requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, tradingClearingRegistryNewRequestValidator);
+        requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, tradingClearingRegistryAutoNewRequestValidator);
         if (requestInfoUpdate != null) return requestInfoUpdate;
 
         TradingClearingRegistryNewRequest req = userRequest.getRequestPayload();
@@ -130,79 +139,75 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         tradingClearingRegistry.setId(id);
         tradingClearingRegistry.setCompanyId(req.getCompanyId());
         tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
-        tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId());
+        tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
 
-        DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
-        Account depoAccountMain = depoAccount != null ? accountImdg.getSingleObjectByID(depoAccount.getAccountId()) : null;
+        Account depoAccountMain = req.getDepoAccountId() != null ? accountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
+        DepoAccount depoAccount = depoAccountMain != null ? depoAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", req.getDepoAccountId())) : null;
 
+//        InformationAccount infoAccount = null;
+        ClearingAccount clearingAccount = null;
+        Account accountMain = null;
+        if (req.getMoneyAccountId() != null) {
+            clearingAccount = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", req.getMoneyAccountId()));
+//        if (clearingAccount == null) infoAccount = informationAccountImdg.getSingleObjectByFieldValues(Map.of("accountId", req.getMoneyAccountId()));
+            Long accountId = req.getMoneyAccountId(); //clearingAccount != null ? clearingAccount.getAccountId() : infoAccount.getAccountId();
+            accountMain = accountImdg.getSingleObjectByID(accountId);
+        }
+
+        // кроссвалидация
+        if (req.getMoneyAccountId() == null && (req.getMoneyAccountId() == null || req.getDepoAccountId() == null)) {
+            TradingClearingRegistry registryByCompany = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
+            if (registryByCompany == null) {
+                log.trace("Not found registry with companyId={}",
+                        req.getCompanyId());
+                return requestHelper.makeErrorResponse(userRequest,
+                        AccountError.TradingClearingRegistryNotFound,
+                        req.getCompanyId());
+            }
+        }
+
+        if (tradingClearingRegistry.getMoneyAccountId() == null && tradingClearingRegistry.getDepoAccountId() != null) {
+            Collection<TradingClearingRegistry> registriesByCompany = tradingClearingRegistryImdg.getCollectionObjectsByFieldValues(Map.of("companyId", req.getCompanyId()));
+            TradingClearingRegistry targetExistTradingClearingRegistry = null;
+            for (TradingClearingRegistry existRegistry : registriesByCompany) {
+                if (existRegistry.getMoneyAccountId() != null && existRegistry.getDepoAccountId() == null) {
+                    targetExistTradingClearingRegistry = existRegistry;
+                }
+            }
+            if (targetExistTradingClearingRegistry == null) {
+                log.warn("TradingClearingRegister with MoneyAccountId for companyId={} not found. Search exist accounts for company", req.getCompanyId());
+                Long accountId;
                 InformationAccount infoAccount = null;
-        ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
-        if (clearingAccount == null) infoAccount = informationAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
-        Long accountId = clearingAccount != null ? clearingAccount.getAccountId() : infoAccount.getAccountId();
-        Account accountMain = accountImdg.getSingleObjectByID(accountId);
-
-
-        // TODO
-        //  Проверка выглядит очень сложно и запутанно, потому что репортеры сами не до конца понимают, какая она должна быть.
-        //  Пока что она соответствует ТЗ, но возможно будет правиться, поэтому расписана без выноса кода в методы и
-        //  прочих методов сокращения кода. В дальнейшем, после тестирования и окончательного выяснения вида проверки,
-        //  её стоит вынести на этап валидации запроса.
-        Relation relation = relationImdg.getSingleObjectByFieldValues(Map.of("consumerId", req.getCompanyId()));
-        if (ru.spcex.platform.enumeration.Service.MKR.equalsByKey(relation.getService())) {
-            TradingClearingRegistry registry = tradingClearingRegistryImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
-            if (registry != null) {
-                return requestHelper.makeErrorResponse(userRequest,
-                        AccountError.TradingClearingRegistryAlreadyExist,
-                        req.getCompanyId(),
-                        registry.getId());
+                clearingAccount = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
+                if (clearingAccount == null) {
+                    infoAccount = informationAccountImdg.getFirstObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
+                    if (infoAccount == null) {
+                        log.warn("ClearingAccount and InfoAccount not exist for company {}.", req.getCompanyId());
+                        accountId = null;
+                    } else {
+                        accountId = infoAccount.getAccountId();
+                        log.debug("Found account.id={} and infoaccount.id={} by companyId={}", accountId, infoAccount.getId(), req.getCompanyId());
                     }
-            DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
-            if (depoAccountForCheck == null)
-                return requestHelper.makeErrorResponse(userRequest, AccountError.DepoAccountNotFound, req.getCompanyId());
-        } else if (ru.spcex.platform.enumeration.Service.FOND.equalsByKey(relation.getService())) {
-            if (AccountType.Info.equalsByKey(accountMain.getStatus())) {
-                TradingClearingRegistry registry = tradingClearingRegistryImdg.getSingleObjectByFieldValues(Map.of(
-                        "companyId", req.getCompanyId(),
-                        "tradingClearingRegistryType", TradingClearingRegistryPurpose.M.getKey()
-                ));
-                if (registry != null) {
-                    return requestHelper.makeErrorResponse(userRequest,
-                            AccountError.TradingClearingRegistryAlreadyExist,
-                            req.getCompanyId(),
-                            registry.getId());
+                } else {
+                    accountId = clearingAccount.getAccountId();
+                    log.debug("Found account.id={} and clearingAccount.id={} by companyId={}", accountId, clearingAccount.getId(), req.getCompanyId());
                 }
-                DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
-                if (depoAccountForCheck == null)
-                    return requestHelper.makeErrorResponse(userRequest, AccountError.DepoAccountNotFound, req.getCompanyId());
-            } else if (AccountType.Clrn.equalsByKey(accountMain.getStatus())) {
-                ImdgPredicateBuilder imdgPredicateBuilder = tradingClearingRegistryImdg.predicateBuilder();
-                ImdgPredicate predicate = imdgPredicateBuilder.and(
-                        imdgPredicateBuilder.equals("companyId", req.getCompanyId()),
-                        imdgPredicateBuilder.or(
-                                imdgPredicateBuilder.equals("tradingClearingRegistryPurpose", TradingClearingRegistryPurpose.M.getKey()),
-                                imdgPredicateBuilder.equals("tradingClearingRegistryPurpose", TradingClearingRegistryPurpose.C.getKey())
-                        )
-                );
-                Collection<TradingClearingRegistry> registry = tradingClearingRegistryImdg.getCollectionObjectsByPredicate(predicate);
-                if (!registry.isEmpty()) {
-                    return requestHelper.makeErrorResponse(userRequest,
-                            AccountError.TradingClearingRegistryAlreadyExist,
-                            req.getCompanyId(),
-                            registry.iterator().next().getId());
+                if (accountId != null) {
+                    accountMain = accountImdg.getSingleObjectByID(accountId);
+                    if (accountMain == null) { // never, только с инконсистентными данными
+                        log.warn("Account {} not exist.", accountId);
+                    } else {
+                        tradingClearingRegistry.setMoneyAccountId(accountId);
+                        log.debug("Set tradingClearingRegistry[{}].MoneyAccountId={}", tradingClearingRegistry.getId(), accountId);
                     }
-                DepoAccount depoAccountForCheck = depoAccountImdg.getSingleObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
-                if (depoAccountForCheck == null) {
-                    return requestHelper.makeErrorResponse(userRequest, AccountError.DepoAccountNotFound, req.getCompanyId());
                 }
-            } else if (AccountType.Depo.equalsByKey(accountMain.getStatus())) {
-                InformationAccount infoAccountForCheck = informationAccountImdg.getSingleObjectByFieldValues(
-                        Map.of("companyId", req.getCompanyId())
-                );
-                ClearingAccount clearingAccountForCheck = clearingAccountImdg.getSingleObjectByFieldValues(
-                        Map.of("companyId", req.getCompanyId())
-                );
-                if (infoAccountForCheck == null && clearingAccountForCheck == null)
-                    return requestHelper.makeErrorResponse(userRequest, AccountError.MoneyAccountNotFound, req.getCompanyId());
+            } else {
+                log.debug("Update exist TCR.id={}, set DepoAccountId={}", targetExistTradingClearingRegistry, req.getDepoAccountId());
+                targetExistTradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
+                targetExistTradingClearingRegistry.setUpdated(Instant.now());
+                tradingClearingRegistryImdg.update(targetExistTradingClearingRegistry);
+                log.debug("successfully processed, id {}. Updated exist TradingClearingRegistry.id={}", id, targetExistTradingClearingRegistry.getId());
+                return null;
             }
         }
 
@@ -246,10 +251,9 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
 
         Company company = companyImdg.getSingleObjectByID(req.getCompanyId());
-        String code = "%4s".formatted(company.getClearingCode()).replace(' ', '0');
-        code += registryPurpose.getKey();
-        if (registryPurpose == TradingClearingRegistryPurpose.C) code += tradingRegistryType + id;
-        else code += "AT" + id;
+        Long seqId = companySequenceNextId(req.getCompanyId(), registryPurpose, tradingRegistryType);
+        String code = makeCode(company.getClearingCode(), registryPurpose, tradingRegistryType, seqId);
+        log.debug("For new TCR.id={} of companyId={} next sequence={}; code={}", id, req.getCompanyId(), seqId, code);
         tradingClearingRegistry.setCode(code);
 
         Instant now = Instant.now();
@@ -257,35 +261,62 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         tradingClearingRegistry.setUpdated(now);
 
         tradingClearingRegistryImdg.insert(tradingClearingRegistry);
+        log.debug("New TCR.id={} was created", tradingClearingRegistry.getId());
+
+//        sendNotificationToCompanySvc(tradingClearingRegistry); при автосоздании ТКР в company-service не отправлять.
+//        sendNotificationToClearingSvc(tradingClearingRegistry);
+        sendNotificationToReportSvc(tradingClearingRegistry);
+        sendNotificationToClearingSvc(tradingClearingRegistry);
 
         log.debug("successfully processed, id {}", id);
         return null;
     }
 
-    public RequestInfoUpdate tradingClearingRegistryNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
+    public synchronized RequestInfoUpdate tradingClearingRegistryNew(BaseRequest<TradingClearingRegistryNewRequest> userRequest) {
         log.debug("TradingClearingRegistryNewRequest received");
         RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
+        if (requestInfoUpdate != null) {
+            return requestInfoUpdate;
+        }
 
         requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, tradingClearingRegistryNewRequestValidator);
-        if (requestInfoUpdate != null) return requestInfoUpdate;
+        if (requestInfoUpdate != null) {
+            return requestInfoUpdate;
+        }
 
         TradingClearingRegistryNewRequest req = userRequest.getRequestPayload();
+        // Дополнительная проверка
+        if (req.getMoneyAccountId() == null && (req.getMoneyAccountId() == null || req.getDepoAccountId() == null)) {
+            TradingClearingRegistry registryByCompany = tradingClearingRegistryImdg.getFirstObjectByFieldValues(Map.of("companyId", req.getCompanyId()));
+            if (registryByCompany == null) {
+                return requestHelper.makeErrorResponse(userRequest,
+                        AccountError.TradingClearingRegistryNotFound,
+                        "companyId=" + req.getCompanyId());
+            }
+        }
 
         Long id = tradingClearingRegistryImdg.nextIDSequenceFor();
         TradingClearingRegistry tradingClearingRegistry = new TradingClearingRegistry();
         tradingClearingRegistry.setId(id);
         tradingClearingRegistry.setCompanyId(req.getCompanyId());
         tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
-        tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId());
+        tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
 
-        DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
-        ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId());
+        DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", req.getDepoAccountId())) : null;
+        ClearingAccount clearingAccount = req.getMoneyAccountId() != null ? clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", req.getMoneyAccountId())) : null;
 
+        if (req.getStatus() == null) {
             tradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
+            log.trace("TCR status in request not set. Use default: {}", tradingClearingRegistry.getStatus());
+        } else {
+            tradingClearingRegistry.setStatus(req.getStatus());
+            log.trace("TCR status in request set: {}", tradingClearingRegistry.getStatus());
+        }
 
         String tradingRegistryType;
-        if (depoAccount != null) {
+        if (req.getTradingClearingRegistryType() != null) {
+            tradingRegistryType = req.getTradingClearingRegistryType();
+        } else if (depoAccount != null) {
             tradingRegistryType = depoAccount.getDepoAccountType();
         } else {
             if (clearingAccount != null) tradingRegistryType = clearingAccount.getClearingAccountType();
@@ -299,10 +330,9 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         tradingClearingRegistry.setTradingClearingRegistryPurpose(registryPurpose.getKey());
 
         Company company = companyImdg.getSingleObjectByID(req.getCompanyId());
-        String code = "%4s".formatted(company.getClearingCode()).replace(' ', '0');
-        code += registryPurpose.getKey();
-        if (registryPurpose == TradingClearingRegistryPurpose.C) code += tradingRegistryType + id;
-        else code += "AT" + id;
+        Long seqId = companySequenceNextId(req.getCompanyId(), registryPurpose, tradingRegistryType);
+        String code = makeCode(company.getClearingCode(), registryPurpose, tradingRegistryType, seqId);
+        log.debug("For new TCR.id={} of companyId={} next sequence={}; code={}", id, req.getCompanyId(), seqId, code);
         tradingClearingRegistry.setCode(code);
 
         Instant now = Instant.now();
@@ -310,11 +340,70 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         tradingClearingRegistry.setUpdated(now);
 
         tradingClearingRegistryImdg.insert(tradingClearingRegistry);
+        log.info("New TCR.id={} was created.", tradingClearingRegistry.getId());
+
+        sendNotificationToReportSvc(tradingClearingRegistry);
+        sendNotificationToClearingSvc(tradingClearingRegistry);
 
         log.debug("successfully processed, id {}", id);
         return null;
     }
 
+    protected Long companySequenceNextId(Long companyId, TradingClearingRegistryPurpose registryPurpose, String tradingRegistryType) {
+        ImdgPredicateBuilder pb = tradingClearingRegistryImdg.predicateBuilder();
+        Collection<TradingClearingRegistry> existTCR = tradingClearingRegistryImdg.getCollectionObjectsByPredicate(
+                pb.and(
+                        pb.equals("companyId", companyId),
+                        pb.equals("tradingClearingRegistryPurpose", registryPurpose.getKey()),
+                        pb.equals("tradingClearingRegistryType", tradingRegistryType)
+                )
+        );
+        if (existTCR.isEmpty()) {
+            log.trace("For company id={} not found exist TCR.", companyId);
+            return 1L;
+        }
+        log.trace("For company id={} found {} exist TCR.", companyId, existTCR.size());
+        long maxN = 0;
+        for (TradingClearingRegistry tcr : existTCR) {
+            Long codeN = parseCodeSeqId(tcr.getCode());
+            if (codeN != null) {
+                if (maxN < codeN)
+                    maxN = codeN;
+            }
+        }
+        return maxN + 1;
+    }
+
+    protected Long parseCodeSeqId(String code) {
+        if (code == null || code.isBlank())
+            return null;
+        try {
+            String toParse = code.trim();
+            if (toParse.length() > 5)
+                toParse = toParse.substring(toParse.length() - 5);
+            return Long.parseLong(toParse);
+        } catch (NumberFormatException nan) {
+            log.warn("Can not parse number from TCR code \"{}\": {}", code, nan.getMessage());
+        }
+        return null;
+    }
+
+    protected String makeCode(String companyClearingCode, TradingClearingRegistryPurpose registryPurpose, String tradingRegistryType, Long id) {
+        String code;
+        code = companyClearingCode;
+        if (code.length() > 4)
+            code = code.substring(code.length() - 4);
+        code = "%4s".formatted(code).replace(' ', '0');
+        code += registryPurpose.getKey(); // C / M / ...
+        String trType = tradingRegistryType + "T"; // 2 символа
+        code += trType;
+        String sId = "%5s".formatted(id).replace(' ', '0');
+        if (sId.length() > 5)
+            sId = sId.substring(sId.length() - 5);
+        code += sId;
+        return code; // 12 имволов
+    }
+
     public RequestInfoUpdate tradingClearingRegistryUpdate(BaseRequest<TradingClearingRegistryUpdateRequest> userRequest) {
         log.debug("TradingClearingRegistryUpdateRequest received");
         RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest);
@@ -326,12 +415,26 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         TradingClearingRegistryUpdateRequest req = userRequest.getRequestPayload();
         TradingClearingRegistry tradingClearingRegistry = tradingClearingRegistryImdg.getSingleObjectByID(req.getId());
 
-        if (req.getStatus() != null) tradingClearingRegistry.setStatus(req.getStatus());
+        // кроссвалидация - нельзя менять эти поля:
+        if (req.getMoneyAccountId() != null && !req.getMoneyAccountId().equals(tradingClearingRegistry.getMoneyAccountId())) {
+            return requestHelper.makeErrorResponse(userRequest, AccountError.WrongFieldValue, "MoneyAccountId", req.getMoneyAccountId());
+        }
+        if (req.getDepoAccountId() != null && !req.getDepoAccountId().equals(tradingClearingRegistry.getDepoAccountId())) {
+            return requestHelper.makeErrorResponse(userRequest, AccountError.WrongFieldValue, "DepoAccountId", req.getDepoAccountId());
+        }
+//        tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
+//        tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
 
+
+        if (req.getStatus() != null && !Objects.equals(req.getStatus(), tradingClearingRegistry.getStatus())) {
             Instant now = Instant.now();
             tradingClearingRegistry.setUpdated(now);
-
+            tradingClearingRegistry.setStatus(req.getStatus());
             tradingClearingRegistryImdg.update(tradingClearingRegistry);
+            log.debug("Update TCR.id={}.", tradingClearingRegistry.getId());
+        } else {
+            log.debug("Nothing to update TCR.id={}.", tradingClearingRegistry.getId());
+        }
 
         log.debug("successfully processed, id {}", tradingClearingRegistry.getId());
         return null;
@@ -356,4 +459,40 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         log.debug("successfully processed, id {}", tradingClearingRegistry.getId());
         return null;
     }
+
+
+    /**
+     * company-service сообщение об успешном добавлении ТКР клиента с параметром tradingClearingRegistry.code
+     */
+    protected void sendNotificationToCompanySvc(TradingClearingRegistry tradingClearingRegistry) {
+        ClientCodeNewRequest request = new ClientCodeNewRequest();
+        request.setTradingClearingRegistryId(tradingClearingRegistry.getId());
+        request.setCompanyId(tradingClearingRegistry.getCompanyId());
+        request.setCode(tradingClearingRegistry.getCode());
+        request.setMoneyAccountId(tradingClearingRegistry.getMoneyAccountId());
+        request.setDepoAccountId(tradingClearingRegistry.getDepoAccountId());
+        log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, LogFormatter.toStringWrapper(request));
+        kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, request);
+    }
+
+    /**
+     * clearing-service сообщение на открытие клиринговых регистров;
+     */
+    protected void sendNotificationToClearingSvc(TradingClearingRegistry tradingClearingRegistry) {
+        CreateRegistryRequest request = new CreateRegistryRequest();
+        request.setCompanyId(tradingClearingRegistry.getCompanyId());
+        request.setTradingClearingRegistryId(tradingClearingRegistry.getId());
+        log.debug("Send message to kafka \"{}\": {}", Consts.REGISTRY_NEW, LogFormatter.toStringWrapper(request));
+        kafkaSender.sendRequestToQueue(Consts.REGISTRY_NEW, request);
+    }
+
+    /**
+     * report-service сообщение на формирование уведомления о создании нового ТКР
+     */
+    protected void sendNotificationToReportSvc(TradingClearingRegistry tradingClearingRegistry) {
+        NotificationRequest request = new NotificationRequest();
+        request.setConsumerId(tradingClearingRegistry.getCompanyId());
+        log.debug("Send message to kafka \"{}\": {}", Consts.CREATE_NOTIFICATION_NTCR, LogFormatter.toStringWrapper(request));
+        kafkaSender.sendRequestToQueue(Consts.CREATE_NOTIFICATION_NTCR, request);
+    }
 }

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

@@ -38,7 +38,7 @@ public enum AccountValidationRule implements IValidationRule<ImdgValidationConte
         public Optional<EnumMessage> validate(ImdgValidationContext<BankAccountNewRequest> context) {
             BankAccountNewRequest bankAccountRequest = context.getValidatedObject();
             Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
-            Account account = accountImdg.getSingleObjectByFieldValues(Map.of("account", bankAccountRequest.getAccount(),
+            Account account = accountImdg.getFirstObjectByFieldValues(Map.of("account", bankAccountRequest.getAccount(),
                     "accountStatus", Status.Active.getKey()));
             if (account != null) {
                 return of(AccountError.AccountAlreadyExist);

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

@@ -1,70 +0,0 @@
-package ru.spcex.clearing.account.config;
-
-import com.hazelcast.config.*;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams;
-import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
-import ru.spcex.platform.imdg.iml.hazelcast.util.HazelcastHelper;
-
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-@Configuration
-public class HazelcastServiceTestConfiguration {
-    public static final AtomicLong currentID = new AtomicLong(0L);
-    private HazelcastInstance hazelcastInstance;
-
-    private static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int maxPoolSz, boolean waitForCompletion) {
-        ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor();
-        if (maxPoolSz > 2) {
-            pool.setKeepAliveSeconds(60);
-            pool.setAllowCoreThreadTimeOut(true);
-        }
-        pool.setCorePoolSize(maxPoolSz);
-        pool.setWaitForTasksToCompleteOnShutdown(waitForCompletion);
-        return pool;
-    }
-
-    @Bean(name = "hazelcastServiceTest")
-    public HazelcastService hazelcastService(@Qualifier("taskExecutorHazelcastClientInitializer") ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer, @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter, HazelcastClientParams params) {
-        Config cfg = new Config();
-        cfg.setInstanceName("localhost");
-
-        NetworkConfig networkConfig = new NetworkConfig();
-        JoinConfig joinConfig = new JoinConfig();
-        joinConfig.setMulticastConfig(new MulticastConfig().setEnabled(false));
-        joinConfig.setTcpIpConfig(new TcpIpConfig().setEnabled(true).setMembers(List.of("127.0.0.1")));
-        networkConfig.setJoin(joinConfig);
-        cfg.setNetworkConfig(networkConfig);
-        hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg);
-        HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance);
-        return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params);
-    }
-
-    @Bean(name = "taskExecutorHazelcastClientInitializer")
-    public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer() {
-        return createThreadPoolTaskExecutor(1, true);
-    }
-
-    @Bean(name = "taskExecutorIdGeneratorAwaiter")
-    public ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter() {
-        return createThreadPoolTaskExecutor(1, false);
-    }
-
-    @Bean(name = "hazelcastClientParams")
-    public HazelcastClientParams getHazelcastClientParams() {
-        HazelcastClientParams params = new HazelcastClientParams();
-        params.setLogin("dev");
-        params.setPassword("dev-pass");
-        params.setClusterMembers("127.0.0.1");
-        params.setInstanceName("hzTestClient" + new Random().nextInt());
-        params.setNearCacheConfig(new NearCacheConfig());
-        return params;
-    }
-}

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

@@ -1,44 +0,0 @@
-package ru.spcex.clearing.account.config;
-
-
-import org.apache.kafka.clients.consumer.MockConsumer;
-import org.apache.kafka.clients.consumer.OffsetResetStrategy;
-import org.apache.kafka.clients.producer.Producer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.service.RequestInfo;
-import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgId;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-
-@Configuration
-public class KafkaConfigTest {
-
-    @Autowired
-    @Bean(name = "kafkaSenderTest")
-    public KafkaSender kafkaSender(Producer<String, Object> kafkaProducer, @Qualifier("hazelcastServiceTest") ImdgProvider imdgProvider) {
-        ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
-        return KafkaSender
-                .setup()
-                .producer(kafkaProducer)
-                .idGenerator(imdgIdGenerator::nextId)
-                .imdgProvider(s -> {
-                    Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
-                    return imdg::insert;
-                })
-                .build();
-    }
-
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    @Bean(name = "mockConsumerTest")
-    public MockConsumer<String, Object> createConsumer() {
-        return new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-    }
-
-}

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

@@ -1,9 +1,8 @@
 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;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,40 +20,29 @@ import ru.clearing.classes.statics.data.company.relation.Relation;
 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.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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.platform.messaging.service.Status;
+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.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 org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration.currentID;
-import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.account.utils.TestUtils.*;
+import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -62,13 +50,15 @@ import static ru.spcex.clearing.account.utils.TestUtils.*;
         ValidationConfig.class,
         AccountValidationConfig.class,
         AccountService.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        AccountHelper.class,
+        InformationAccountService.class,
+        InformationAccountValidationConfig.class,
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 class AccountServiceTest {
     public static final MatcherFactory.Matcher<Account> ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
     public static final MatcherFactory.Matcher<RequestInfo> REQUEST_INFO_MATCHER_MATCHER = usingIgnoringFieldsComparator("created");
     private static final int PARTITION = 0;
-    private static final String TOPIC_ACCOUNT_NEW = Consts.ACCOUNT_NEW_SDF01;
     private static final String account = "123456789123";
     private static final Long companyId = 0L;
     private static final Long relationId = 0L;
@@ -82,6 +72,9 @@ class AccountServiceTest {
     private ArgumentCaptor<ProducerRecord> producerRecord;
     @SpyBean
     private MockProducer<String, Object> producer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
 
     private Imdg<Account> accountImdg;
     private Imdg<Company> companyImdg;
@@ -136,6 +129,8 @@ class AccountServiceTest {
         relation.setConsumerId(companyId);
         relation.setService(Service.MKR.getKey());
         relationImdg.insert(relation);
+
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     @Test
@@ -163,7 +158,7 @@ class AccountServiceTest {
                 0,
                 jsonString);
 
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account resultNew = accountImdg.getCollectionObjectsByFieldValues(Map.of("account", uniqueAccount)).iterator().next();
         predictableAccount.setId(resultNew.getId());
@@ -190,7 +185,7 @@ class AccountServiceTest {
         correspondentAccountUpdateRequest.setId(accountId);
 
 
-        String jsonString = getJsonStringForUPDATE(correspondentAccountUpdateRequest, 0);
+        String jsonString = getJsonStringForUpdate(correspondentAccountUpdateRequest, 0);
 
         //ACT
         addRecordToKafka((MockConsumer) accountService.getConsumer(),
@@ -200,11 +195,19 @@ class AccountServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account resultUpdating = accountImdg.getSingleObjectByID(accountId);
-        existAccount.setUpdated(resultUpdating.getUpdated());
-        ACCOUNT_MATCHER.assertMatch(resultUpdating, existAccount);
+        Account expectAccount = new Account();
+        expectAccount.setId(existAccount.getId());
+        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);
     }
 
@@ -220,7 +223,7 @@ class AccountServiceTest {
         CommonDeleteRequest commonDeleteRequest = new CommonDeleteRequest();
         commonDeleteRequest.setId(accountId);
 
-        String jsonString = getJsonStringForDELETE(commonDeleteRequest, 0);
+        String jsonString = getJsonStringForDelete(commonDeleteRequest, 0);
 
         //ACT
         addRecordToKafka((MockConsumer) accountService.getConsumer(),
@@ -230,7 +233,7 @@ class AccountServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account resultBlock = accountImdg.getSingleObjectByID(accountId);
         existAccount.setStatus(ServiceStatus.Blocked.getKey());
@@ -240,75 +243,4 @@ class AccountServiceTest {
         accountImdg.delete(resultBlock);
     }
 
-    /**
-     * {@link AccountService#accountNewSdf01(BaseRequest)}<br>
-     * Тест проверяет создание сущности {@link BaseRequest} в Hazelcast при передаче из Apache Kafka.<br>
-     * Входной запрос {@link AccountSdf01Request}:<br>
-     * {@link AccountSdfRequestPart#setSdfId} - текущий Id<br>
-     * {@link AccountSdfRequestPart#setAccount} - 123456789123<br>
-     * {@link AccountSdfRequestPart#setCompanyId} - текущий Id<br>
-     * {@link AccountSdf01Request#setGroupingSdf01Id} - текущий Id<br>
-     * {@link AccountSdf01Request#setAccounts} - Collections.singletonList(AccountSdfRequestPart)<br>
-     */
-    @Test
-    void accountSdf01New() throws InterruptedException {
-        //ARRANGE
-        Long firstID = currentID.getAndIncrement();
-        Long secondID = currentID.getAndIncrement();
-        AccountSdfRequestPart accountSdfRequestPart = new AccountSdfRequestPart();
-        accountSdfRequestPart.setSdfId(firstID);
-        accountSdfRequestPart.setAccount(account);
-        accountSdfRequestPart.setCompanyId(firstID);
-        AccountSdf01Request accountSdf01Request = new AccountSdf01Request();
-        accountSdf01Request.setGroupingSdf01Id(firstID);
-        accountSdf01Request.setAccounts(Collections.singletonList(accountSdfRequestPart));
-        BaseRequest<AccountSdf01Request> baseNewRequest = new BaseRequest<>();
-        baseNewRequest.setRequestPayload(accountSdf01Request);
-        baseNewRequest.setId(firstID);
-        baseNewRequest.setActionType(ActionType.NEW);
-        String jsonBaseNewRequest;
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            jsonBaseNewRequest = objectMapper.writeValueAsString(baseNewRequest);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-
-        AccountSdfToStatementRequestPart responsePart = new AccountSdfToStatementRequestPart();
-        responsePart.setSdfId(firstID);
-        responsePart.setErrorCode(null);
-        responsePart.setErrorText(null);
-        List<AccountSdfToStatementRequestPart> accountToStatement = Collections.singletonList(responsePart);
-        StatementRequest statementRequest = new StatementRequest();
-        statementRequest.setGroupId(firstID);
-        statementRequest.setAccountCreationResults(accountToStatement);
-
-        BaseRequest<Object> baseRequest = new BaseRequest<>();
-        baseRequest.setId(secondID);
-        baseRequest.setActionType(ActionType.SYSTEM);
-        baseRequest.setRequestPayload(statementRequest);
-
-        Account predictableAccount = new Account();
-        predictableAccount.setAccount(account);
-        predictableAccount.setCompanyId(firstID);
-
-        RequestInfo predictableRequestInfo = new RequestInfo();
-        predictableRequestInfo.setId(secondID);
-        predictableRequestInfo.setStatus(Status.Processing);
-
-        //KAFKA
-        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());
-
-        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/AccountSymbolsServiceTest.java

@@ -0,0 +1,164 @@
+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,16 +1,13 @@
 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;
@@ -20,13 +17,10 @@ import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.clearing.platform.dictionary.CurrencyCodeDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
-import ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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;
@@ -35,9 +29,13 @@ 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.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 
@@ -47,20 +45,21 @@ 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.account.utils.TestUtils.*;
 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 = {
-        AccountService.class,
+        AccountHelper.class,
         BankAccountService.class,
         ValidationConfig.class,
         BankAccountValidationConfig.class,
         AccountValidationConfig.class,
         BeanConfiguration.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 public class BankAccountServiceTest {
     public static final Matcher<BankAccount> BANK_ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
     public static final Matcher<Account> ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
@@ -95,15 +94,14 @@ public class BankAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private HazelcastService hazelcastServiceTest;
+    private ImdgProvider hazelcastServiceTest;
 
     @Autowired
     private BankAccountService bankAccountService;
 
-    @Captor
-    private ArgumentCaptor<ProducerRecord> producerRecord;
-    @SpyBean
-    private MockProducer<String, Object> producer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
 
     @PostConstruct
     private void init() {
@@ -124,6 +122,8 @@ public class BankAccountServiceTest {
         currencyCodeDictionary.setCode("RUB");
         currencyCodeDictionary.setName("RUB");
         currencyCodeDictionaryImdg.insert(currencyCodeDictionary);
+
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     /**
@@ -170,10 +170,10 @@ public class BankAccountServiceTest {
 
         //ACT
         addRecordToKafka((MockConsumer) bankAccountService.getConsumer(), TOPIC_ACCOUNT_NEW, PARTITION, 0, jsonString);
-        waitingWhenAddedRecordAndCheckIt(ID, producer, producerRecord);
+        waitingSendAndCheckRecord(ID, mockProducer);
 
-        Account accountResult = accountImdg.getSingleObjectBySQL(String.format("account = %s", acc));
-        BankAccount bankAccountResult = bankAccountImdg.getSingleObjectBySQL(String.format("account = %s or companyId = %s", acc, addresseeIdNew));
+        Account accountResult = accountImdg.getFirstObjectBySQL(String.format("account = %s", acc));
+        BankAccount bankAccountResult = bankAccountImdg.getFirstObjectBySQL(String.format("account = %s or companyId = %s", acc, addresseeIdNew));
         predictableBankAccount.setAccountId(accountResult.getId());
         predictableBankAccount.setId(bankAccountResult.getId());
         setSameValueToField(accountResult, predictableAccount);
@@ -209,11 +209,11 @@ public class BankAccountServiceTest {
         //AccountValidationRule.RequiredFields
         //WrongFieldValue
         bankAccountNewRequest.setCurrency(null);
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "currency"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.RequiredFieldEmpty, "null, currency"));
         checkError(errMsg, bankAccountNewRequest);
 
         bankAccountNewRequest.setCurrency("TT0");
-        errMsg = messageResolver.resolve(new EnumMessage(AccountError.WrongFieldValue, "currency"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.DictionaryNotFound, "TT0, CurrencyCodeDictionary"));
         checkError(errMsg, bankAccountNewRequest);
 
         bankAccountNewRequest.setCurrency(currency);
@@ -232,36 +232,20 @@ 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, "companyId"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.CompanyNotFound, bankAccountNewRequest.getCompanyId()+", 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, "account"));
+        errMsg = messageResolver.resolve(new EnumMessage(AccountError.AccountAlreadyExist, existAccount.getAccount()));
         checkError(errMsg, bankAccountNewRequest);
         accountImdg.delete(existAccount);
     }
@@ -284,8 +268,9 @@ 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(producer, timeout(30_000L).times(currentTime))
+        verify(mockProducer, timeout(30_000L).times(currentTime))
                 .send(producerRecord.capture());
         BaseRequest<Object> baseRequestResult = (BaseRequest<Object>) producerRecord.getValue().value();
 
@@ -343,13 +328,13 @@ public class BankAccountServiceTest {
         bankAccountUpdateRequest.setTaxRegistrationReasonCode(predictableUpdateBankAccount.getTaxRegistrationReasonCode());
         bankAccountUpdateRequest.setAccount(predictableUpdateBankAccount.getAccount());
 
-        String jsonString = getJsonStringForUPDATE(bankAccountUpdateRequest, ID);
+        String jsonString = getJsonStringForUpdate(bankAccountUpdateRequest, ID);
 
         //ACT
         addRecordToKafka((MockConsumer) bankAccountService.getConsumer(), TOPIC_ACCOUNT_UPDATE, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, producer, producerRecord);
+        waitingSendAndCheckRecord(ID, mockProducer);
 
         Account accountResult = accountImdg.getSingleObjectByID(predictableAccount.getId());
         BankAccount resultUpdating = bankAccountImdg.getSingleObjectByID(predictableUpdateBankAccount.getId());
@@ -361,13 +346,13 @@ public class BankAccountServiceTest {
     }
 
     /**
-     * {@link BankAccountService#bankAccountDelete(BaseRequest)}
+     * {@link BankAccountService#bankAccountBlock(BaseRequest)}
      * Тест проверяет удаление сущности {@link BankAccount} в Hazelcast при передаче из Apache Kafka.
      * Входной запрос {@link CommonDeleteRequest}:
      * {@link CommonDeleteRequest#id} - Идентификатор записи
      */
     @Test
-    void bankAccountDelete() {
+    void bankAccountBlock() {
         //ARRANGE
         BankAccount bankAccountExists = getBankAccount();
         bankAccountImdg.insert(bankAccountExists);
@@ -378,16 +363,16 @@ public class BankAccountServiceTest {
 
         CommonDeleteRequest commonDeleteRequest = new CommonDeleteRequest();
         commonDeleteRequest.setId(ID);
-        String jsonString = getJsonStringForDELETE(commonDeleteRequest, ID);
+        String jsonString = getJsonStringForDelete(commonDeleteRequest, ID);
 
         //ACT
         addRecordToKafka((MockConsumer) bankAccountService.getConsumer(), TOPIC_ACCOUNT_DELETE, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, producer, producerRecord);
+        waitingSendAndCheckRecord(ID, mockProducer);
 
-        BankAccount bankAccount = bankAccountImdg.getSingleObjectByID(ID);
-        Assertions.assertNull(bankAccount);
+        Account bankAccount = accountImdg.getSingleObjectByID(accountId);
+        assertEquals(bankAccount.getStatus(), WorkflowStatus.Blocked.getKey());
     }
 
     private Company getTestCompany() {

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

@@ -1,15 +1,13 @@
 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.ProducerRecord;
+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.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.kafka.core.KafkaTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -20,27 +18,34 @@ import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.clearing.platform.dictionary.AccountTypeDictionary;
 import ru.clearing.platform.dictionary.ClearingAccountTypeDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
-import ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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.utils.MatcherFactory;
+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.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.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
 
 import javax.annotation.PostConstruct;
+import java.util.Collections;
 import java.util.Map;
 
-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.account.utils.TestUtils.*;
+import static ru.spcex.clearing.test.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 = {
@@ -48,10 +53,11 @@ import static ru.spcex.clearing.account.utils.TestUtils.*;
         ValidationConfig.class,
         ClearingAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountService.class,
+        AccountHelper.class,
         ClearingAccountService.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        SDFProcessService.class,
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 class ClearingAccountServiceTest {
     public static final MatcherFactory.Matcher<ClearingAccount> CLEARING_ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
     public static final MatcherFactory.Matcher<Account> ACCOUNT_MATCHER = usingIgnoringFieldsComparator("created", "updated");
@@ -67,12 +73,15 @@ class ClearingAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private HazelcastService hazelcastServiceTest;
+    private ImdgProvider 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;
@@ -136,6 +145,7 @@ class ClearingAccountServiceTest {
         relation.setService(Service.MKR.getKey());
         relationImdg.insert(relation);
 
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     @Test
@@ -153,8 +163,7 @@ class ClearingAccountServiceTest {
                 0,
                 jsonString);
 
-        verify(producer, timeout(30_000L).times(2))
-                .send(producerRecord.capture());
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account predictableAccount = new Account();
         predictableAccount.setAccount(ACCOUNT_VALUE);
@@ -167,8 +176,8 @@ class ClearingAccountServiceTest {
         predictableClearingAccount.setCompanyId(companyId);
         predictableClearingAccount.setClearingAccountType(CLEARING_ACCOUNT_TYPE_DICT);
 
-        Account resultAccountNew = accountImdg.getSingleObjectByFieldValues(Map.of("accountType", AccountType.Clrn.getKey()));
-        ClearingAccount resultClearingAccountNew = clearingAccountImdg.getSingleObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
+        Account resultAccountNew = accountImdg.getFirstObjectByFieldValues(Map.of("accountType", AccountType.Clrn.getKey()));
+        ClearingAccount resultClearingAccountNew = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
 
         predictableAccount.setId(resultAccountNew.getId());
         predictableClearingAccount.setAccountId(resultAccountNew.getId());
@@ -206,10 +215,10 @@ class ClearingAccountServiceTest {
         clearingAccountUpdateRequest.setStatus(0);
         clearingAccountUpdateRequest.setDeal(TRADING_CODE);
 
-        String jsonString = getJsonStringForUPDATE(clearingAccountUpdateRequest, 0L);
+        String jsonString = getJsonStringForUpdate(clearingAccountUpdateRequest, 0L);
 
         addRecordToKafka((MockConsumer) clearingAccountService.getConsumer(), Consts.DESTINATION_CLEARING_ACCOUNT_UPDATE, PARTITION, 0, jsonString);
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account accountResult = accountImdg.getSingleObjectByID(accountId);
         predictableAccount.setId(accountResult.getId());
@@ -218,4 +227,64 @@ class ClearingAccountServiceTest {
         ACCOUNT_MATCHER.assertMatch(accountResult, predictableAccount);
     }
 
+    @Test
+    void makeSdfErrorText() {
+        Assertions.assertEquals("013", clearingAccountService.makeSdfErrorText(AccountError.CompanyNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
+        Assertions.assertEquals("2", clearingAccountService.makeSdfErrorText(null, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND));
+    }
+
+    /**
+     * {@link ClearingAccountService#accountNewSdf01(BaseRequest)}<br>
+     * Тест проверяет создание сущности {@link BaseRequest} в Hazelcast при передаче из Apache Kafka.<br>
+     * Входной запрос {@link AccountSdf01Request}:<br>
+     * {@link AccountSdfRequestPart#setSdfId} - текущий Id<br>
+     * {@link AccountSdfRequestPart#setAccount} - 123456789123<br>
+     * {@link AccountSdfRequestPart#setCompanyId} - текущий Id<br>
+     * {@link AccountSdf01Request#setGroupingSdf01Id} - текущий Id<br>
+     * {@link AccountSdf01Request#setAccounts} - Collections.singletonList(AccountSdfRequestPart)<br>
+     */
+    @Test
+    void accountSdf01New() throws InterruptedException {
+        //ARRANGE
+        clearImdg(accountImdg);
+        setMockFuture(kafkaTemplate);
+        Long firstID = currentID.getAndIncrement();
+        Long secondID = currentID.getAndIncrement();
+        AccountSdfRequestPart accountSdfRequestPart = new AccountSdfRequestPart();
+        accountSdfRequestPart.setSdfId(firstID);
+        accountSdfRequestPart.setAccount(ACCOUNT_VALUE);
+        accountSdfRequestPart.setCompanyId(firstID);
+        AccountSdf01Request accountSdf01Request = new AccountSdf01Request();
+        accountSdf01Request.setGroupingSdf01Id(firstID);
+        accountSdf01Request.setAccounts(Collections.singletonList(accountSdfRequestPart));
+
+        String jsonString = getJsonStringForNew(accountSdf01Request, 0L);
+
+        Account predictableAccount = new Account();
+        predictableAccount.setAccount(ACCOUNT_VALUE);
+        predictableAccount.setCompanyId(firstID);
+        predictableAccount.setAccountType(AccountType.Clrn.getKey());
+        predictableAccount.setStatus(ServiceStatus.Active.getKey());
+        predictableAccount.setRelationId(relationId);
+        ClearingAccount predictableClearingAccount = new ClearingAccount();
+        predictableClearingAccount.setCompanyId(companyId);
+//        predictableClearingAccount.setClearingAccountType(CLEARING_ACCOUNT_TYPE_DICT);
+
+        //KAFKA
+        addRecordToKafka((MockConsumer) clearingAccountService.getConsumer(), Consts.ACCOUNT_NEW_SDF01, PARTITION, 0, jsonString);
+        waitingSendAndCheckRecord(0L, mockProducer);
+
+        ImdgHazelcast<Account> accountImdg = (ImdgHazelcast<Account>) hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Account, Account.class);
+
+        //ASSERT
+        Account accountResult = accountImdg.getSingleObjectBySQL(String.format("account = %s", ACCOUNT_VALUE));
+        ClearingAccount resultClearingAccountNew = clearingAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", accountResult.getId()));
+        predictableAccount.setId(accountResult.getId());
+        predictableClearingAccount.setAccountId(accountResult.getId());
+        predictableClearingAccount.setId(resultClearingAccountNew.getId());
+        predictableAccount.setId(accountResult.getId());
+        ACCOUNT_MATCHER.assertMatch(accountResult, predictableAccount);
+        CLEARING_ACCOUNT_MATCHER.assertMatch(resultClearingAccountNew, predictableClearingAccount);
+        accountImdg.delete(accountResult);
+    }
 }

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

@@ -1,7 +1,7 @@
-package ru.spcex.clearing.company.service;
+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;
@@ -10,18 +10,20 @@ 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;
+import ru.clearing.classes.statics.data.account.ClearingAccount;
 import ru.clearing.classes.statics.data.account.ClientCode;
+import ru.clearing.classes.statics.data.account.DepoAccount;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.profile.CompanyInfo;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.platform.dictionary.*;
-import ru.spcex.clearing.company.config.BeanConfiguration;
-import ru.spcex.clearing.company.config.validation.ClientCodeValidationConfig;
-import ru.spcex.clearing.company.config.validation.ValidationConfig;
+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.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -29,27 +31,28 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequ
 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;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 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 org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.test.TestUtils.*;
-import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId;
+import static ru.spcex.clearing.test.TestUtils.waitingSendAndCheckRecord;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
         ClientCodeService.class,
         ClientCodeValidationConfig.class,
 
+        TradingClearingRegistryService.class,
+        TradingClearingRegistryValidationConfig.class,
+
         ValidationConfig.class,
         BeanConfiguration.class,
 
@@ -59,7 +62,7 @@ class ClientCodeServiceTest {
 
     private static final int PARTITION = 0;
     private static final Long ID = 4L;
-    public static final MatcherFactory.Matcher<ClientCode> CLIENT_CODE_MATCHER = usingIgnoringFieldsComparator("created","updated");
+    public static final MatcherFactory.Matcher<ClientCode> CLIENT_CODE_MATCHER = MatcherFactory.usingIgnoringFieldsComparator("created", "updated");
 
     private static final Long TCR_ID = 41L;
     private static final Long COMPANY_ID = 42L;
@@ -68,11 +71,12 @@ class ClientCodeServiceTest {
     ClientCodeService clientCodeService;
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
     @Captor
     private ArgumentCaptor<ProducerRecord> producerRecord;
-    @SpyBean
-    private MockProducer<String, Object> mockProducer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
 
     private Imdg<ClientCode> clientCodeImdg;
 
@@ -81,7 +85,7 @@ class ClientCodeServiceTest {
 
     @PostConstruct
     private void init() {
-        waitAvailableImdgProviderAndAddAdminWithDefaultId();
+        hazelcastServiceTest.waitAvailable();
         clientCodeImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class);
 
         // Словари для теста, применяются в ValidationConfig
@@ -114,27 +118,38 @@ class ClientCodeServiceTest {
         registry1.setCompanyId(COMPANY_ID);
         registry1.setCode("code-120-101");
         registry1.setMoneyAccountId(131L);
-        registry1.setDepoAaccountId(132L);
+        registry1.setDepoAccountId(132L);
         registry1.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey());
         registry1.setStatus(WorkflowStatus.Active.getKey());
         tcrImdg.insert(registry1);
 
         Imdg<Account> accounts = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        Account moneyAccount=new Account();
+        Imdg<ClearingAccount> clsAccounts = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
+        Account moneyAccount = new Account();
         moneyAccount.setId(131L);
         moneyAccount.setAccount("AAAA-4444");
         moneyAccount.setStatus("ACTV");
         moneyAccount.setCompanyId(COMPANY_ID); // для валидации принадлежности счёта
         accounts.insert(moneyAccount);
-        Account depoAccount=new Account();
+        ClearingAccount clsAcc = new ClearingAccount();
+        clsAcc.setId(moneyAccount.getId());
+        clsAcc.setCompanyId(COMPANY_ID);
+        clsAcc.setAccountId(moneyAccount.getId());
+        clsAccounts.insert(clsAcc);
+        Imdg<DepoAccount> depoAccounts = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
+        Account depoAccount = new Account();
         depoAccount.setId(132L);
         depoAccount.setAccount("AAAB-44654");
         depoAccount.setStatus("ACTV");
         depoAccount.setCompanyId(COMPANY_ID); // для валидации принадлежности счёта
         accounts.insert(depoAccount);
+        DepoAccount depoAcc = new DepoAccount();
+        depoAcc.setId(depoAccount.getId());
+        depoAcc.setCompanyId(COMPANY_ID);
+        depoAcc.setAccountId(depoAccount.getId());
+        depoAccounts.insert(depoAcc);
 
-        TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class);
-        doReturn(future).when(mockProducer).send(producerRecord.capture());
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     private <D extends AbstractDictionary> void putToDictionary(String mapName, D object, String code) {
@@ -187,13 +202,13 @@ class ClientCodeServiceTest {
 //        predictableClientCode.setTradingClearingRegistryId(TCR_ID);
 
         //ACT
-        String jsonString = getJsonStringForNew(clientCodeNewRequest, ID);
+        String jsonString = TestUtils.getJsonStringForNew(clientCodeNewRequest, ID);
 
-        addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_NEW, PARTITION, 0, jsonString);
+        TestUtils.addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_NEW, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
-        ClientCode resultNew = clientCodeImdg.getSingleObjectBySQL(String.format("code = '%s'", ccCode));
+        waitingSendAndCheckRecord(ID,  mockProducer);
+        ClientCode resultNew = clientCodeImdg.getFirstObjectBySQL(String.format("code = '%s'", ccCode));
         predictableClientCode.setId(resultNew.getId());
         CLIENT_CODE_MATCHER.assertMatch(resultNew, predictableClientCode);
         assertNotNull(resultNew.getCreated());
@@ -225,19 +240,57 @@ class ClientCodeServiceTest {
 //        predictableClientCode.setTradingClearingRegistryId(TCR_ID);
 
         //ACT
-        String jsonString = getJsonStringForNew(clientCodeNewRequest, ID);
+        String jsonString = TestUtils.getJsonStringForNew(clientCodeNewRequest, ID);
 
-        addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, PARTITION, 0, jsonString);
+        TestUtils.addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
-        ClientCode resultNew = clientCodeImdg.getSingleObjectBySQL(String.format("code = '%s'", ccCode));
+        TestUtils.waitingSendAndCheckRecord(ID, mockProducer, producerRecord);
+        ClientCode resultNew = clientCodeImdg.getFirstObjectBySQL(String.format("code = '%s'", ccCode));
         predictableClientCode.setId(resultNew.getId());
         CLIENT_CODE_MATCHER.assertMatch(resultNew, predictableClientCode);
         assertNotNull(resultNew.getCreated());
     }
 
-    //todo добавить тест NEW  заполненными MoneyAccountId(131L), DepoAccountId(132L); - от этого направляется дополнительное сообщение в очередь и используется ожидание ответа.
+
+    /**
+     * {@link ClientCodeService#clientCodeUpdate(BaseRequest)}<br>
+     * Тест проверяет создание {@link ClientCode} в IMDG при передаче из Apache Kafka (очередь 1).<br>
+     * NEW с заполненными MoneyAccountId(131L), DepoAccountId(132L); - от этого будет создан ТКР.
+     * Входной запрос {@link ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest}:<br>
+     **/
+    @Test
+    void clientCodeNew3() {
+        //ARRANGE
+        final String ccCode = "Lucky planet2";
+        ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
+        clientCodeNewRequest.setCompanyId(COMPANY_ID);
+        clientCodeNewRequest.setCode(ccCode);
+        clientCodeNewRequest.setTradingClearingRegistryId(null);
+        clientCodeNewRequest.setMoneyAccountId(131L);
+        clientCodeNewRequest.setDepoAccountId(132L);
+        clientCodeNewRequest.setStatus("ACTV");
+
+        ClientCode predictableClientCode = new ClientCode();
+        predictableClientCode.setCode(ccCode);
+        predictableClientCode.setStatus("ACTV");
+        predictableClientCode.setCompanyId(COMPANY_ID);
+        predictableClientCode.setMoneyAccountId(131L);
+        predictableClientCode.setDepoAccountId(132L);
+        predictableClientCode.setTradingClearingRegistryId(TCR_ID);
+
+        //ACT
+        String jsonString = TestUtils.getJsonStringForNew(clientCodeNewRequest, ID);
+
+        TestUtils.addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_NEW, PARTITION, 0, jsonString);
+
+        //ASSERT
+        waitingSendAndCheckRecord(ID, mockProducer);
+        ClientCode resultNew = clientCodeImdg.getFirstObjectBySQL(String.format("code = '%s'", ccCode));
+        predictableClientCode.setId(resultNew.getId());
+        CLIENT_CODE_MATCHER.assertMatch(resultNew, predictableClientCode);
+        assertNotNull(resultNew.getCreated());
+    }
 
     /**
      * {@link ClientCodeService#clientCodeUpdate(BaseRequest)}<br>
@@ -276,12 +329,12 @@ class ClientCodeServiceTest {
         predictableClientCode.setStatus("ACTV");
 
         //ACT
-        String jsonString = getJsonStringForUpdate(clientCodeUpdateRequest, ID);
+        String jsonString = TestUtils.getJsonStringForUpdate(clientCodeUpdateRequest, ID);
 
-        addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_UPDATE, PARTITION, 0, jsonString);
+        TestUtils.addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_UPDATE, PARTITION, 0, jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
+        waitingSendAndCheckRecord(ID, mockProducer);
 
         ClientCode resultUpdating = clientCodeImdg.getSingleObjectByID(ID);
         CLIENT_CODE_MATCHER.assertMatch(resultUpdating, predictableClientCode);
@@ -315,15 +368,15 @@ class ClientCodeServiceTest {
         Assertions.assertNotNull(clientCodeImdg.getSingleObjectByID(ID)); // verify test data
 
         //ACT
-        String jsonString = getJsonStringForUpdate(clientCodeDeleteRequest, ID);
+        String jsonString = TestUtils.getJsonStringForUpdate(clientCodeDeleteRequest, ID);
 
-        addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_DELETE, PARTITION, 0, jsonString);
+        TestUtils.addRecordToKafka((MockConsumer) clientCodeService.getConsumer(), Consts.DESTINATION_CLIENT_CODE_DELETE, PARTITION, 0, jsonString);
 
         //ASSERT
 
-        waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
+        waitingSendAndCheckRecord(ID, mockProducer);
         ClientCode resultUpdate = clientCodeImdg.getSingleObjectByID(ID);
-        Assertions.assertNull(resultUpdate);
+        assertEquals(WorkflowStatus.Blocked.getKey(), resultUpdate.getStatus());
     }
 
 //    /**

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

@@ -1,15 +1,11 @@
 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.ProducerRecord;
+import org.apache.kafka.clients.producer.Producer;
 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;
@@ -20,27 +16,25 @@ import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.clearing.platform.dictionary.AccountTypeDictionary;
 import ru.clearing.platform.dictionary.DepoAccountTypeDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
-import ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.imdg.api.ImdgProvider;
 
 import javax.annotation.PostConstruct;
 import java.util.Map;
 
-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.account.utils.TestUtils.addRecordToKafka;
-import static ru.spcex.clearing.account.utils.TestUtils.getJsonStringForNew;
+import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -48,10 +42,10 @@ import static ru.spcex.clearing.account.utils.TestUtils.getJsonStringForNew;
         ValidationConfig.class,
         DepoAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountService.class,
+        AccountHelper.class,
         DepoAccountService.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 class DepoAccountServiceTest {
     public static final MatcherFactory.Matcher<DepoAccount> CLEARING_ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
     public static final MatcherFactory.Matcher<Account> ACCOUNT_MATCHER = usingIgnoringFieldsComparator("created", "updated");
@@ -67,12 +61,11 @@ class DepoAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private HazelcastService hazelcastServiceTest;
+    private ImdgProvider hazelcastServiceTest;
 
-    @Captor
-    private ArgumentCaptor<ProducerRecord> producerRecord;
-    @SpyBean
-    private MockProducer<String, Object> producer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
 
     private Imdg<DepoAccount> depoAccountImdg;
     private Imdg<Account> accountImdg;
@@ -136,6 +129,7 @@ class DepoAccountServiceTest {
         relation.setService(Service.MKR.getKey());
         relationImdg.insert(relation);
 
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     @Test
@@ -153,8 +147,7 @@ class DepoAccountServiceTest {
                 0,
                 jsonString);
 
-        verify(producer, timeout(30_000L).times(2))
-                .send(producerRecord.capture());
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account predictableAccount = new Account();
         predictableAccount.setAccount(ACCOUNT_VALUE);
@@ -167,8 +160,8 @@ class DepoAccountServiceTest {
         predictableDepoAccount.setCompanyId(companyId);
         predictableDepoAccount.setDepoAccountType(DEPO_ACCOUNT_TYPE_DICT);
 
-        Account resultAccountNew = accountImdg.getSingleObjectByFieldValues(Map.of("accountType", AccountType.Depo.getKey()));
-        DepoAccount resultDepoAccountNew = depoAccountImdg.getSingleObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
+        Account resultAccountNew = accountImdg.getFirstObjectByFieldValues(Map.of("accountType", AccountType.Depo.getKey()));
+        DepoAccount resultDepoAccountNew = depoAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
 
         predictableAccount.setId(resultAccountNew.getId());
         predictableDepoAccount.setAccountId(resultAccountNew.getId());

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

@@ -1,15 +1,13 @@
 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.ProducerRecord;
+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.mockito.ArgumentCaptor;
-import org.mockito.Captor;
+import org.mockito.Mockito;
 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,27 +17,26 @@ import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.company.relation.Relation;
 import ru.clearing.platform.dictionary.AccountTypeDictionary;
 import ru.spcex.clearing.account.config.BeanConfiguration;
-import ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.imdg.api.ImdgProvider;
 
 import javax.annotation.PostConstruct;
 import java.util.Map;
 
-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.account.utils.TestUtils.addRecordToKafka;
-import static ru.spcex.clearing.account.utils.TestUtils.getJsonStringForNew;
+import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -47,10 +44,10 @@ import static ru.spcex.clearing.account.utils.TestUtils.getJsonStringForNew;
         ValidationConfig.class,
         InformationAccountValidationConfig.class,
         AccountValidationConfig.class,
-        AccountService.class,
+        AccountHelper.class,
         InformationAccountService.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 class InformationAccountServiceTest {
     public static final MatcherFactory.Matcher<InformationAccount> INFORMATION_ACCOUNT_MATCHER = usingIgnoringFieldsComparator();
     public static final MatcherFactory.Matcher<Account> ACCOUNT_MATCHER = usingIgnoringFieldsComparator("created", "updated");
@@ -65,12 +62,11 @@ class InformationAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private HazelcastService hazelcastServiceTest;
+    private ImdgProvider hazelcastServiceTest;
 
-    @Captor
-    private ArgumentCaptor<ProducerRecord> producerRecord;
-    @SpyBean
-    private MockProducer<String, Object> producer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
 
     private Imdg<InformationAccount> informationAccountImdg;
     private Imdg<Account> accountImdg;
@@ -89,6 +85,7 @@ class InformationAccountServiceTest {
         accountImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Account, Account.class
         );
+        clearImdg(accountImdg);
 
         companyImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Company, Company.class
@@ -128,12 +125,15 @@ class InformationAccountServiceTest {
         accountAnlt.setAccountType(AccountType.Anlt.getKey());
         accountAnlt.setCompanyId(1L);
         anltAccountId = accountImdg.insert(accountAnlt);
+
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     @Test
     void accountInformationNew() {
         InformationAccountNewRequest InformationAccountNewRequest = new InformationAccountNewRequest();
         InformationAccountNewRequest.setCompanyId(companyId);
+        InformationAccountNewRequest.setAccount(account);
 
         String jsonString = getJsonStringForNew(InformationAccountNewRequest, 0L);
 
@@ -143,9 +143,7 @@ class InformationAccountServiceTest {
                 0,
                 jsonString);
 
-        //waiting for kafka producer send message (finale event)
-        verify(producer, timeout(30_000L).times(2))
-                .send(producerRecord.capture());
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         Account predictableAccount = new Account();
         predictableAccount.setAccountType(AccountType.Info.getKey());
@@ -157,11 +155,11 @@ class InformationAccountServiceTest {
         predictableInfoAccount.setCompanyId(companyId);
         predictableInfoAccount.setClearingAccountId(anltAccountId);
 
-        Account resultAccountNew = accountImdg.getSingleObjectByFieldValues(Map.of("accountType", AccountType.Info.getKey()));
-        InformationAccount resultInfoAccountNew = informationAccountImdg.getSingleObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
+        Account resultAccountNew = accountImdg.getFirstObjectByFieldValues(Map.of("accountType", AccountType.Info.getKey()));
+        InformationAccount resultInfoAccountNew = informationAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
 
         predictableAccount.setId(resultAccountNew.getId());
-        predictableAccount.setAccount(informationAccountService.generateInfoAccount(resultInfoAccountNew.getId()));
+        predictableAccount.setAccount(account);
         predictableInfoAccount.setAccountId(resultAccountNew.getId());
         predictableInfoAccount.setId(resultInfoAccountNew.getId());
 
@@ -172,4 +170,29 @@ class InformationAccountServiceTest {
         accountImdg.delete(resultAccountNew);
     }
 
+    @Test
+    void accountIncrementSequence() {
+        Imdg<InformationAccount> accountInfoImdg = hazelcastServiceTest.getImdg( IMDGDistributedNames.Map_InformationAccount, InformationAccount.class );
+
+        {
+            Account account = new Account();
+            account.setId(120L);
+            account.setAccountType(AccountType.Info.getKey());
+            account.setCompanyId(10L);
+            account.setAccount("39911810000000127000");
+            accountImdg.insert(account);
+            InformationAccount accountInfo = new InformationAccount();
+            accountInfo.setId(121L);
+            accountInfo.setAccountId(account.getId());
+            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);
+        Long n = infoAccSvc.accountNextId();
+        Assertions.assertEquals(13L, n);
+        n = infoAccSvc.accountNextId();
+        Assertions.assertEquals(14L, n);
+    }
 }

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

@@ -0,0 +1,106 @@
+package ru.spcex.clearing.account.service;
+
+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;
+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.platform.dictionary.AccountTypeDictionary;
+import ru.clearing.platform.dictionary.ClearingAccountTypeDictionary;
+import ru.spcex.clearing.account.config.BeanConfiguration;
+import ru.spcex.clearing.account.config.validation.ValidationConfig;
+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.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+import javax.annotation.PostConstruct;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = {
+        BeanConfiguration.class,
+        ValidationConfig.class,
+        SDFProcessService.class,
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
+class SDFProcessServiceTest {
+    @Autowired
+    SDFProcessService sdfProcessService;
+
+    @Autowired
+    @Qualifier("hazelcastServiceTest")
+    private ImdgProvider hazelcastServiceTest;
+
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
+    @Autowired
+    @Qualifier("mockProducer")
+    protected Producer<String, Object> mockProducer;
+
+    private Imdg<ClearingAccount> clearingAccountImdg;
+    private Imdg<Account> accountImdg;
+    private Imdg<Company> companyImdg;
+    private Imdg<ClearingAccountTypeDictionary> clearingAccountTypeDictionaryImdg;
+    private Imdg<AccountTypeDictionary> accountTypeDictionaryImdg;
+    private Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
+    private Imdg<Relation> relationImdg;
+
+
+    @PostConstruct
+    private void init() {
+        hazelcastServiceTest.waitAvailable();
+        clearingAccountImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class
+        );
+        accountImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_Account, Account.class
+        );
+
+        companyImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_Company, Company.class
+        );
+        accountTypeDictionaryImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_AccountTypeDictionary, AccountTypeDictionary.class
+        );
+        clearingAccountTypeDictionaryImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_ClearingAccountTypeDictionary, ClearingAccountTypeDictionary.class
+        );
+        clearingMemberCategoryImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class
+        );
+        relationImdg = hazelcastServiceTest.getImdg(
+                IMDGDistributedNames.Map_Relation, Relation.class
+        );
+
+
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
+    }
+
+    @Test
+    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(null));
+    }
+}

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

@@ -1,15 +1,13 @@
 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.ProducerRecord;
+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.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.kafka.core.KafkaTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.account.Account;
@@ -17,30 +15,30 @@ 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.HazelcastServiceTestConfiguration;
-import ru.spcex.clearing.account.config.KafkaConfigTest;
 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.platform.enumeration.ServiceStatus;
-import ru.spcex.platform.enumeration.TradingClearingRegistryPurpose;
-import ru.spcex.platform.enumeration.TradingClearingRegistryType;
-import ru.spcex.platform.enumeration.WorkflowStatus;
+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.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.imdg.api.ImdgProvider;
 
 import javax.annotation.PostConstruct;
 
-import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.account.utils.TestUtils.*;
+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 = {
@@ -48,8 +46,8 @@ import static ru.spcex.clearing.account.utils.TestUtils.*;
         ValidationConfig.class,
         TradingClearingRegistryValidationConfig.class,
         TradingClearingRegistryService.class,
-        HazelcastServiceTestConfiguration.class,
-        KafkaConfigTest.class})
+        ImdgTestConfig.class,
+        KafkaTestConfig.class})
 class TradingClearingRegistryServiceTest {
     public static final MatcherFactory.Matcher<TradingClearingRegistry> TRADING_CLEARING_REGISTRY_MATCHER = usingIgnoringFieldsComparator();
     private static final int PARTITION = 0;
@@ -61,15 +59,19 @@ class TradingClearingRegistryServiceTest {
     TradingClearingRegistryService tradingClearingRegistryService;
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private HazelcastService hazelcastServiceTest;
+    private ImdgProvider 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;
@@ -97,6 +99,9 @@ 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
         );
@@ -123,8 +128,14 @@ 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);
@@ -142,54 +153,22 @@ class TradingClearingRegistryServiceTest {
         InformationAccount informationAccount = new InformationAccount();
         informationAccount.setAccountId(account2Id);
         infoAccountId = informationAccountImdg.insert(informationAccount);
+
+        new TestObjectCreator(hazelcastServiceTest).createUserAdmin(1000L);
     }
 
     @Test
     void tradingClearingRegistryNew_moneyAccount_clearingAccount() {
+        setMockFuture(kafkaTemplate);
         TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
         tradingClearingRegistryNewRequest.setCompanyId(companyId);
-        tradingClearingRegistryNewRequest.setMoneyAccountId(clearingAccountId);
+        tradingClearingRegistryNewRequest.setMoneyAccountId(accountId);
+        tradingClearingRegistryNewRequest.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
 
         TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
         predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077MAT");
-        predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId);
-        predictableTradingClearingRegistry.setTradingClearingRegistryType("CAT");
-        predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.M.getKey());
-        predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
-
-        String jsonString = getJsonStringForNew(tradingClearingRegistryNewRequest, 0L);
-
-        addRecordToKafka((MockConsumer) tradingClearingRegistryService.getConsumer(),
-                Consts.DESTINATION_TRADING_CLEARING_REGISTRY_NEW,
-                newRequestCnt,
-                0,
-                jsonString);
-
-        waitingWhenAddedRecordAndCheckIt(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());
-
-        TRADING_CLEARING_REGISTRY_MATCHER.assertMatch(resultNew, predictableTradingClearingRegistry);
-        tradingClearingRegistryImdg.delete(resultNew);
-
-        newRequestCnt++;
-    }
-
-    @Test
-    void tradingClearingRegistryNew_moneyAccount_informationAccount() {
-        TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
-        tradingClearingRegistryNewRequest.setCompanyId(companyId);
-        tradingClearingRegistryNewRequest.setMoneyAccountId(infoAccountId);
-
-        TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
-        predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077MAT");
-        predictableTradingClearingRegistry.setMoneyAccountId(infoAccountId);
+        predictableTradingClearingRegistry.setCode("0077MAT00001");
+        predictableTradingClearingRegistry.setMoneyAccountId(accountId);
         predictableTradingClearingRegistry.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
         predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.M.getKey());
         predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
@@ -202,11 +181,48 @@ class TradingClearingRegistryServiceTest {
                 0,
                 jsonString);
 
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
+
+        TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
+        predictableTradingClearingRegistry.setId(resultNew.getId());
+        predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
+        predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
+
+        TRADING_CLEARING_REGISTRY_MATCHER.assertMatch(resultNew, predictableTradingClearingRegistry);
+        tradingClearingRegistryImdg.delete(resultNew);
+
+        newRequestCnt++;
+    }
+
+    @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.setMoneyAccountId(account2Id);
+        predictableTradingClearingRegistry.setTradingClearingRegistryType(TradingClearingRegistryType.Owner_A.getKey());
+        predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.M.getKey());
+        predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
+
+        String jsonString = getJsonStringForNew(tradingClearingRegistryNewRequest, 0L);
+
+        addRecordToKafka((MockConsumer) tradingClearingRegistryService.getConsumer(),
+                Consts.DESTINATION_TRADING_CLEARING_REGISTRY_NEW,
+                newRequestCnt,
+                0,
+                jsonString);
+
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
         predictableTradingClearingRegistry.setId(resultNew.getId());
-        predictableTradingClearingRegistry.setCode(predictableTradingClearingRegistry.getCode() + resultNew.getId());
         predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
         predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
 
@@ -219,16 +235,18 @@ class TradingClearingRegistryServiceTest {
 
     @Test
     void tradingClearingRegistryNew_depoAccount() {
+        setMockFuture(kafkaTemplate);
+        clearImdg(tradingClearingRegistryImdg);
         TradingClearingRegistryNewRequest tradingClearingRegistryNewRequest = new TradingClearingRegistryNewRequest();
         tradingClearingRegistryNewRequest.setCompanyId(companyId);
-        tradingClearingRegistryNewRequest.setMoneyAccountId(clearingAccountId);
-        tradingClearingRegistryNewRequest.setDepoAccountId(depoAccountId);
+        tradingClearingRegistryNewRequest.setMoneyAccountId(accountId);
+        tradingClearingRegistryNewRequest.setDepoAccountId(account2Id);
 
         TradingClearingRegistry predictableTradingClearingRegistry = new TradingClearingRegistry();
         predictableTradingClearingRegistry.setCompanyId(companyId);
-        predictableTradingClearingRegistry.setCode("0077CDAT");
-        predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId);
-        predictableTradingClearingRegistry.setDepoAaccountId(depoAccountId);
+        predictableTradingClearingRegistry.setCode("0077CDATT00001");
+        predictableTradingClearingRegistry.setMoneyAccountId(accountId);
+        predictableTradingClearingRegistry.setDepoAccountId(account2Id);
         predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT");
         predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.C.getKey());
         predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());
@@ -241,11 +259,10 @@ class TradingClearingRegistryServiceTest {
                 0,
                 jsonString);
 
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         TradingClearingRegistry resultNew = tradingClearingRegistryImdg.getAllValues().iterator().next();
         predictableTradingClearingRegistry.setId(resultNew.getId());
-        predictableTradingClearingRegistry.setCode(predictableTradingClearingRegistry.getCode() + resultNew.getId());
         predictableTradingClearingRegistry.setUpdated(resultNew.getUpdated());
         predictableTradingClearingRegistry.setCreated(resultNew.getCreated());
 
@@ -265,7 +282,7 @@ class TradingClearingRegistryServiceTest {
         tradingClearingRegistryUpdateRequest.setStatus(ServiceStatus.Active.getKey());
         tradingClearingRegistryUpdateRequest.setId(registryId);
 
-        String jsonString = getJsonStringForUPDATE(tradingClearingRegistryUpdateRequest, 0);
+        String jsonString = getJsonStringForUpdate(tradingClearingRegistryUpdateRequest, 0);
 
         //ACT
         addRecordToKafka((MockConsumer) tradingClearingRegistryService.getConsumer(),
@@ -275,7 +292,7 @@ class TradingClearingRegistryServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         TradingClearingRegistry resultUpdating = tradingClearingRegistryImdg.getSingleObjectByID(registryId);
         existTradingClearingRegistry.setUpdated(resultUpdating.getUpdated());
@@ -293,7 +310,7 @@ class TradingClearingRegistryServiceTest {
         CommonDeleteRequest tradingClearingRegistryDeleteRequest = new CommonDeleteRequest();
         tradingClearingRegistryDeleteRequest.setId(registryId);
 
-        String jsonString = getJsonStringForDELETE(tradingClearingRegistryDeleteRequest, 0);
+        String jsonString = getJsonStringForDelete(tradingClearingRegistryDeleteRequest, 0);
 
         //ACT
         addRecordToKafka((MockConsumer) tradingClearingRegistryService.getConsumer(),
@@ -303,7 +320,7 @@ class TradingClearingRegistryServiceTest {
                 jsonString);
 
         //ASSERT
-        waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord);
+        waitingSendAndCheckRecord(0L, mockProducer);
 
         TradingClearingRegistry resultUpdating = tradingClearingRegistryImdg.getSingleObjectByID(registryId);
         existTradingClearingRegistry.setUpdated(resultUpdating.getUpdated());
@@ -311,4 +328,30 @@ class TradingClearingRegistryServiceTest {
         TRADING_CLEARING_REGISTRY_MATCHER.assertMatch(resultUpdating, existTradingClearingRegistry);
         tradingClearingRegistryImdg.delete(resultUpdating);
     }
+
+    @Test
+    void makeCode() {
+        Assertions.assertEquals("0005CAT00001", tradingClearingRegistryService.makeCode(
+                "5", TradingClearingRegistryPurpose.C, TradingClearingRegistryType.Owner_A.getKey(), 1L
+        ));
+        Assertions.assertEquals("0005CET00012", tradingClearingRegistryService.makeCode(
+                "005", TradingClearingRegistryPurpose.C, "E", 12L
+        ));
+        Assertions.assertEquals("0105CERT00012", tradingClearingRegistryService.makeCode(
+                "000000105", TradingClearingRegistryPurpose.C, "ER", 100012L
+        ));
+
+        Assertions.assertEquals("0105MAT00012", tradingClearingRegistryService.makeCode(
+                "000000105", TradingClearingRegistryPurpose.M, "A", 100012L
+        ));
+    }
+
+    @Test
+    void parseCodeSeqId() {
+        Assertions.assertEquals(Long.valueOf(1L), tradingClearingRegistryService.parseCodeSeqId("0005CAT00001"));
+        Assertions.assertEquals(Long.valueOf(5001), tradingClearingRegistryService.parseCodeSeqId("0005CAT05001"));
+        Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId("0005CAT"));
+        Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId(""));
+        Assertions.assertEquals(null, tradingClearingRegistryService.parseCodeSeqId(null));
+    }
 }

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

@@ -1,63 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/account-service/src/test/java/ru/spcex/clearing/account/utils/TestUtils.java

@@ -1,125 +0,0 @@
-package ru.spcex.clearing.account.utils;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.MockConsumer;
-import org.apache.kafka.clients.producer.MockProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.common.TopicPartition;
-import org.mockito.ArgumentCaptor;
-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.service.RequestInfoUpdate;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.Imdg;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-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.Success;
-
-public class TestUtils {
-    public static final MatcherFactory.Matcher<BaseRequest<Object>> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparator();
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
-    public static void waitingWhenAddedRecordAndCheckIt(Long id, MockProducer mockProducer, ArgumentCaptor<ProducerRecord> producerRecord) {
-        BaseRequest<Object> predictableBaseRequest = new BaseRequest<>();
-        predictableBaseRequest.setId(id);
-        predictableBaseRequest.setActionType(ActionType.SYSTEM);
-        RequestInfoUpdate requestInfoUpdate = new RequestInfoUpdate();
-        requestInfoUpdate.setId(id);
-        requestInfoUpdate.setStatus(Success);
-        predictableBaseRequest.setRequestPayload(requestInfoUpdate);
-
-        //waiting for kafka producer send message (finale event)
-        verify(mockProducer, timeout(30_000L).times(1))
-                .send(producerRecord.capture());
-
-        BaseRequest<Object> baseRequestResult = (BaseRequest<Object>) producerRecord.getValue().value();
-        assertEquals(Consts.REQUEST_INFO_UPDATE, producerRecord.getValue().topic());
-        BASE_REQUEST_MATCHER.assertMatch(baseRequestResult, predictableBaseRequest);
-    }
-
-    public static void addRecordToKafka(MockConsumer mockConsumer, String topic, int partition, long offset, String jsonValue) {
-        TopicPartition tp = new TopicPartition(topic, partition);
-        HashMap<TopicPartition, Long> startOffsets = new HashMap<>();
-        startOffsets.put(tp, 0L);
-        mockConsumer.updateBeginningOffsets(startOffsets);
-        mockConsumer.schedulePollTask(() -> {
-            mockConsumer.rebalance(Collections.singletonList(tp));
-            mockConsumer.addRecord(new ConsumerRecord<>(topic, partition, offset, "key", jsonValue));
-        });
-    }
-
-    public static <T> String getJsonStringForNew(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.NEW);
-    }
-
-    public static <T> String getJsonStringForUPDATE(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.UPDATE);
-    }
-
-    public static <T> String getJsonStringForDELETE(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.DELETE);
-    }
-
-    private static <T> String getJsonBaseRequest(T accountRequest, long id, ActionType actionType) {
-        BaseRequest<T> baseRequest = new BaseRequest<>();
-        baseRequest.setRequestPayload(accountRequest);
-        baseRequest.setId(id);
-        baseRequest.setActionType(actionType);
-        String jsonBaseRequest;
-        try {
-            jsonBaseRequest = objectMapper.writeValueAsString(baseRequest);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-        return jsonBaseRequest;
-    }
-
-    public static <T extends SpcexObjectBase> void clearImdg(Imdg<T> imdg) {
-        Collection<T> values = imdg.getAllValues();
-        for (T val : values) {
-            imdg.delete(val);
-        }
-    }
-
-    public static class FutureRecordMetadata implements Future<RecordMetadata> {
-        @Override
-        public boolean cancel(boolean mayInterruptIfRunning) {
-            return false;
-        }
-
-        @Override
-        public boolean isCancelled() {
-            return false;
-        }
-
-        @Override
-        public boolean isDone() {
-            return false;
-        }
-
-        @Override
-        public RecordMetadata get() throws InterruptedException, ExecutionException {
-            return null;
-        }
-
-        @Override
-        public RecordMetadata get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-            return null;
-        }
-    }
-}

clearing-parent/backend-api/pom.xml

@@ -195,6 +195,19 @@
                                         </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>
@@ -323,6 +336,31 @@
                             </transformationSets>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- Generate java_classes.java from META file
+                        command: mvn xml:transform@java -->
+                        <id>java</id>
+                        <goals>
+                            <goal>transform</goal>
+                        </goals>
+                        <configuration>
+                            <transformationSets>
+                                <transformationSet>
+                                    <dir>src/main/resources/meta</dir>
+                                    <includes>
+                                        <include>meta.xml</include>
+                                    </includes>
+                                    <stylesheet>src/main/resources/meta/xsl/java.xsl</stylesheet>
+                                    <fileMappers>
+                                        <fileMapper
+                                                implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                                            <targetExtension>java_classes.java</targetExtension>
+                                        </fileMapper>
+                                    </fileMappers>
+                                </transformationSet>
+                            </transformationSets>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

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

@@ -1,5 +1,7 @@
 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;
@@ -11,6 +13,8 @@ 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);
@@ -21,6 +25,16 @@ 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(
@@ -28,9 +42,33 @@ public class BackEndApiImdgConfig {
             @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
             BackendApiSettings clientSetting
     ) {
-        return new HazelcastService(taskExecutorHazelcastClientInitializer,
+        if (clientSetting.getHazelcast() == null || clientSetting.getHazelcast().getClusterMembers() == null) {
+            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

@@ -0,0 +1,177 @@
+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

@@ -6,12 +6,20 @@ 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.service.sender.KafkaSender;
+import ru.spcex.platform.imdg.api.ImdgId;
+import ru.spcex.platform.imdg.api.ImdgProvider;
 
 @Configuration
 public class KafkaConfig {
@@ -23,6 +31,29 @@ public class KafkaConfig {
         return KafkaProducerFactory.producer(settings.getKafkaProducer());
     }
 
+    @Bean
+    public ProducerFactory<String, Object> pf(BackendApiSettings settings) {
+        KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
+        return KafkaProducerFactory.producerFactory(kafkaSettings);
+    }
+
+    @Bean
+    public KafkaTemplate<String, Object> kafkaTemplateS(ProducerFactory<String, Object> pf) {
+        return new KafkaTemplate<>(pf);
+    }
+
+    @Profile("!kafkaDisabled")
+    @Autowired
+    @Bean
+    public KafkaSender kafkaSender(KafkaTemplate<String, Object> kafkaTemplate, ImdgProvider imdgProvider) {
+        ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
+        return KafkaSender.setup()
+                .saveRequestInfo(false)
+                .setKafkaTemplate(kafkaTemplate)
+                .idGenerator(imdgIdGenerator::nextId)
+                .build();
+    }
+
     @Profile("kafkaDisabled")
     @Bean
     public MockProducer<String, Object> createMockProducer() {
@@ -31,6 +62,7 @@ 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,6 +13,7 @@ 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;
@@ -57,4 +58,12 @@ 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/AbstractQueueController.java

@@ -7,7 +7,7 @@ import ru.spcex.clearing.backendapi.service.IOperator;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 
-public class AbstractQueueController {
+public abstract class AbstractQueueController {
     private final IOperator operator;
 
     public AbstractQueueController(IOperator operator) {

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

@@ -0,0 +1,71 @@
+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/BankAccountController.java

@@ -16,7 +16,8 @@ import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAc
 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.controller.response.entity.account.BankAccountBackendGetById;
+import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetByIdResponse;
+import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
 import ru.spcex.clearing.backendapi.service.IOperator;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -31,11 +32,13 @@ import java.util.concurrent.ExecutionException;
 @RequestMapping("/accounting/bank-accounts")
 public class BankAccountController extends AbstractQueueController {
     private final IStateLoader stateLoader;
+    private final GetResponseFactory responseMetaFactory;
 
     @Autowired
-    public BankAccountController(IOperator operator, IStateLoader stateLoader) {
+    public BankAccountController(GetResponseFactory responseMetaFactory, IOperator operator, IStateLoader stateLoader) {
         super(operator);
         this.stateLoader = stateLoader;
+        this.responseMetaFactory = responseMetaFactory;
     }
 
     @ApiOperation(value = "create bank account.")
@@ -73,14 +76,17 @@ public class BankAccountController extends AbstractQueueController {
     }
 
     @ApiOperation(value = "get bank account.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = BankAccountBackendGetById.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetByIdResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public BankAccountBackendGetById getById(@ApiParam(value = "Идентификатор объекта", required = true, example = "1234")
+    public CommonGetByIdResponse getById(@ApiParam(value = "Идентификатор объекта", required = true, example = "1234")
                               @PathVariable("id") Long id) {
         Optional<BankAccount> bankAccount = stateLoader.getById(id, IMDGDistributedNames.Map_BankAccount, BankAccount.class);
-        BankAccountBackendGetById response = new BankAccountBackendGetById();
-        bankAccount.ifPresentOrElse(response::fromEntity, () -> response.setCode(404));
+        CommonGetByIdResponse response = new CommonGetByIdResponse();
+        bankAccount.ifPresentOrElse( r -> {
+            Map<String, Object> extractedByMeta = responseMetaFactory.responseFromObject(r);
+            response.fromEntity(extractedByMeta);
+        }, () -> response.setCode(404));
         return response;
     }
 

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

@@ -1,28 +1,40 @@
 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 {
+public class InformationAccountController extends AbstractQueueController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public InformationAccountController(IStateLoader stateLoader) {
+    public InformationAccountController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
         this.stateLoader = stateLoader;
     }
 
@@ -37,4 +49,15 @@ public class InformationAccountController {
         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/clearing/VerificationResultController.java

@@ -0,0 +1,40 @@
+package ru.spcex.clearing.backendapi.controller.queue.clearing;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import ru.clearing.classes.statics.data.clearing.VerificationResult;
+import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+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 java.util.Collection;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/verification-results")
+public class VerificationResultController extends AbstractQueueController {
+    private final IStateLoader stateLoader;
+
+    @Autowired
+    public VerificationResultController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
+        this.stateLoader = stateLoader;
+    }
+
+    @ApiOperation(value = "get all VerificationResult's.")
+    @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_VerificationResult, VerificationResult.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+}

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

@@ -1,22 +1,28 @@
 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 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")
@@ -41,4 +47,26 @@ 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/company/CompanySymbolController.java

@@ -10,7 +10,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 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.CompanySymbolNewAction;
 import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanySymbolUpdateAction;
+import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactNewAction;
 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;
@@ -35,6 +38,17 @@ public class CompanySymbolController extends AbstractQueueController {
         this.stateLoader = stateLoader;
     }
 
+
+    @ApiOperation(value = "create company symbol.")
+    @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 CompanySymbolNewAction companySymbolNewAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.DESTINATION_COMPANY_SYMBOL_NEW, companySymbolNewAction);
+    }
+
     @ApiOperation(value = "update company symbol.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -58,4 +72,15 @@ public class CompanySymbolController extends AbstractQueueController {
         response.fromEntity(all);
         return response;
     }
+
+    @ApiOperation(value = "delete company symbol.")
+    @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_SYMBOL_DELETE, deleteAction);
+    }
 }

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

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import ru.clearing.classes.statics.data.profile.Contact;
 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.ContactNewAction;
 import ru.spcex.clearing.backendapi.controller.request.cud.company.ContactUpdateAction;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
@@ -47,6 +49,27 @@ public class ContactController extends AbstractQueueController {
         return processRequest(Consts.DESTINATION_CONTACT_UPDATE, contactUpdateAction);
     }
 
+    @ApiOperation(value = "create company contact.")
+    @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 ContactNewAction contactNewAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.DESTINATION_CONTACT_NEW, contactNewAction);
+    }
+
+    @ApiOperation(value = "delete contact.")
+    @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_CONTACT_DELETE, deleteAction);
+    }
+
     @ApiOperation(value = "get all Contacts.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)

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

@@ -14,7 +14,11 @@ 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;
 
@@ -22,11 +26,16 @@ 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.")
@@ -34,9 +43,11 @@ 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,7 +14,11 @@ 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;
 
@@ -22,11 +26,17 @@ 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, IStateLoader stateLoader) {
+    public ExecutionFondController(IOperator operator,
+                                   IStateLoader stateLoader,
+                                   ImdgProvider imdgProvider) {
         super(operator);
         this.stateLoader = stateLoader;
+        this.imdgPredicateBuilder = imdgProvider
+                .getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class)
+                .predicateBuilder();
     }
 
     @ApiOperation(value = "get all ExecutionFond.")
@@ -34,9 +44,11 @@ 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

@@ -0,0 +1,95 @@
+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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,46 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,25 @@
+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/misc/ListingController.java

@@ -1,22 +1,29 @@
 package ru.spcex.clearing.backendapi.controller.queue.misc;
 
 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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import ru.clearing.classes.statics.data.misc.Listing;
 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.ListingNewAction;
+import ru.spcex.clearing.backendapi.controller.request.cud.company.ListingUpdateAction;
+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("/listings")
@@ -39,4 +46,40 @@ public class ListingController extends AbstractQueueController {
         response.fromEntity(all);
         return response;
     }
+
+
+
+    @ApiOperation(value = "create Listing.")
+    @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 ListingNewAction listingNewAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.LISTING_NEW, listingNewAction);
+    }
+
+    @ApiOperation(value = "update Listing.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse update(
+            @ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
+            @PathVariable("id") Long id,
+            @ApiParam(value = "Новые значения полей объекта.", required = true)
+            @RequestBody ListingUpdateAction listingUpdateAction) throws ExecutionException, InterruptedException {
+        listingUpdateAction.setId(id);
+        return processRequest(Consts.LISTING_UPDATE, listingUpdateAction);
+    }
+
+    @ApiOperation(value = "delete Listing.")
+    @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.LISTING_DELETE, deleteAction);
+    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/NotificationController.java

@@ -1,22 +1,30 @@
 package ru.spcex.clearing.backendapi.controller.queue.misc;
 
 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.misc.Notification;
 import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+import ru.spcex.clearing.backendapi.controller.request.cud.registry.NotificationUpdateAction;
+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("/notifications")
@@ -39,4 +47,14 @@ public class NotificationController extends AbstractQueueController {
         response.fromEntity(all);
         return response;
     }
+
+    @ApiOperation(value = "create Notification.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse update(
+            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody NotificationUpdateAction notificationUpdateAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.NOTIFICATION_UPDATE, notificationUpdateAction);
+    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/payment/PaymentInstructionController.java

@@ -1,22 +1,30 @@
 package ru.spcex.clearing.backendapi.controller.queue.payment;
 
 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.payment.PaymentInstruction;
 import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+import ru.spcex.clearing.backendapi.controller.request.cud.payment.PIClearingOutbondActionNew;
+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("/payment-instructions")
@@ -39,4 +47,14 @@ public class PaymentInstructionController 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(value = "/clearing-outbound", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse clearingOutboundAction(
+            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody PIClearingOutbondActionNew piClearingOutbondAction) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.PAYMENT_INSTRUCTION_CLEARING_OUTBOUND_ACTION, piClearingOutbondAction);
+    }
 }

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

@@ -0,0 +1,110 @@
+package ru.spcex.clearing.backendapi.controller.queue.register;
+
+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.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.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("/registries")
+public class RegistryController extends AbstractQueueController {
+    private final IStateLoader stateLoader;
+
+    @Autowired
+    public RegistryController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
+        this.stateLoader = stateLoader;
+    }
+
+    @ApiOperation(value = "get all registries.")
+    @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_Registry, Registry.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        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(value = "/splitDeposit", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse splitDepositAction(
+            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody RSplitDepositActionNew rSplitDepositActionNew) throws ExecutionException, InterruptedException {
+        return processRequest(Consts.REGISTRY_SPLIT_DEPOSIT_ACTION, rSplitDepositActionNew);
+    }
+
+    @ApiOperation(value = "Отметить средства на возврат депозита")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @RequestMapping(value = "/returnDeposit/{id}", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public CudResponse returnDepositAction(
+            @ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
+            @PathVariable("id") Long id,
+            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody ReturnDepositActionNew returnDepositAction) throws ExecutionException, InterruptedException {
+        returnDepositAction.setId(id);
+        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)
+    @ResponseBody
+    public CudResponse changeRefundDate(
+            @ApiParam(value = "Идентификатор группы связанных регистров.", required = true, example = "1234")
+            @PathVariable("groupId") Long groupId,
+            @ApiParam(value = "Параметры команды в JSON формате.", required = true)
+            @RequestBody ChangeRefundDateActionNew returnDepositAction) throws ExecutionException, InterruptedException {
+        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/queue/scheduler/LauncherController.java

@@ -4,6 +4,8 @@ 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.HttpStatus;
 import org.springframework.http.MediaType;
@@ -29,6 +31,7 @@ import ru.spcex.platform.enumeration.Task;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 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;
@@ -38,6 +41,7 @@ import java.util.concurrent.ExecutionException;
 @Controller
 @RequestMapping("/launchers")
 public class LauncherController extends AbstractQueueController {
+    protected final Logger log = LoggerFactory.getLogger(getClass());
     private final IStateLoader stateLoader;
     private final Imdg<User> userImdg;
     private final Imdg<AbstractDictionary> taskDictionary;
@@ -69,14 +73,14 @@ public class LauncherController extends AbstractQueueController {
     @ResponseBody
     public CudResponse add(@ApiParam(value = "Код задания из taskDictionary", required = true, example = "ABLK")
                            @PathVariable("task-code") String dictionaryName) throws ExecutionException, InterruptedException {
-        AbstractDictionary taskEnum = taskDictionary.getSingleObjectByFieldValues(Map.of("code", dictionaryName));
+        AbstractDictionary taskEnum = taskDictionary.getFirstObjectByFieldValues(Map.of("code", dictionaryName));
         if (taskEnum == null) {
             throw new NotFound404Exception("task dictionary element with code '" + dictionaryName + "'");
         }
         LauncherNew launcherCommand = new LauncherNew();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
-        User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
+        User user = userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             throw new IllegalStateException("cannot obtain userId from logged in user " + username);
         }
@@ -96,25 +100,21 @@ public class LauncherController extends AbstractQueueController {
         if (launcherNew.getTask() == null) {
             throw new NotFound404Exception("task dictionary element with code '" + launcherNew.getTask() + "'");
         }
-        AbstractDictionary taskEnum = taskDictionary.getSingleObjectByFieldValues(Map.of("code", launcherNew.getTask()));
+        AbstractDictionary taskEnum = taskDictionary.getFirstObjectByFieldValues(Map.of("code", launcherNew.getTask()));
         if (taskEnum == null) {
             throw new NotFound404Exception("task dictionary element with code '" + launcherNew.getTask() + "'");
         }
-        if (!Task.startOfClearing.getKey().equals(taskEnum.getCode())) {
-            throw new IllegalStateException(String.format("Task %s not support request with body", taskEnum.getCode()));
-        }
-        LauncherNew launcherCommand = new LauncherNew();
+        if (!IEnumKey.contains(taskEnum.getCode(), Task.startOfClearing, Task.dbfExport_OUTV)) {
+            log.warn(String.format("Task %s not support request with body", taskEnum.getCode()));
+        } // else В мете эти модели с дополнительными параметрами (OUTV).
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
-        User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
+        User user = userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             throw new IllegalStateException("cannot obtain userId from logged in user " + username);
         }
-        launcherCommand.setTask(launcherNew.getTask());
-        launcherCommand.setUserId(user.getId());
-        launcherCommand.setCompanyId(launcherNew.getCompanyId());
-        launcherCommand.setSecurityId(launcherNew.getSecurityId());
-        return processRequest(Consts.LAUNCHER_NEW, launcherCommand);
+        launcherNew.setUserId(user.getId());
+        return processRequest(Consts.LAUNCHER_NEW, launcherNew);
     }
 
     @Autowired

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/sdf/SdfsController.java

@@ -0,0 +1,318 @@
+package ru.spcex.clearing.backendapi.controller.queue.sdf;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ResponseBody;
+import ru.clearing.classes.statics.data.sdf.*;
+import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
+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 java.util.Collection;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/s-dfs")
+public class SdfsController extends AbstractQueueController {
+    private final IStateLoader stateLoader;
+
+    @Autowired
+    public SdfsController(IOperator operator, IStateLoader stateLoader) {
+        super(operator);
+        this.stateLoader = stateLoader;
+    }
+
+    @ApiOperation(value = "get all S_DF01")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df01", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf01() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf01,
+                SDf01.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF02")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df02", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf02() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf02,
+                SDf02.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF03")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df03", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf03() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf03,
+                SDf03.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF04")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df04", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf04() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf04,
+                SDf04.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF05")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df05", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf05() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf05,
+                SDf05.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF06")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df06", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf06() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf06,
+                SDf06.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF07")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df07", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf07() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf07,
+                SDf07.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF08")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df08", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf08() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf08,
+                SDf08.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF09")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df09", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf09() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf09,
+                SDf09.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF10")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df10", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf10() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf10,
+                SDf10.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF11")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df11", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf11() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf11,
+                SDf11.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF12")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df12", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf12() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf12,
+                SDf12.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF13")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df13", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf13() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf13,
+                SDf13.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF14")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df14", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf14() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf14,
+                SDf14.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF20")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df20", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf20() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf20,
+                SDf20.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF21")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df21", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf21() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf21,
+                SDf21.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF52")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df52", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf52() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf52,
+                SDf52.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF53")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df53", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf53() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf53,
+                SDf53.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF54")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df54", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf54() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf54,
+                SDf54.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF55")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df55", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf55() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf55,
+                SDf55.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF56")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df56", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf56() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf56,
+                SDf56.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+    @ApiOperation(value = "get all S_DF57")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
+    @RequestMapping(value = "s-df57", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonGetAllResponse getAllSdf57() {
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
+                IMDGDistributedNames.Map_SDf57,
+                SDf57.class);
+        CommonGetAllResponse response = new CommonGetAllResponse();
+        response.fromEntity(all);
+        return response;
+    }
+
+}

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/EquitySecurityController.java

@@ -77,8 +77,7 @@ public class EquitySecurityController extends AbstractQueueController {
     @ResponseBody
     public CommonGetAllResponse getAll() {
         Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_EquitySecurity,
-                EquitySecurity.class,
-                Map.of("workflowStatus", Status.Active.getKey()));
+                EquitySecurity.class);
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/FixedIncomeSecurityController.java

@@ -77,8 +77,7 @@ public class FixedIncomeSecurityController extends AbstractQueueController {
     @ResponseBody
     public CommonGetAllResponse getAll() {
         Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_FixedIncomeSecurity,
-                FixedIncomeSecurity.class,
-                Map.of("workflowStatus", Status.Active.getKey()));
+                FixedIncomeSecurity.class);
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/MoneyMarketSecurityController.java

@@ -8,7 +8,7 @@ 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.misc.MoneyMarketSecurity;
+import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
 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.securities.MoneyMarketSecurityNewAction;
@@ -77,8 +77,7 @@ public class MoneyMarketSecurityController extends AbstractQueueController {
     @ResponseBody
     public CommonGetAllResponse getAll() {
         Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_MoneyMarketSecurity,
-                MoneyMarketSecurity.class,
-                Map.of("workflowStatus", Status.Active.getKey()));
+                MoneyMarketSecurity.class);
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java

@@ -8,15 +8,21 @@ 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.ResponseBody;
+import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
+import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
+import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
 import ru.clearing.classes.statics.data.security.Security;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
-@Deprecated //todo не лишний ли этот контроллер? См. CudMoneyMarketSecurityController  @Deprecated
+/**
+ * SecurityController и MoneyMarketSecurityController разные контроллеры, не путать.
+ */
 @Controller
 @RequestMapping("/securities")
 public class SecurityController {
@@ -32,9 +38,16 @@ public class SecurityController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransformSpecificClass(
-                IMDGDistributedNames.Map_MoneyMarketSecurity,
-                Security.class);
+        Collection<Map<String, Object>> all = new ArrayList<>();
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class
+        ));
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class
+        ));
+        all.addAll(stateLoader.getAllMetaTransformSpecificClass(
+                IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class
+        ));
         CommonGetAllResponse response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/user/UserController.java

@@ -68,7 +68,7 @@ public class UserController extends AbstractQueueController {
         UserIdResponse response = new UserIdResponse();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
-        User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
+        User user = username == null ? null : userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             log.info("getId user {} authenticated, but User object was not created", username);
             throw new IllegalStateException("couldn't return user id");

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/StatementController.java

@@ -15,7 +15,6 @@ import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetByIdResponse;
-import ru.spcex.clearing.backendapi.controller.response.entity.account.BankAccountBackendGetById;
 import ru.spcex.clearing.backendapi.errors.NotFound404Exception;
 import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
 import ru.spcex.clearing.backendapi.service.IOperator;
@@ -51,7 +50,7 @@ public class StatementController extends AbstractQueueController {
     }
 
     @ApiOperation(value = "get Statement by Id.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = BankAccountBackendGetById.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetByIdResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ResponseBody
     public CommonGetByIdResponse getById(@ApiParam(value = "Идентификатор объекта", required = true, example = "1234")

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/UserSettingsController.java

@@ -45,12 +45,21 @@ public class UserSettingsController extends AbstractQueueController {
         this.userImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_User, User.class);
     }
 
-    @ApiOperation(value = "get all user settings.")
+    @ApiOperation(value = "get all user settings for current user.")
     @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_UserSettings, UserSettings.class);
+    public CommonGetAllResponse getAllForCurrentUser() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
+        User user = username == null ? null : userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));
+        if (user == null) {
+            throw new IllegalStateException("cannot obtain userId from logged in user " + username);
+        }
+
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_UserSettings, UserSettings.class,
+                Map.of("userId", user.getId())
+        );
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
@@ -65,7 +74,7 @@ public class UserSettingsController extends AbstractQueueController {
             @RequestBody UserSettingsUpdateAction userSettingsUpdateAction) throws ExecutionException, InterruptedException {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
-        User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
+        User user = userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             throw new IllegalStateException("cannot obtain userId from logged in user " + username);
         }

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

@@ -0,0 +1,71 @@
+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/AccountNewAction.java

@@ -30,18 +30,6 @@ public class AccountNewAction implements IAction<AccountNewRequest> {
     @JsonProperty
     private String accountType;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.companyId == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
-        if (!StringUtils.hasLength(this.account))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "account"));
-        if (!StringUtils.hasLength(this.accountType))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "accountType"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
-
     @Override
     public AccountNewRequest toRequest() {
         var req = new AccountNewRequest();

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

@@ -0,0 +1,47 @@
+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/account/AccountUpdateAction.java

@@ -32,16 +32,6 @@ public class AccountUpdateAction implements IAction<AccountUpdateRequest> {
     @JsonProperty
     private String accountType;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.id == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
-        if (!StringUtils.hasLength(this.accountType))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "accountType"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
-
     @Override
     public AccountUpdateRequest toRequest() {
         var req = new AccountUpdateRequest();

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

@@ -48,37 +48,6 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     @JsonProperty
     private Long companyId;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (!StringUtils.hasLength(this.bankIdentificationCode))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode"));
-        if (!StringUtils.hasLength(this.bankName))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "bankIdentificationCode"));
-        if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccount)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccount"));
-        }
-        if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(correspondentAccountName)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "correspondentAccountName"));
-        }
-        if (!StringUtils.hasLength(currency)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "currency"));
-        }
-        if (!StringUtils.hasLength(destination)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "destination"));
-        }
-        if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxpayerIdentificationNumber)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "taxpayerIdentificationNumber"));
-        }
-        if ("RUB".equalsIgnoreCase(this.currency) && !StringUtils.hasLength(taxRegistrationReasonCode)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "taxRegistrationReasonCode"));
-        }
-        if (TextUtil.isEmpty(account)) {
-            errors.add(new EnumMessage(BackEndError.ValidationError, "account"));
-        }
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
-
     @Override
     public BankAccountNewRequest toRequest() {
         var req = new BankAccountNewRequest();
@@ -172,4 +141,12 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     public void setAccount(String account) {
         this.account = account;
     }
+
+    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/account/BankAccountUpdateAction.java

@@ -42,11 +42,6 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
     @ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
     private String account;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        return Collections.emptyList();
-    }
-
     @Override
     public BankAccountUpdateRequest toRequest() {
         var req = new BankAccountUpdateRequest();

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

@@ -35,16 +35,6 @@ public class ClientCodeNewAction implements IAction<ClientCodeNewRequest> {
     @JsonProperty
     private String status;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.companyId == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
-        if (!StringUtils.hasLength(this.code))
-            errors.add(new EnumMessage(BackEndError.ValidationError, "code"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
-
     @Override
     public ClientCodeNewRequest toRequest() {
         var req = new ClientCodeNewRequest();

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

@@ -36,13 +36,6 @@ public class ClientCodeUpdateAction implements IAction<ClientCodeUpdateRequest>
     @JsonProperty
     private String status;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.id == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
 
     @Override
     public ClientCodeUpdateRequest toRequest() {

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

@@ -0,0 +1,59 @@
+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/company/CompanySymbolNewAction.java

@@ -0,0 +1,59 @@
+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.CompanySymbolNewRequest;
+
+public class CompanySymbolNewAction implements IAction<CompanySymbolNewRequest> {
+    @ApiModelProperty(value = "Идентификатор Компании", example = "1234")
+    @JsonProperty
+    private Long companyId;
+    @ApiModelProperty(value = "Идентификатор справочника", example = "ABCD")
+    @JsonProperty
+    private String companySymbol;
+    @ApiModelProperty(value = "Значение справочника", example = "Company description example")
+    @JsonProperty
+    private String companySymbolValue;
+
+    @Override
+    public CompanySymbolNewRequest toRequest() {
+        CompanySymbolNewRequest request = new CompanySymbolNewRequest();
+        request.setCompanyId(this.companyId);
+        request.setCompanySymbol(this.companySymbol);
+        request.setCompanySymbolValue(this.companySymbolValue);
+        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 getCompanySymbol() {
+        return companySymbol;
+    }
+
+    public void setCompanySymbol(String companySymbol) {
+        this.companySymbol = companySymbol;
+    }
+
+    public String getCompanySymbolValue() {
+        return companySymbolValue;
+    }
+
+    public void setCompanySymbolValue(String companySymbolValue) {
+        this.companySymbolValue = companySymbolValue;
+    }
+}

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

@@ -14,9 +14,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
     @ApiModelProperty(value = "Идентификатор Компании", example = "1234")
     @JsonProperty
     private Long companyId;
-    @ApiModelProperty(value = "Идентификатор справочника", example = "ABCD")
-    @JsonProperty
-    private String companySymbol;
     @ApiModelProperty(value = "Значение справочника", example = "Company description example")
     @JsonProperty
     private String companySymbolValue;
@@ -26,7 +23,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
         CompanySymbolUpdateRequest request = new CompanySymbolUpdateRequest();
         request.setId(this.id);
         request.setCompanyId(this.companyId);
-        request.setCompanySymbol(this.companySymbol);
         request.setCompanySymbolValue(this.companySymbolValue);
         return request;
     }
@@ -53,14 +49,6 @@ public class CompanySymbolUpdateAction implements IAction<CompanySymbolUpdateReq
         this.companyId = companyId;
     }
 
-    public String getCompanySymbol() {
-        return companySymbol;
-    }
-
-    public void setCompanySymbol(String companySymbol) {
-        this.companySymbol = companySymbol;
-    }
-
     public String getCompanySymbolValue() {
         return companySymbolValue;
     }

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

@@ -0,0 +1,60 @@
+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.ContactNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.ContactUpdateRequest;
+
+public class ContactNewAction implements IAction<ContactNewRequest> {
+
+    @ApiModelProperty(value = "Наименование компании", example = "ABCD")
+    @JsonProperty
+    private Long companyId;
+    @ApiModelProperty(value = "Идентификатор справочника", example = "ABCD")
+    @JsonProperty
+    private String contactType;
+    @ApiModelProperty(value = "Значение справочника", example = "example contact string")
+    @JsonProperty
+    private String contactValue;
+
+    @Override
+    public ContactNewRequest toRequest() {
+        ContactNewRequest request = new ContactNewRequest();
+        request.setCompanyId(this.companyId);
+        request.setContactType(this.contactType);
+        request.setContactValue(this.contactValue);
+        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 getContactType() {
+        return contactType;
+    }
+
+    public void setContactType(String contactType) {
+        this.contactType = contactType;
+    }
+
+    public String getContactValue() {
+        return contactValue;
+    }
+
+    public void setContactValue(String contactValue) {
+        this.contactValue = contactValue;
+    }
+}

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

@@ -0,0 +1,85 @@
+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.securitites.ListingNewRequest;
+
+import java.math.BigDecimal;
+
+public class ListingNewAction implements IAction<ListingNewRequest> {
+    @ApiModelProperty(value = "Наименование инструмента", example = "1234")
+    @JsonProperty
+    private Long securityId;
+    @ApiModelProperty(value = "Наименование режима", example = "ABCD")
+    @JsonProperty
+    private String market;
+    @ApiModelProperty(value = "Размер лота", example = "1234.56")
+    @JsonProperty
+    private BigDecimal lotSize;
+    @ApiModelProperty(value = "Наименование валюты расчета", example = "RUB")
+    @JsonProperty
+    private String tradingCurrency;
+    @ApiModelProperty(value = "Наименование статуса листинга в системе", example = "ACTV")
+    @JsonProperty
+    private String workflowStatus;
+
+    @Override
+    public ListingNewRequest toRequest() {
+        ListingNewRequest request = new ListingNewRequest();
+        request.setSecurityId(this.securityId);
+        request.setMarket(this.market);
+        request.setLotSize(this.lotSize);
+        request.setTradingCurrency(this.tradingCurrency);
+        request.setWorkflowStatus(this.workflowStatus);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+
+    public Long getSecurityId() {
+        return securityId;
+    }
+
+    public void setSecurityId(Long securityId) {
+        this.securityId = securityId;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String market) {
+        this.market = market;
+    }
+
+    public BigDecimal getLotSize() {
+        return lotSize;
+    }
+
+    public void setLotSize(BigDecimal lotSize) {
+        this.lotSize = lotSize;
+    }
+
+    public String getTradingCurrency() {
+        return tradingCurrency;
+    }
+
+    public void setTradingCurrency(String tradingCurrency) {
+        this.tradingCurrency = tradingCurrency;
+    }
+
+    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/company/ListingUpdateAction.java

@@ -0,0 +1,97 @@
+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.ContactUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.securitites.ListingUpdateRequest;
+
+import java.math.BigDecimal;
+
+public class ListingUpdateAction implements IAction<ListingUpdateRequest> {
+    @ApiModelProperty(hidden = true)
+    @JsonProperty
+    public Long id;
+    @ApiModelProperty(value = "Наименование инструмента", example = "1234")
+    @JsonProperty
+    private Long securityId;
+    @ApiModelProperty(value = "Наименование режима", example = "ABCD")
+    @JsonProperty
+    private String market;
+    @ApiModelProperty(value = "Размер лота", example = "1234.56")
+    @JsonProperty
+    private BigDecimal lotSize;
+    @ApiModelProperty(value = "Наименование валюты расчета", example = "RUB")
+    @JsonProperty
+    private String tradingCurrency;
+    @ApiModelProperty(value = "Наименование статуса листинга в системе", example = "ACTV")
+    @JsonProperty
+    private String workflowStatus;
+
+    @Override
+    public ListingUpdateRequest toRequest() {
+        ListingUpdateRequest request = new ListingUpdateRequest();
+        request.setId(this.id);
+        request.setSecurityId(this.securityId);
+        request.setMarket(this.market);
+        request.setLotSize(this.lotSize);
+        request.setTradingCurrency(this.tradingCurrency);
+        request.setWorkflowStatus(this.workflowStatus);
+        return request;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.UPDATE;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSecurityId() {
+        return securityId;
+    }
+
+    public void setSecurityId(Long securityId) {
+        this.securityId = securityId;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String market) {
+        this.market = market;
+    }
+
+    public BigDecimal getLotSize() {
+        return lotSize;
+    }
+
+    public void setLotSize(BigDecimal lotSize) {
+        this.lotSize = lotSize;
+    }
+
+    public String getTradingCurrency() {
+        return tradingCurrency;
+    }
+
+    public void setTradingCurrency(String tradingCurrency) {
+        this.tradingCurrency = tradingCurrency;
+    }
+
+    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

@@ -0,0 +1,51 @@
+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/payment/PIClearingOutbondActionNew.java

@@ -0,0 +1,104 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.payment;
+
+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.payment.PIClearingOutbondActionNewRequest;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class PIClearingOutbondActionNew implements IAction<PIClearingOutbondActionNewRequest> {
+
+    @ApiModelProperty(value = "Участник отправитель", example = "123")
+    @JsonProperty
+    public Long senderId;
+    @ApiModelProperty(value = "Участник получатель", example = "123")
+    @JsonProperty
+    public Long addresseeId;
+    @ApiModelProperty(value = "Назначение платежа", example = "Text ...")
+    @JsonProperty
+    public String paymentPurpose;
+    @ApiModelProperty(value = "Сумма отправителя", example = "123.45")
+    @JsonProperty
+    public BigDecimal creditLeg_amount;
+    @ApiModelProperty(value = "Наименование счета отправителя", example = "2001")
+    @JsonProperty
+    public Long creditLeg_accountId;
+    @ApiModelProperty(value = "Наименование счета получателя", example = "2002")
+    @JsonProperty
+    public Long debitLeg_accountId;
+
+
+    @Override
+    public PIClearingOutbondActionNewRequest toRequest() {
+        var req = new PIClearingOutbondActionNewRequest();
+        req.setSenderId(this.senderId);
+        req.setAddresseeId(this.addresseeId);
+        req.setPaymentPurpose(this.paymentPurpose);
+        req.setCreditLeg_amount(this.creditLeg_amount);
+        req.setCreditLeg_accountId(this.creditLeg_accountId);
+        req.setDebitLeg_accountId(this.debitLeg_accountId);
+        return req;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public Long getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(Long senderId) {
+        this.senderId = senderId;
+    }
+
+    public Long getAddresseeId() {
+        return addresseeId;
+    }
+
+    public void setAddresseeId(Long addresseeId) {
+        this.addresseeId = addresseeId;
+    }
+
+    public String getPaymentPurpose() {
+        return paymentPurpose;
+    }
+
+    public void setPaymentPurpose(String paymentPurpose) {
+        this.paymentPurpose = paymentPurpose;
+    }
+
+    public BigDecimal getCreditLeg_amount() {
+        return creditLeg_amount;
+    }
+
+    public void setCreditLeg_amount(BigDecimal creditLeg_amount) {
+        this.creditLeg_amount = creditLeg_amount;
+    }
+
+    public Long getCreditLeg_accountId() {
+        return creditLeg_accountId;
+    }
+
+    public void setCreditLeg_accountId(Long creditLeg_accountId) {
+        this.creditLeg_accountId = creditLeg_accountId;
+    }
+
+    public Long getDebitLeg_accountId() {
+        return debitLeg_accountId;
+    }
+
+    public void setDebitLeg_accountId(Long debitLeg_accountId) {
+        this.debitLeg_accountId = debitLeg_accountId;
+    }
+}

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

@@ -0,0 +1,71 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.registry;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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.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.RegistryChangeRefundDateRequest;
+import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
+import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class ChangeRefundDateActionNew implements IAction<RegistryChangeRefundDateRequest> {
+
+    @JsonIgnore
+    public Long groupId;
+    @JsonProperty
+    @JsonSerialize(using = LocalDateSerializer.class)
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    public LocalDate refundDate;
+
+    @Override
+    public RegistryChangeRefundDateRequest toRequest() {
+        var req = new RegistryChangeRefundDateRequest();
+        req.setGroupId(groupId);
+        req.setRefundDate(refundDate);
+        return req;
+    }
+
+    @Override
+    public Collection<EnumMessage> validate() {
+        List<EnumMessage> errors = new ArrayList<>();
+        if (groupId == null) {
+            errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'groupId'"));
+        }
+        if (refundDate == null) {
+            errors.add(new EnumMessage(BackEndError.ValidationError, "refundDate"));
+        }
+        return errors;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.UPDATE;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public LocalDate getRefundDate() {
+        return refundDate;
+    }
+
+    public void setRefundDate(LocalDate refundDate) {
+        this.refundDate = refundDate;
+    }
+}

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

@@ -0,0 +1,82 @@
+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

@@ -0,0 +1,89 @@
+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

@@ -0,0 +1,58 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.registry;
+
+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.utilities.NotificationUpdateRequest;
+
+public class NotificationUpdateAction implements IAction<NotificationUpdateRequest> {
+    @ApiModelProperty(value = "Идентификатор записи", example = "123")
+    @JsonProperty
+    public Long id;
+    @ApiModelProperty(value = "Наименование статуса сообщения", example = "ACTV")
+    @JsonProperty
+    public String notificationStatus;
+    @ApiModelProperty(value = "Наименование отправителя (не исопльзуется)", example = "1234")
+    @JsonProperty(required = false)
+    @Deprecated
+    public Long senderId;
+
+    @Override
+    public NotificationUpdateRequest toRequest() {
+        var req = new NotificationUpdateRequest();
+        req.setId(this.id);
+        req.setNotificationStatus(this.notificationStatus);
+        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 getNotificationStatus() {
+        return notificationStatus;
+    }
+
+    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/registry/RSplitDepositActionNew.java

@@ -0,0 +1,100 @@
+package ru.spcex.clearing.backendapi.controller.request.cud.registry;
+
+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 org.apache.commons.lang3.StringUtils;
+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.RegistrySplitDepositActionRequest;
+import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
+import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
+import ru.spcex.platform.utils.enumeration.EnumMessage;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class RSplitDepositActionNew implements IAction<RegistrySplitDepositActionRequest> {
+
+    @ApiModelProperty(value = "Основание", example = "Основание ...")
+    @JsonProperty
+    public String comment;
+    @ApiModelProperty(value = "Сумма для вывода", example = "1600.20")
+    @JsonProperty
+    public BigDecimal outboundAmount;
+    @ApiModelProperty(value = "Дата возврата", example = "2022-12-25")
+    @JsonSerialize(using = LocalDateSerializer.class)
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @JsonProperty
+    public LocalDate refundDate;
+    @ApiModelProperty(value = "Договор для разделения", example = "ABCD")
+    @JsonProperty
+    public String contract;
+    @ApiModelProperty(value = "Направление", example = "OUT")
+    @JsonProperty
+    public String direction;
+
+
+    @Override
+    public RegistrySplitDepositActionRequest toRequest() {
+        var req = new RegistrySplitDepositActionRequest();
+        req.setComment(this.comment);
+        req.setOutboundAmount(this.outboundAmount);
+        req.setRefundDate(this.refundDate);
+        req.setContract(this.contract);
+        req.setDirection(this.direction);
+        return req;
+    }
+
+    @ApiModelProperty(hidden = true)
+    @Override
+    public ActionType getActionType() {
+        return ActionType.NEW;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public BigDecimal getOutboundAmount() {
+        return outboundAmount;
+    }
+
+    public void setOutboundAmount(BigDecimal outboundAmount) {
+        this.outboundAmount = outboundAmount;
+    }
+
+    public LocalDate getRefundDate() {
+        return refundDate;
+    }
+
+    public void setRefundDate(LocalDate refundDate) {
+        this.refundDate = refundDate;
+    }
+
+    public String getContract() {
+        return contract;
+    }
+
+    public void setContract(String contract) {
+        this.contract = contract;
+    }
+
+    public String getDirection() {
+        return direction;
+    }
+
+    public void setDirection(String direction) {
+        this.direction = direction;
+    }
+}

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

@@ -0,0 +1,68 @@
+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.RegistryReturnDepositRequest;
+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 ReturnDepositActionNew implements IAction<RegistryReturnDepositRequest>, WithId {
+
+    @JsonIgnore
+    public Long id;
+    @ApiModelProperty(value = "Сумма", example = "1600.20")
+    @JsonProperty
+    public BigDecimal balance;
+
+    @Override
+    public RegistryReturnDepositRequest toRequest() {
+        var req = new RegistryReturnDepositRequest();
+        req.setId(id);
+        req.setBalance(balance);
+        return req;
+    }
+
+    @Override
+    public Collection<EnumMessage> validate() {
+        List<EnumMessage> errors = new ArrayList<>();
+        if (id == null) {
+            errors.add(new EnumMessage(BackEndError.ValidationError, "url parameter 'id'"));
+        }
+        if (balance == null) {
+            errors.add(new EnumMessage(BackEndError.ValidationError, "balance"));
+        }
+        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;
+    }
+}

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

@@ -27,15 +27,6 @@ public class TradingClearingRegistryNewAction implements IAction<TradingClearing
     @JsonProperty
     private String status;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.companyId == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "companyId"));
-        if (this.moneyAccountId == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "moneyAccountId"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
 
     @Override
     public TradingClearingRegistryNewRequest toRequest() {

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

@@ -2,6 +2,7 @@ package ru.spcex.clearing.backendapi.controller.request.cud.registry;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
@@ -18,22 +19,31 @@ public class TradingClearingRegistryUpdateAction implements IAction<TradingClear
     @ApiModelProperty(hidden = true)
     @JsonProperty
     public Long id;
-
+    @ApiModelProperty(value = "Наименование компании", example = "123")
+    @JsonProperty
+    public Long companyId;
+    @ApiModelProperty(value = "Код торгово-клирингового регистра", example = "123")
+    @JsonProperty
+    public String code;
+    @ApiModelProperty(value = "Номер денежного счета", example = "123")
+    @JsonProperty
+    public Long moneyAccountId;
+    @ApiModelProperty(value = "Номер депозитарного счета", example = "123")
+    @JsonProperty
+    public Long depoAccountId;
+    @ApiModelProperty(value = "Наименование статуса", example = "ACTV")
     @JsonProperty
     private String status;
 
-    @Override
-    public Collection<EnumMessage> validate() {
-        List<EnumMessage> errors = new ArrayList<>();
-        if (this.id == null)
-            errors.add(new EnumMessage(BackEndError.ValidationError, "id"));
-        return errors.isEmpty() ? Collections.emptyList() : errors;
-    }
 
     @Override
     public TradingClearingRegistryUpdateRequest toRequest() {
         var req = new TradingClearingRegistryUpdateRequest();
         req.setId(this.id);
+        req.setCompanyId(this.companyId);
+        req.setCode(this.code);
+        req.setMoneyAccountId(this.moneyAccountId);
+        req.setDepoAccountId(this.depoAccountId);
         req.setStatus(this.status);
         return req;
     }
@@ -52,6 +62,38 @@ public class TradingClearingRegistryUpdateAction implements IAction<TradingClear
         this.id = id;
     }
 
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getMoneyAccountId() {
+        return moneyAccountId;
+    }
+
+    public void setMoneyAccountId(Long moneyAccountId) {
+        this.moneyAccountId = moneyAccountId;
+    }
+
+    public Long getDepoAccountId() {
+        return depoAccountId;
+    }
+
+    public void setDepoAccountId(Long depoAccountId) {
+        this.depoAccountId = depoAccountId;
+    }
+
     public String getStatus() {
         return status;
     }