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

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

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

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

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

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

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

@@ -171,7 +171,7 @@ public class AccountService extends QueueConsumer implements InitializingBean {
                 } else if (AccountType.Info.equalsByKey(account.getAccountType()))
                     makeInfoPart(imdgTransaction, account);
                 else if (AccountType.Depo.equalsByKey(account.getAccountType()))
-                    makeDepoPart(imdgTransaction, account, req);
+                    makeDepoPart(imdgTransaction, account);
                 else if (AccountType.Clrn.equalsByKey(account.getAccountType()))
                     makeClrnPart(imdgTransaction, account);
                 else {
@@ -210,22 +210,17 @@ public class AccountService extends QueueConsumer implements InitializingBean {
         log.debug("For account id={} make InformationAccount id={}", account.getId(), infoId);
     }
 
-    protected void makeDepoPart(ImdgTransaction imdgTransaction, Account account, CorrespondentAccountNewRequest req) {
+    protected void makeDepoPart(ImdgTransaction imdgTransaction, Account account) {
-        Imdg<DepoAccount> depoAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_DepoAccount, DepoAccount.class);
+        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);
+        Imdg<ClearingAccount> clearingAccountMap = imdgTransaction.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);;
         ClearingAccount clnrAcc = new ClearingAccount();
         clnrAcc.setAccountId(account.getId());
         clnrAcc.setCompanyId(account.getCompanyId());

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

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

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

@@ -70,7 +70,6 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
     private final Function<ClearingAccountUpdateRequest, IValidator> clearingAccountUpdateRequestValidator;
 
     private final Imdg<Account> accountImdg;
-    private final Imdg<ClearingAccount> clearingAccountImdg;
     private final Imdg<Company> companyImdg;
     private final Imdg<Relation> relationImdg;
     private final Imdg<ClearingMemberCategory> clearingMemberCategoryImdg;
@@ -104,7 +103,6 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
         this.clearingAccountUpdateRequestValidator = clearingAccountUpdateRequestValidator;
 
         this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
-        this.clearingAccountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingAccount, ClearingAccount.class);
         this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.relationImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Relation, Relation.class);
         this.clearingMemberCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
@@ -364,16 +362,11 @@ public class ClearingAccountService extends QueueConsumer implements Initializin
                 );
                 Account account = sDf52.getAccount() == null ? null : accountImdg.getFirstObjectByFieldValues(accountQuery);
                 if (account == null) {
-                    if (SDFProcessService.SDF52_STATUS_3Open.equals(sDf52.getStatus())) {
+                    String msg = messageResolver.resolve(new EnumMessage(AccountError.AccountNotFound, sDf52.getAccount()));
-                        log.debug("By generationId={} s_df52[{}].status={}, but account not found (query: {}). COntinuse with result OK for status 3",
+                    log.warn("By generationId={} s_df52[{}] (query: {}) error: {}", groupId, sDf52.getId(), accountQuery, msg);
-                                groupId, sDf52.getId(), sDf52.getStatus(), accountQuery);
+                    toProcessSDF53.add(new MutableTriple<>(sDf52, null,
-                    } else {
+                            makeSdfErrorText(AccountError.AccountNotFound, SDFProcessService.SDF_STATUS_ERROR_COMPANY_NOT_FOUND)));
-                        String msg = messageResolver.resolve(new EnumMessage(AccountError.AccountNotFound, sDf52.getAccount()));
+                    continue;
-                        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));

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

@@ -23,7 +23,10 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.SdfTable;
+import ru.spcex.platform.enumeration.ServiceStatus;
+import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.ImdgTransaction;
@@ -111,11 +114,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
             depoAccount = new DepoAccount();
             depoAccount.setCompanyId(req.getCompanyId());
             depoAccount.setAccountId(accountId);
-            if (account.getAccount() != null && account.getAccount().contains("BC")) {
+            depoAccount.setDepoAccountType(req.getDepoAccountType());
-                depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
-            } else {
-                depoAccount.setDepoAccountType(req.getDepoAccountType());
-            }
             depoAccountId = depoAccountImdg.insert(depoAccount);
             txOk = true;
         } finally {
@@ -189,11 +188,7 @@ public class DepoAccountService extends QueueConsumer implements InitializingBea
                 DepoAccount depoAccount = new DepoAccount();
                 depoAccount.setCompanyId(accountReq.getCompanyId());
                 depoAccount.setAccountId(accountId);
-                if (account.getAccount() != null && account.getAccount().contains("BC")) {
+                depoAccount.setDepoAccountType(accountReq.getAccountType());
-                    depoAccount.setDepoAccountType(DepoAccountType.C.getKey());
-                } else {
-                    depoAccount.setDepoAccountType(accountReq.getAccountType());
-                }
                 depoAccountId = depoAccountImdg.insert(depoAccount);
 
 

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

@@ -38,11 +38,6 @@ public class SDFProcessService {
     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;
@@ -134,12 +129,12 @@ public class SDFProcessService {
      * @return AccountStatus или null
      */
     public AccountStatus parseSdf52Status(Long status) {
-        if (SDF52_STATUS_1Unblocked.equals(status) || SDF52_STATUS_3Open.equals(status)) {
+        if (Long.valueOf(1L).equals(status) || Long.valueOf(3L).equals(status)) {
             return AccountStatus.ACTIVE;
-        } else if (SDF52_STATUS_0Blocked.equals(status)) {
+        } else if (Long.valueOf(0L).equals(status)) {
             return AccountStatus.BLOCKED;
         }
-        if (SDF52_STATUS_2Closed.equals(status)) {
+        if (Long.valueOf(2L).equals(status)) {
             return AccountStatus.CLOSE;
         }
         return null;

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

@@ -1,5 +1,7 @@
 package ru.spcex.clearing.account.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.Producer;
@@ -23,26 +25,39 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.InformationAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.ActionType;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.CorrespondentAccountUpdateRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.AccountSdfToStatementRequestPart;
+import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.service.RequestInfo;
-import ru.spcex.clearing.test.MatcherFactory;
+import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
 import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.test.TestUtils.*;
+import static ru.spcex.clearing.test.config.ImdgTestConfig.currentID;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {

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

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,18 @@
 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.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;
@@ -20,10 +25,10 @@ import ru.spcex.clearing.account.config.BeanConfiguration;
 import ru.spcex.clearing.account.config.validation.AccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.InformationAccountValidationConfig;
 import ru.spcex.clearing.account.config.validation.ValidationConfig;
+import ru.spcex.clearing.account.utils.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.InformationAccountNewRequest;
-import ru.spcex.clearing.test.MatcherFactory;
 import ru.spcex.clearing.test.TestObjectCreator;
 import ru.spcex.clearing.test.config.ImdgTestConfig;
 import ru.spcex.clearing.test.config.KafkaTestConfig;
@@ -31,12 +36,16 @@ import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.platform.enumeration.*;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 import javax.annotation.PostConstruct;
 import java.util.Map;
 
-import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator;
+import static org.mockito.Mockito.timeout;
-import static ru.spcex.clearing.test.TestUtils.*;
+import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.test.TestUtils.addRecordToKafka;
+import static ru.spcex.clearing.test.TestUtils.getJsonStringForNew;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -62,8 +71,12 @@ class InformationAccountServiceTest {
 
     @Autowired
     @Qualifier("hazelcastServiceTest")
-    private ImdgProvider hazelcastServiceTest;
+    private HazelcastService hazelcastServiceTest;
 
+    @Captor
+    private ArgumentCaptor<ProducerRecord> producerRecord;
+    @SpyBean
+    private MockProducer<String, Object> producer;
     @Autowired
     @Qualifier("mockProducer")
     protected Producer<String, Object> mockProducer;
@@ -85,7 +98,6 @@ class InformationAccountServiceTest {
         accountImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Account, Account.class
         );
-        clearImdg(accountImdg);
 
         companyImdg = hazelcastServiceTest.getImdg(
                 IMDGDistributedNames.Map_Company, Company.class
@@ -133,7 +145,6 @@ class InformationAccountServiceTest {
     void accountInformationNew() {
         InformationAccountNewRequest InformationAccountNewRequest = new InformationAccountNewRequest();
         InformationAccountNewRequest.setCompanyId(companyId);
-        InformationAccountNewRequest.setAccount(account);
 
         String jsonString = getJsonStringForNew(InformationAccountNewRequest, 0L);
 
@@ -143,7 +154,9 @@ class InformationAccountServiceTest {
                 0,
                 jsonString);
 
-        waitingSendAndCheckRecord(0L, mockProducer);
+        //waiting for kafka producer send message (finale event)
+        verify(producer, timeout(30_000L).times(2))
+                .send(producerRecord.capture());
 
         Account predictableAccount = new Account();
         predictableAccount.setAccountType(AccountType.Info.getKey());
@@ -159,7 +172,7 @@ class InformationAccountServiceTest {
         InformationAccount resultInfoAccountNew = informationAccountImdg.getFirstObjectByFieldValues(Map.of("accountId", resultAccountNew.getId()));
 
         predictableAccount.setId(resultAccountNew.getId());
-        predictableAccount.setAccount(account);
+        predictableAccount.setAccount(informationAccountService.generateInfoAccount(resultInfoAccountNew.getId()));
         predictableInfoAccount.setAccountId(resultAccountNew.getId());
         predictableInfoAccount.setId(resultInfoAccountNew.getId());
 
@@ -170,6 +183,7 @@ class InformationAccountServiceTest {
         accountImdg.delete(resultAccountNew);
     }
 
+    @Autowired ImdgProvider imdgProvider;
     @Test
     void accountIncrementSequence() {
         Imdg<InformationAccount> accountInfoImdg = hazelcastServiceTest.getImdg( IMDGDistributedNames.Map_InformationAccount, InformationAccount.class );
@@ -189,7 +203,7 @@ class InformationAccountServiceTest {
         }
         UserRoleVerification userRoleVerification = Mockito.mock(UserRoleVerification.class);
         InformationAccountService infoAccSvc=new InformationAccountService(null,null,null,
-                null, userRoleVerification, hazelcastServiceTest, null, null, null, null);
+                null, userRoleVerification, imdgProvider, null, null, null, null);
         Long n = infoAccSvc.accountNextId();
         Assertions.assertEquals(13L, n);
         n = infoAccSvc.accountNextId();

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

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

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

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

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

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

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

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

clearing-parent/backend-api/pom.xml

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

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

@@ -1,7 +1,5 @@
 package ru.spcex.clearing.backendapi.config;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -13,8 +11,6 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 @Configuration
 public class BackEndApiImdgConfig {
-    Logger log = LoggerFactory.getLogger(getClass());
-
     @Bean(name = "taskExecutorHazelcastClientInitializer")
     public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer() {
         return createThreadPoolTaskExecutor(1, true);
@@ -25,16 +21,6 @@ public class BackEndApiImdgConfig {
         return createThreadPoolTaskExecutor(1, false);
     }
 
-    @Bean(name = "taskExecutorHazelcastClientInitializerHist")
-    public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializerHist() {
-        return createThreadPoolTaskExecutor(1, true);
-    }
-
-    @Bean(name = "taskExecutorIdGeneratorAwaiterHist")
-    public ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiterHist() {
-        return createThreadPoolTaskExecutor(1, false);
-    }
-
     @Autowired
     @Bean
     public ImdgProvider imdgProvider(
@@ -42,10 +28,6 @@ public class BackEndApiImdgConfig {
             @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
             BackendApiSettings clientSetting
     ) {
-        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());
@@ -53,24 +35,6 @@ public class BackEndApiImdgConfig {
         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;
-    }
-
 
     private static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int maxPoolSz, boolean waitForCompletion) {
         ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -25,9 +25,6 @@ public class IdentificationFundsActionNew implements IAction<IdentificationFunds
     @ApiModelProperty(value = "Торгово-клиринговый регистр", example = "1234")
     @JsonProperty
     public Long tradingClearingRegistryId;
-    @ApiModelProperty(value = "Идентификатор компании", example = "1234")
-    @JsonProperty
-    public Long companyId;
 
     @Override
     public IdentificationFundsRequest toRequest() {
@@ -35,7 +32,6 @@ public class IdentificationFundsActionNew implements IAction<IdentificationFunds
         req.setId(id);
         req.setBalance(balance);
         req.setTradingClearingRegistryId(tradingClearingRegistryId);
-        req.setCompanyId(companyId);
         return req;
     }
 
@@ -78,12 +74,4 @@ public class IdentificationFundsActionNew implements IAction<IdentificationFunds
     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/schedule/LauncherNew.java

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

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

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

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

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

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

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

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

@@ -17,9 +17,4 @@ public interface IStateLoader {
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransformSpecificClass(String mapName, Class<T> clazz);
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName, Class<T> clazz, Map<String, ? extends Comparable<?>> conditions);
     <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(String mapName, Class<T> clazz, ImdgPredicate conditions);
-    <T extends SpcexObjectBase> Collection<Map<String, Object>> getAllMetaTransform(
-            String searchMapName,
-            String mapName,
-            Class<T> clazz,
-            ImdgPredicate conditions);
 }

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.9.0.71",
+		"version": "3.8.0.58",
 		
 		"enums": {
 		
@@ -3328,11 +3328,11 @@
 			"type": 3,"name": "Номер купона","shortname": "Номер","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodStartDate",
+		{"code": "periodEndDate",
 			"type": 6,"name": "Начало периода действия","shortname": "Начало","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodEndDate",
+		{"code": "periodStartDate",
 			"type": 6,"name": "Окончание периода действия","shortname": "Окончание","searchable": true,"sortable": true,"visible": true
 		}
 	,
@@ -4132,10 +4132,6 @@
 		{"code": "balance",
 			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
 		}
-	,
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
 	,
 		{"code": "tradingClearingRegistryId",
 			"type": 1,"name": "Торгово-клиринговый регистр","shortname": "Торгово-клиринговый регистр","link": "tradingClearingRegistry","linkCode": "code","required": true
@@ -4668,66 +4664,6 @@
 		}
 	]
 			
-		}
-	,
-		"accountSymbols": {
-			
-				"name": "Депо КС - РДЦ",
-			
-				"destination": "accounting/depo-accounts-symbols",
-			
-				"class": "ru.clearing.classes.statics.data.account.AccountSymbols",
-			
-				"logUpdates": "true",
-			
-				"table": "depo_account_symbols",
-			
-			"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
-		}
-	,
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","searchable": true,"sortable": true,"visible": true,"link": "account","linkCode": "account"
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","searchable": true,"sortable": true,"visible": true
-		}
-	]
-			,"actions":[
-			{"method":"post",
-				
-					"name": "Добавление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction",
-				
-				"fields": [
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","link": "account","linkCode": "account","required": true
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"clearingAccount": {
@@ -5334,15 +5270,11 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)",
+					"name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)",
 				
 				"fields": [
-		{"code": "fullBalance",
-			"type": 10,"name": "Текущий баланс (всего)","shortname": "Текущие средства (всего)","enabled": false
-		}
-	,
 		{"code": "balance",
-			"type": 10,"name": "Текущий баланс (свободно)","shortname": "Текущие средства (свободно)","enabled": false
+			"type": 10,"name": "Текущий баланс","shortname": "Текущие средства","enabled": false
 		}
 	,
 		{"code": "securitySymbol",
@@ -5358,7 +5290,7 @@
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true
+			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true,"enabled": false
 		}
 	,
 		{"code": "creditLeg_accountId",
@@ -5577,28 +5509,6 @@
 				
 					"name": "Формирование ДФ-05 с кодом 9 (финальный)",
 				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CHDF",
-				
-					"group": "Общее",
-				
-					"name": "Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21",
-				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CCLR",
-				
-					"group": "Клиринг",
-				
-					"name": "Завершение неудачных клиринговых сессий",
-				
 				"fields": []
 			}
 		]
@@ -5634,7 +5544,7 @@
 		}
 	,
 		{"code": "sessionStatus",
-			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Шаг","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
+			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
 		}
 	,
 		{"code": "companyId",
@@ -5866,12 +5776,10 @@
 	,
 		"executionDeposit": {
 			
-				"name": "Сделки на секции МКР",
+				"name": "Сделки",
 			
 				"destination": "execution-deposits",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionDeposit",
 			
 				"logUpdates": "true",
@@ -6024,8 +5932,6 @@
 			
 				"destination": "execution-fonds",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionFond",
 			
 				"logUpdates": "true",
@@ -6174,19 +6080,17 @@
 			
 				"destination": "depo-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister",
 			
 				"table": "balance_depo_register",
 			
 			"fields": [
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
-			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true
+			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true
 		}
 	,
 		{"code": "updatedAt",
@@ -6198,7 +6102,7 @@
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "depoCode",
@@ -6222,8 +6126,6 @@
 			
 				"destination": "money-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister",
 			
 				"table": "money_balance_register",
@@ -6238,7 +6140,7 @@
 		}
 	,
 		{"code": "infoAccount",
-			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "remainderSum",
@@ -6246,23 +6148,23 @@
 		}
 	,
 		{"code": "blockedSum",
-			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "unblockedSum",
-			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "inn",
-			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "companyFullName",
-			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "companyId",
@@ -6270,7 +6172,7 @@
 		}
 	,
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
@@ -6278,7 +6180,7 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
 		}
 	]
 			
@@ -6290,8 +6192,6 @@
 			
 				"destination": "admitted-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister",
 			
 				"table": "admitted_liabilities_register",
@@ -6354,8 +6254,6 @@
 			
 				"destination": "covered-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister",
 			
 				"table": "covered_Liabilities_register",
@@ -6418,8 +6316,6 @@
 			
 				"destination": "money-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister",
 			
 				"table": "money_payment_instruction_register",
@@ -6474,8 +6370,6 @@
 			
 				"destination": "depo-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister",
 			
 				"table": "depo_payment_instruction_register",
@@ -6530,8 +6424,6 @@
 			
 				"destination": "exclude-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister",
 			
 				"table": "exclude_liabilities_register",
@@ -6610,8 +6502,6 @@
 			
 				"destination": "liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister",
 			
 				"table": "liabilities_register",
@@ -6690,8 +6580,6 @@
 			
 				"destination": "execution-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExecutionRegister",
 			
 				"table": "execution_register",

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
-<meta version="3.9.0.71">
+<meta version="3.8.0.58">
 	<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
 	<!--Здесь словари-->
 	<enums>
@@ -772,8 +772,8 @@
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="true" sortable="true" link="security" linkCode="shortName"/>
 			<couponRate type="11" name="Купонная ставка" shortname="Ставка" searchable="true" sortable="true" visible="true"/>
 			<number type="3" name="Номер купона" shortname="Номер" searchable="true" sortable="true" visible="true"/>
-			<periodStartDate type="6" name="Начало периода действия" shortname="Начало" searchable="true" sortable="true" visible="true"/>
+			<periodEndDate type="6" name="Начало периода действия" shortname="Начало" searchable="true" sortable="true" visible="true"/>
-			<periodEndDate type="6" name="Окончание периода действия" shortname="Окончание" searchable="true" sortable="true" visible="true"/>
+			<periodStartDate type="6" name="Окончание периода действия" shortname="Окончание" searchable="true" sortable="true" visible="true"/>
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 		</couponPeriod>
         <listing name="Инструменты на режимах" destination="listings" class="ru.clearing.classes.statics.data.misc.Listing" logUpdates="true" table="listing">
@@ -959,7 +959,6 @@
 				<post name="Идентификация неразмеченных средств" destination="registries/identificationFunds" confirmation="balance,tradingClearingRegistryId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>
 					<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
-					<companyId type="1" name="Наименование компании" shortname="Компания" link="company" linkCode="shortName" required="true"/>
 					<tradingClearingRegistryId type="1" name="Торгово-клиринговый регистр" shortname="Торгово-клиринговый регистр" link="tradingClearingRegistry" linkCode="code" required="true"/>
 				</post>
 				<put name="Изменение даты возврата депозита" destination="registries/changeRefundDate" confirmation="contact,contract,refundDate" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ChangeRefundDateActionNew"> 
@@ -1084,20 +1083,6 @@
 			<serviceStatus field="accountId" type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" linkKeyCode="id" linkCode="status" link="account" extends="account" />
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 		</depoAccount>
-		<accountSymbols name="Депо КС - РДЦ" destination="accounting/depo-accounts-symbols" class="ru.clearing.classes.statics.data.account.AccountSymbols" logUpdates="true" table="depo_account_symbols">
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
-			<accountId type="1" dbname="Идентификатор счета" name="Счет депо КС" shortname= "Счет депо КС" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
-			<accountSymbolValue type="2" length="255" name="Счет РДЦ" shortname="Счет РДЦ" searchable="true" sortable="true" visible="true"/>
-			<actions>
-				<post name="Добавление депо КС - РДЦ" confirmation="accountId,accountSymbolValue" class="ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction">
-					<accountId type="1" dbname="Идентификатор счета" name="Счет депо КС" shortname= "Счет депо КС" link="account" linkCode="account" required="true"/>
-					<accountSymbolValue type="2" length="255" name="Счет РДЦ" shortname="Счет РДЦ" required="true"/>
-				</post>
-				<delete name="Удаление депо КС - РДЦ" confirmation="accountId,accountSymbolValue">
-					<id type="1" name="Идентификатор записи" shortname="ID" link="account" linkCode="id" required="true"/>
-				</delete>
-			</actions>
-		</accountSymbols>
 		<clearingAccount name="Торгово-Банковские счета" destination="accounting/clearing-accounts" class="ru.clearing.classes.statics.data.account.ClearingAccount" logUpdates="true" table="clearing_account">
 			<accountId type="1" dbname="Идентификатор счета" name="Номер счета" shortname="Счет" searchable="true" sortable="true" visible="true" link="account" linkCode="account"/>
 			<clearingAccountType type="12" dbname="Код типа счета" name="Наименование типа счета" shortname="Тип" searchable="true" sortable="true" visible="true" link="clearingAccountType" linkCode="name"/>
@@ -1237,13 +1222,12 @@
 				</post>
 				<post destination="GALB" group="Обмен с расчетной организацией" name="Запрос остатков по всем счетам (отправка ДФ-56 для получения ответа ДФ-01, ДФ-57)">
 				</post>
-				<post destination="OUTV" group="Обмен с расчетной организацией" name="Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)">
+				<post destination="OUTV" group="Обмен с расчетной организацией" name="Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)">
-					<fullBalance type="10" name="Текущий баланс (всего)" shortname="Текущие средства (всего)" enabled="false"/>
+					<balance type="10" name="Текущий баланс" shortname="Текущие средства" enabled="false"/>
-					<balance type="10" name="Текущий баланс (свободно)" shortname="Текущие средства (свободно)" enabled="false"/>
 					<securitySymbol type="2" name="Наименование инструмента/валюты" shortname="Валюта" enabled="false"/>
 					<creditLeg_amount type="10" name="Сумма отправителя" shortname="Сумма" required="true"/>
 					<paymentPurpose type="2" length="255" name="Назначение платежа" shortname="Основание" required="true"/>
-					<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true"/>
+					<senderId type="1" group="Отправитель" name="Участник отправитель" shortname="Отправитель" link="company" linkCode="shortName" required="true" enabled="false"/>
 					<creditLeg_accountId type="1" group="Отправитель" name="Наименование счета отправителя" shortname="Регистр списания" link="account" linkCode="account"/>
 					<addresseeId type="1" group="Получатель" name="Участник получатель" shortname="Получатель" link="company" linkCode="shortName" required="true" enabled="false"/>
 					<debitLeg_accountId type="1" group="Получатель" name="Наименование счета получателя" shortname="Счет получателя" link="bankAccount" linkCode="correspondentAccount"/>
@@ -1286,10 +1270,6 @@
 				</post>
 				<post destination="FDFF" group="Обмен с расчетной организацией" name="Формирование ДФ-05 с кодом 9 (финальный)">
 				</post>
-				<post destination="CHDF" group="Общее" name="Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21">
-				</post>
-				<post destination="CCLR" group="Клиринг" name="Завершение неудачных клиринговых сессий">
-				</post>
 			</actions>
         </launcher>
 
@@ -1298,7 +1278,7 @@
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<clearingDate type="6" name="Дата" shortname="Дата" searchable="true" sortable="true" visible="true"/>
-			<sessionStatus type="12" dbname="Код статуса клиринговой сессии" name="Статус клиринговой сессии" shortname="Шаг" searchable="true" sortable="true" visible="true" link="sessionStatus"/>
+			<sessionStatus type="12" dbname="Код статуса клиринговой сессии" name="Статус клиринговой сессии" shortname="Статус" searchable="true" sortable="true" visible="true" link="sessionStatus"/>
 			<companyId type="1" dbname="Идентификатор инициатора торгов" name="Наименование инициатора торгов" shortname="Инициатор" visible="false" searchable="true" sortable="true" link="company" linkCode="shortName"/>
 			<securityId type="1" dbname="Идентификатор инструмента" name="Наименование инструмента" shortname="Инструмент" searchable="false" sortable="true" visible="true" link="security" linkCode="shortName"/>
 			<userId type="1" dbname="Идентификатор пользователя" name="Наименование пользователя" shortname="Пользователь" searchable="true" sortable="true" visible="true" link="userCls" linkCode="identifier"/>
@@ -1355,7 +1335,7 @@
 			<bankAccId type="2" length="12" name="Идентификатор расчетного счета/кода в клиринговой организации" shortname="Код позиции" searchable="true" sortable="true"/>
 			<section type="12" dbname="Код наименования секции" name="Наименование секции" shortname="Секция" searchable="true" sortable="true" visible="true" link="section"/>
 		</sTrades>
-		<executionDeposit name="Сделки на секции МКР" destination="execution-deposits" historyDestination="history" class="ru.clearing.classes.statics.data.execution.ExecutionDeposit" logUpdates="true" table="execution_deposit">
+		<executionDeposit name="Сделки" destination="execution-deposits" class="ru.clearing.classes.statics.data.execution.ExecutionDeposit" logUpdates="true" table="execution_deposit">
 			<exchangeExecutionId type="1" name="Идентификационный номер сделки в Торговой системе" shortname="Номер сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionTime type="4" name="Время заключения сделки в Торговой системе" shortname="Время заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<tradingDate type="6" name="Дата заключения сделки" shortname="Дата заключения сделки" visible="true" searchable="true" sortable="true"/>
@@ -1391,7 +1371,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" visible="false" searchable="true" sortable="true"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" visible="false" searchable="true" sortable="true"/>
 		</executionDeposit>
-		<executionFond name="Сделки на Фондовой секции" destination="execution-fonds" historyDestination="history" class="ru.clearing.classes.statics.data.execution.ExecutionFond" logUpdates="true" table="execution_fond">
+		<executionFond name="Сделки на Фондовой секции" destination="execution-fonds" class="ru.clearing.classes.statics.data.execution.ExecutionFond" logUpdates="true" table="execution_fond">
 			<id type="1" name="Идентификатор записи" shortname="ID" visible="false" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" visible="false" searchable="true" sortable="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" visible="false" searchable="true" sortable="true"/>
@@ -1426,32 +1406,32 @@
 			<coverageStatus type="12" dbname="Код статуса достаточности обеспечения" name="Cтатус достаточности обеспечения" shortname="Обеспеченность" searchable="true" sortable="true" link="allowed"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 		</executionFond>
-		<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.DepoBalanceRegister" table="balance_depo_register">
+		<depoBalanceRegister name="Реестр остатков ценных бумаг" destination="depo-balance-registers" class="ru.clearing.classes.statics.data.register.DepoBalanceRegister" table="balance_depo_register">
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" ignore="true"/>
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
-            <createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true"/>
+			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" visible="true" searchable="true" sortable="true" link="company" linkCode="shortName"/> 
-			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session" ignore="true"/>
+			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<depoCode type="2" length="50" name="Код раздела субсчета/счета депо" shortname="Код счета депо" searchable="true" sortable="true"/> 
 			<quantity type="11" name="Количество" shortname="Количество" searchable="true" sortable="true"/> 
 			<securitySymbol type="2" length="255" name="Код ценной бумаги" shortname="Ценная бумага" searchable="true" sortable="true"/>
 		</depoBalanceRegister>
-		<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.MoneyBalanceRegister" table="money_balance_register">
+		<moneyBalanceRegister name="Реестр остатков денежных средств" destination="money-balance-registers" class="ru.clearing.classes.statics.data.register.MoneyBalanceRegister" table="money_balance_register">
 			<setHouseName type="2" length="255" name="Наименование РО" shortname="Наименование РО" searchable="true" sortable="true" visible="true"/>
 			<account type="2" length="50" name="Номер торгового/клирингового счета" shortname="Номер торгового/клирингового счета" searchable="true" sortable="true" visible="true"/>
-			<infoAccount type="2" length="50" name="Номер счета внутреннего учета СПВБ" shortname="Номер счета внутреннего учета СПВБ" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<infoAccount type="2" length="50" name="Номер счета внутреннего учета СПВБ" shortname="Номер счета внутреннего учета СПВБ" searchable="true" sortable="true" visible="true"/>
 			<remainderSum type="10" name="Остаток денежных средств" shortname="Остаток" searchable="true" sortable="true"/>
-			<blockedSum type="10" name="Сумма блокированных денежных средств" shortname="Блокированные" searchable="true" sortable="true" ignore="true"/>
+			<blockedSum type="10" name="Сумма блокированных денежных средств" shortname="Блокированные" searchable="true" sortable="true"/>
-			<unblockedSum type="10" name="Сумма свободных денежных средств" shortname="Свободные" searchable="true" sortable="true" ignore="true"/>
+			<unblockedSum type="10" name="Сумма свободных денежных средств" shortname="Свободные" searchable="true" sortable="true"/>
-			<inn type="2" length="255" name="Идентификационный номер налогоплательщика (ИНН)" shortname="ИНН" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<inn type="2" length="255" name="Идентификационный номер налогоплательщика (ИНН)" shortname="ИНН" searchable="true" sortable="true" visible="true"/>
-			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session" ignore="true"/>
+			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
-			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true" ignore="true"/>
+			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
             <companyId type="1" dbname="Идентификатор компании" name="Наименование компании" shortname="Компания" searchable="true" sortable="true" visible="true" link="company" linkCode="shortName"/>
-			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true" ignore="true"/>
+			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true"/>
-			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
+			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true"/>
 		</moneyBalanceRegister>
-		<admittedLiabilitiesRegister name="Реестр обязательств, допущенных к клирингу" destination="admitted-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister" table="admitted_liabilities_register">
+		<admittedLiabilitiesRegister name="Реестр обязательств, допущенных к клирингу" destination="admitted-liabilities-registers" class="ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister" table="admitted_liabilities_register">
 			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<securitySymbol type="2" length="255" name="Финансовый инструмент" shortname="Код биржевого инструмента / товара" searchable="true" sortable="true" visible="true"/>
@@ -1465,7 +1445,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" visible="false"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" searchable="true" sortable="true" visible="false"/>
  		</admittedLiabilitiesRegister>
- 		<coveredLiabilitiesRegister name="Реестр обязательств, прошедших процедуру контроля обеспечения" destination="covered-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister" table="covered_Liabilities_register">
+ 		<coveredLiabilitiesRegister name="Реестр обязательств, прошедших процедуру контроля обеспечения" destination="covered-liabilities-registers" class="ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister" table="covered_Liabilities_register">
 			<companyFullName type="2" length="255" name="Полное наименование компании" shortname="Полное наименование компании" searchable="true" sortable="true" visible="true"/>
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 			<securitySymbol type="2" length="255" name="Финансовый инструмент" shortname="Код биржевого инструмента / товара" searchable="true" sortable="true" visible="true"/>
@@ -1479,7 +1459,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" visible="false"/>
 			<clearingDate type="6" name="Дата клиринга" shortname="Дата клиринга" searchable="true" sortable="true" visible="false"/>
  		</coveredLiabilitiesRegister>
-		<moneyPaymentInstructionRegister name="Реестр распоряжений, направленных расчетной организации" destination="money-payment-instruction-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister" table="money_payment_instruction_register">
+		<moneyPaymentInstructionRegister name="Реестр распоряжений, направленных расчетной организации" destination="money-payment-instruction-registers" class="ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister" table="money_payment_instruction_register">
 			<creditLegAccount type="2" length="50" name="Счет отправителя" shortname="Счет отправителя" searchable="true" sortable="true" visible="true"/>
 			<creditLegAmount type="10" name="Сумма отправителя" shortname="Сумма отправителя" searchable="true" sortable="true" visible="true"/>
 			<creditLegCurrencyCode type="12" dbname="Код валюты отправителя" name="Наименование валюты отправителя" shortname="Валюта отправителя" searchable="true" sortable="true" visible="true" link="currency"/>
@@ -1491,7 +1471,7 @@
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
 			<clearingDate type="6" name="Дата расчета" shortname="Дата расчета" searchable="true" sortable="true" visible="true"/>
 		</moneyPaymentInstructionRegister>
-		<depoPaymentInstructionRegister name="Реестр распоряжений, направленных расчетному депозитарию" destination="depo-payment-instruction-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister" table="depo_payment_instruction_register">
+		<depoPaymentInstructionRegister name="Реестр распоряжений, направленных расчетному депозитарию" destination="depo-payment-instruction-registers" class="ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister" table="depo_payment_instruction_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1503,7 +1483,7 @@
 			<direction type="1" name="Направление" shortname="Направление" searchable="true" sortable="true" link="inOutDirection" ignore="true"/>	
 			<sessionId type="1" dbname="Идентификатор клиринговой сессии" name="Клиринговая сессия" shortname="Сессия" visible="true" searchable="true" sortable="true" link="session"/>
 		</depoPaymentInstructionRegister>
-		<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
+		<excludeLiabilitiesRegister name="Реестр обязательств, исключенных из клирингового пула" destination="exclude-liabilities-registers" class="ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister" table="exclude_liabilities_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1521,7 +1501,7 @@
 			<sumLiabilities type="10" name="Сумма обязательств" shortname="Обязательства" searchable="true" sortable="true" visible="true"/>
 			<settlementDate type="6" name="Дата расчета" shortname="Расчет" searchable="true" sortable="true"/>
 		</excludeLiabilitiesRegister>
-		<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.LiabilitiesRegister" table="liabilities_register">
+		<liabilitiesRegister name="Реестр учета обязательств" destination="liabilities-registers" class="ru.clearing.classes.statics.data.register.LiabilitiesRegister" table="liabilities_register">
 			<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
 			<createdAt field="created" type="4" webtype="5" dbname="Дата-время создания записи" name="Время создания записи" shortname="Создано" searchable="true" sortable="true" ignore="true"/>
 			<updatedAt field="updated" type="4" webtype="5" dbname="Дата-время изменения записи" name="Время изменения записи" shortname="Изменено" searchable="true" sortable="true" ignore="true"/>
@@ -1539,7 +1519,7 @@
 			<sumLiabilities type="10" name="Сумма обязательств" shortname="Обязательства" searchable="true" sortable="true" visible="true"/>
 			<settlementDate type="6" name="Дата расчета" shortname="Расчет" searchable="true" sortable="true"/>
 		</liabilitiesRegister>
-		<executionRegister name="Реестр сделок" destination="execution-registers" historyDestination="history" class="ru.clearing.classes.statics.data.register.ExecutionRegister" table="execution_register">
+		<executionRegister name="Реестр сделок" destination="execution-registers" class="ru.clearing.classes.statics.data.register.ExecutionRegister" table="execution_register">
 			<tradingDate type="6" name="Дата заключения сделки" shortname="Дата заключения сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionId type="1" name="Идентификационный номер сделки в Торговой системе" shortname="Номер сделки" visible="true" searchable="true" sortable="true"/>
 			<exchangeExecutionTime type="4" name="Время заключения сделки в Торговой системе" shortname="Время заключения сделки" visible="true" searchable="true" sortable="true"/>

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.9.0.71",
+		"version": "3.8.0.58",
 		
 		"enums": {
 		
@@ -3328,11 +3328,11 @@
 			"type": 3,"name": "Номер купона","shortname": "Номер","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodStartDate",
+		{"code": "periodEndDate",
 			"type": 6,"name": "Начало периода действия","shortname": "Начало","searchable": true,"sortable": true,"visible": true
 		}
 	,
-		{"code": "periodEndDate",
+		{"code": "periodStartDate",
 			"type": 6,"name": "Окончание периода действия","shortname": "Окончание","searchable": true,"sortable": true,"visible": true
 		}
 	,
@@ -4132,10 +4132,6 @@
 		{"code": "balance",
 			"type": 10,"name": "Сумма","shortname": "Сумма","required": true
 		}
-	,
-		{"code": "companyId",
-			"type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true
-		}
 	,
 		{"code": "tradingClearingRegistryId",
 			"type": 1,"name": "Торгово-клиринговый регистр","shortname": "Торгово-клиринговый регистр","link": "tradingClearingRegistry","linkCode": "code","required": true
@@ -4668,66 +4664,6 @@
 		}
 	]
 			
-		}
-	,
-		"accountSymbols": {
-			
-				"name": "Депо КС - РДЦ",
-			
-				"destination": "accounting/depo-accounts-symbols",
-			
-				"class": "ru.clearing.classes.statics.data.account.AccountSymbols",
-			
-				"logUpdates": "true",
-			
-				"table": "depo_account_symbols",
-			
-			"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
-		}
-	,
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","searchable": true,"sortable": true,"visible": true,"link": "account","linkCode": "account"
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","searchable": true,"sortable": true,"visible": true
-		}
-	]
-			,"actions":[
-			{"method":"post",
-				
-					"name": "Добавление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-					"class": "ru.spcex.clearing.backendapi.controller.request.cud.account.AccountSymbolsNewAction",
-				
-				"fields": [
-		{"code": "accountId",
-			"type": 1,"dbname": "Идентификатор счета","name": "Счет депо КС","shortname": "Счет депо КС","link": "account","linkCode": "account","required": true
-		}
-	,
-		{"code": "accountSymbolValue",
-			"type": 2,"length": 255,"name": "Счет РДЦ","shortname": "Счет РДЦ","required": true
-		}
-	]
-			}
-		,
-			{"method":"delete",
-				
-					"name": "Удаление депо КС - РДЦ",
-				
-					"confirmation": "accountId,accountSymbolValue",
-				
-				"fields": [
-		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","link": "account","linkCode": "id","required": true
-		}
-	]
-			}
-		]
 		}
 	,
 		"clearingAccount": {
@@ -5334,15 +5270,11 @@
 				
 					"group": "Обмен с расчетной организацией",
 				
-					"name": "Вывод свободных средств с клирингового регистра (отправка ДФ-54 для получения ответа ДФ-55)",
+					"name": "Вывод свободных средств инициаторов В (отправка ДФ-54 для получения ответа ДФ-55)",
 				
 				"fields": [
-		{"code": "fullBalance",
-			"type": 10,"name": "Текущий баланс (всего)","shortname": "Текущие средства (всего)","enabled": false
-		}
-	,
 		{"code": "balance",
-			"type": 10,"name": "Текущий баланс (свободно)","shortname": "Текущие средства (свободно)","enabled": false
+			"type": 10,"name": "Текущий баланс","shortname": "Текущие средства","enabled": false
 		}
 	,
 		{"code": "securitySymbol",
@@ -5358,7 +5290,7 @@
 		}
 	,
 		{"code": "senderId",
-			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true
+			"type": 1,"group": "Отправитель","name": "Участник отправитель","shortname": "Отправитель","link": "company","linkCode": "shortName","required": true,"enabled": false
 		}
 	,
 		{"code": "creditLeg_accountId",
@@ -5577,28 +5509,6 @@
 				
 					"name": "Формирование ДФ-05 с кодом 9 (финальный)",
 				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CHDF",
-				
-					"group": "Общее",
-				
-					"name": "Проверка наличия пары ДФ-01/ДФ-57 и ДФ-08/ДФ-21",
-				
-				"fields": []
-			}
-		,
-			{"method":"post",
-				
-					"destination": "CCLR",
-				
-					"group": "Клиринг",
-				
-					"name": "Завершение неудачных клиринговых сессий",
-				
 				"fields": []
 			}
 		]
@@ -5634,7 +5544,7 @@
 		}
 	,
 		{"code": "sessionStatus",
-			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Шаг","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
+			"type": 12,"dbname": "Код статуса клиринговой сессии","name": "Статус клиринговой сессии","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus"
 		}
 	,
 		{"code": "companyId",
@@ -5866,12 +5776,10 @@
 	,
 		"executionDeposit": {
 			
-				"name": "Сделки на секции МКР",
+				"name": "Сделки",
 			
 				"destination": "execution-deposits",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionDeposit",
 			
 				"logUpdates": "true",
@@ -6024,8 +5932,6 @@
 			
 				"destination": "execution-fonds",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.execution.ExecutionFond",
 			
 				"logUpdates": "true",
@@ -6174,19 +6080,17 @@
 			
 				"destination": "depo-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister",
 			
 				"table": "balance_depo_register",
 			
 			"fields": [
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
-			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true
+			"field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true
 		}
 	,
 		{"code": "updatedAt",
@@ -6198,7 +6102,7 @@
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "depoCode",
@@ -6222,8 +6126,6 @@
 			
 				"destination": "money-balance-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister",
 			
 				"table": "money_balance_register",
@@ -6238,7 +6140,7 @@
 		}
 	,
 		{"code": "infoAccount",
-			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 50,"name": "Номер счета внутреннего учета СПВБ","shortname": "Номер счета внутреннего учета СПВБ","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "remainderSum",
@@ -6246,23 +6148,23 @@
 		}
 	,
 		{"code": "blockedSum",
-			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма блокированных денежных средств","shortname": "Блокированные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "unblockedSum",
-			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true,"ignore": true
+			"type": 10,"name": "Сумма свободных денежных средств","shortname": "Свободные","searchable": true,"sortable": true
 		}
 	,
 		{"code": "inn",
-			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "sessionId",
-			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session","ignore": true
+			"type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session"
 		}
 	,
 		{"code": "companyFullName",
-			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true,"ignore": true
+			"type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true
 		}
 	,
 		{"code": "companyId",
@@ -6270,7 +6172,7 @@
 		}
 	,
 		{"code": "id",
-			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"ignore": true
+			"type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true
 		}
 	,
 		{"code": "createdAt",
@@ -6278,7 +6180,7 @@
 		}
 	,
 		{"code": "updatedAt",
-			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true
+			"field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true
 		}
 	]
 			
@@ -6290,8 +6192,6 @@
 			
 				"destination": "admitted-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister",
 			
 				"table": "admitted_liabilities_register",
@@ -6354,8 +6254,6 @@
 			
 				"destination": "covered-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister",
 			
 				"table": "covered_Liabilities_register",
@@ -6418,8 +6316,6 @@
 			
 				"destination": "money-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister",
 			
 				"table": "money_payment_instruction_register",
@@ -6474,8 +6370,6 @@
 			
 				"destination": "depo-payment-instruction-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister",
 			
 				"table": "depo_payment_instruction_register",
@@ -6530,8 +6424,6 @@
 			
 				"destination": "exclude-liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister",
 			
 				"table": "exclude_liabilities_register",
@@ -6610,8 +6502,6 @@
 			
 				"destination": "liabilities-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister",
 			
 				"table": "liabilities_register",
@@ -6690,8 +6580,6 @@
 			
 				"destination": "execution-registers",
 			
-				"historyDestination": "history",
-			
 				"class": "ru.clearing.classes.statics.data.register.ExecutionRegister",
 			
 				"table": "execution_register",

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

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

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

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

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

@@ -2,8 +2,6 @@ package ru.spcex.clearing.config;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
@@ -28,31 +26,19 @@ import java.util.function.Supplier;
 
 @Configuration
 public class KafkaConfig {
-    private final Logger log = LoggerFactory.getLogger(getClass());
+    @Autowired
-    private final KafkaConsumerSettings kafkaSettings;
-
-    public KafkaConfig(ClearingServiceSettings settings) {
-        this.kafkaSettings = settings.getKafkaConsumer();
-        Integer gtwTimeout = settings.getSessionStage().getInspectionGatewayTimeout();
-        if (gtwTimeout != null) {
-            int maxPollIntervalMs = gtwTimeout * 1000 + 1000;
-            log.debug("setting max.poll.interval.ms {}", maxPollIntervalMs);
-            this.kafkaSettings.setManuallyMaxPollIntervalMs(maxPollIntervalMs);
-        }
-    }
-
-
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
     @Bean("kafkaConsumer")
-    public Consumer<String, Object> createConsumer() {
+    public Consumer<String, Object> createConsumer(ClearingServiceSettings settings) {
-        return KafkaConsumerFactory.consumer(kafkaSettings);
+        return KafkaConsumerFactory.consumer(settings.getKafkaConsumer());
     }
 
+    @Autowired
     @Bean("kafkaConsumerGateway")
-    public Supplier<Consumer<String, Object>> getwaySessionConsumer() {
+    public Supplier<Consumer<String, Object>> getwaySessionConsumer(ClearingServiceSettings settings) {
         AtomicInteger groupId = new AtomicInteger(1);
         return () -> {
-            KafkaConsumerSettings consumer = kafkaSettings;
+            KafkaConsumerSettings consumer = settings.getKafkaConsumer();
             KafkaConsumerSettings gatewayConsumer = new KafkaConsumerSettings();
             gatewayConsumer.setBootstrapServers(consumer.getBootstrapServers());
             gatewayConsumer.setSessionTimeoutMs(consumer.getSessionTimeoutMs());

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

@@ -46,7 +46,6 @@ import ru.spcex.platform.utils.validation.ValidatorImpl;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 @Configuration
 public class ValidationConfig {
@@ -368,7 +367,6 @@ public class ValidationConfig {
                     new PresentById(IMDGDistributedNames.Map_Registry, ClearingError.RecordNotFound, true),
                     StatusExtractValidationRule.RegistryCodeCheck,
                     StatusExtractValidationRule.ContractCheck,
-                    StatusExtractValidationRule.RequestStatusValid,
                     StatusExtractValidationRule.RegistryStatusValid
             );
         };
@@ -435,13 +433,13 @@ public class ValidationConfig {
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             ClearingError.RequiredFieldEmpty,
-                            ClearingError.WrongField),
+                            ClearingError.DictionaryNotFound),
                     IdPresentRule.instance("addresseeId",
                             PIClearingOutbondActionNewRequest::getAddresseeId,
                             IMDGDistributedNames.Map_Company,
                             Company.class,
                             ClearingError.RequiredFieldEmpty,
-                            ClearingError.WrongField),
+                            ClearingError.DictionaryNotFound),
                     PaymentOutboundValidationRule.CreditLegAccount,
                     PaymentOutboundValidationRule.DebitLegAccount,
                     PaymentOutboundValidationRule.AddresseePresent,
@@ -492,19 +490,6 @@ public class ValidationConfig {
         };
     }
 
-    @Bean("terminateSessionValidator")
-    public Supplier<IValidator> terminateSessionValidator() {
-        return () -> {
-            ImdgValidationContext<Session> ctx = new ImdgValidationContext<>();
-            ctx.setLogPrefix(LogPrefixId.INSTANCE);
-            ctx.addImdg(IMDGDistributedNames.Map_Session, imdgSession);
-            return new ValidatorImpl<>(ctx,
-                    SessionTerminationValidationRule.SessionPresent,
-                    SessionTerminationValidationRule.StatusCheck
-                    );
-        };
-    }
-
     @Bean("userRoleVerification")
     public UserRoleVerification userRoleVerification(ImdgProvider imdgProvider, IMessageResolver msgs) {
         return new UserRoleVerification(imdgProvider, msgs, ClearingError.UserVerifyDenial);

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

@@ -15,7 +15,6 @@ public class ClearingServiceSettings {
     private KafkaConsumerSettings kafkaConsumer;
     private KafkaProducerSettings kafkaProducer;
     private SessionStageSettings sessionStage;
-    private TradeSettings trade = new TradeSettings();
 
     public HazelcastClientParams getHazelcast() {
         return hazelcast;
@@ -48,12 +47,4 @@ public class ClearingServiceSettings {
     public void setSessionStage(SessionStageSettings sessionStage) {
         this.sessionStage = sessionStage;
     }
-
-    public TradeSettings getTrade() {
-        return trade;
-    }
-
-    public void setTrade(TradeSettings trade) {
-        this.trade = trade;
-    }
 }

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

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

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

@@ -22,7 +22,7 @@ public class NotificationSender {
 
     public void sendNotification(ObjectType objType, String comment, Priority priority) {
         NotificationNewRequest reviseNotification = new NotificationNewRequest();
-        reviseNotification.setObjectType(objType.getKey());
+        reviseNotification.setObjectType(ObjectType.rgst.getKey());
         reviseNotification.setComment(comment);
         reviseNotification.setPriority(priority.getKey());
         kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, reviseNotification);

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

@@ -17,10 +17,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IEnumId;
-import ru.spcex.platform.utils.text.TextUtil;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Component
 public class AnltSearcher {
@@ -87,19 +83,25 @@ public class AnltSearcher {
         return new AnltSearch(infoAcc, company, tcr);
     }
 
-    private static final Pattern tcrPattern = Pattern.compile("ТКР.*?([0-9A-Z-]{12})");
-
     private static String getTkrCodeFromComment(String comment) {
-        if (TextUtil.isEmpty(comment)) {
+        if (comment == null) {
             return null;
         }
         comment = comment.toUpperCase();
-        Matcher matcher = tcrPattern.matcher(comment);
+        int tcrIndex = comment.indexOf("ТКР");
-        if (matcher.find()) {
+        if (tcrIndex == -1) {
-            return matcher.group(1);
-        } else {
             return null;
         }
+        if (comment.length() < (tcrIndex + 4)) {
+            return null;
+        }
+        int spaceAfterTCR = comment.indexOf(" ", tcrIndex + 4);
+        if (spaceAfterTCR == -1) {
+            comment = comment.substring(tcrIndex + 4);
+        } else {
+            comment = comment.substring(tcrIndex + 4, spaceAfterTCR);
+        }
+        return comment.replaceAll("\\s+", "");
     }
 
     public static class AnltSearch {

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

@@ -54,7 +54,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
     private final BalanceRevise balanceRevise;
     private final Sdf05Sender sdf05Sender;
     private final StatementServiceV2 statementService;
-    private final SessionTerminator sessionTerminator;
     private final PaymentInstructionOutboundService pmtOutboundService;
 
     @Autowired
@@ -66,7 +65,7 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
                           SecondaryAuctionT0Session secondaryAuctionT0Session,
                           PrimaryAuctionB0Session primaryAuctionB0Session, PrimaryAuctionT0Session primaryAuctionT0Session, IntermediateMkrSession intermediateMkrSession, FinalMkrSession finalMkrSession, ReturnDepositSession returnDepositSession, SessionManager sessionManager,
                           Sdf06Executor sdf06Executor,
-                          Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, SessionTerminator sessionTerminator, PaymentInstructionOutboundService pmtOutboundService) {
+                          Sdf10Executor sdf10Executor, BalanceRevise balanceRevise, Sdf05Sender sdf05Sender, StatementServiceV2 statementService, PaymentInstructionOutboundService pmtOutboundService) {
         super(kafkaQueue, kafkaResponseQueue);
         this.errorResolver = errorResolver;
         this.clearingService = clearingService;
@@ -84,7 +83,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         this.balanceRevise = balanceRevise;
         this.sdf05Sender = sdf05Sender;
         this.statementService = statementService;
-        this.sessionTerminator = sessionTerminator;
         this.pmtOutboundService = pmtOutboundService;
     }
 
@@ -186,11 +184,6 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         callback(LauncherCommandRequest.class)
                 .setConsumer(task -> sdf05Sender.sendSdf05("9"))
                 .forDestination(Task.sdf05WithCode9Final.topic(), callbacks::put);
-
-        callback(Object.class)
-                .setFunction(sessionTerminator::stopCurrentSession)
-                .forDestination(Consts.KILL_SESSION, callbacks::put);
-
         init();
     }
 

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

@@ -47,10 +47,11 @@ import ru.spcex.platform.utils.validation.IValidator;
 
 import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.LocalDate;
+import java.util.Collection;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
@@ -168,17 +169,10 @@ public class RegistryService {
             log.trace("TCR#id={} registry#id={} updated", tcr.getId(), rgs.getId());
         });
 
-        if (registries.stream().anyMatch(r -> RegistryInstrumentType.M.equalsByKey(r.getRegistryInstrumentType()))) {
+        if (registries.size() > 0) {
             log.info("assets size {} updated by TCR#id={}, will not create new assets",
                     registries.size(), tcr.getId());
             return;
-        } else if (tcr.getMoneyAccountId() == null) {
-            log.info("assets size {} updated by TCR#id={}, TCR#moneyAccountId 'null'. will not create AM**",
-                    registries.size(), tcr.getId());
-            return;
-        } else {
-            log.info("assets size {} updated by TCR#id={}, TCR#moneyAccountId {}. creating new AM**...",
-                    registries.size(), tcr.getId(), tcr.getMoneyAccountId());
         }
 
         Account acc = accImdg.getSingleObjectByID(tcr.getMoneyAccountId());
@@ -250,9 +244,6 @@ public class RegistryService {
             dm__ = _m_t.clone();
             dm__.setRegistryDesignation(RegistryDesignation.D.getKey());
             RegistryManager.zeroState(dm__);
-            dm__.setSettlementDate(LocalDate.now());
-            dm__.setValueDate(null);
-            dm__.setRefundDate(null);
             if (RegistryDesignation.T.equalsByKey(_m_t.getRegistryDesignation())) {
                 dm__.setRegistryUnit(RegistryUnit.X.getKey());
             } else {
@@ -285,12 +276,24 @@ public class RegistryService {
             return reqHelp.error(req.getId(), err.get());
         }
         Registry rgs = validator.getStored(Stored.PresentById);
-        if (trdTime.isTradingTime()) {
+        //Supplier<AssetOperationRequest> gtwBuilder = () -> GatewayRequestCreator.from(rgs, InOutDirection.in);
-            Long gtwReqId = kafkaSender.sendRequestToQueue(Consts.ASSET_OPERATION, gtwReq(rgs));
+        //Optional<Boolean> gatewayOk;
-            log.debug("send request to {} id={}", Consts.ASSET_OPERATION, gtwReqId);
+        //if (trdTime.isTradingTime()) {
-        } else {
+        //    gatewayOk = gateway.gatewayRequestAndWait(gtwBuilder);
-            log.debug("RegistryChangeStatusExtractRequest rgs.id={} not sending gateway request", rgs.getId());
+        //} else {
-        }
+        //    log.debug("RegistryChangeStatusExtractRequest rgs.id={} not sending gateway request", rgs.getId());
+        //    gatewayOk = Optional.of(true);
+        //}
+        //if (gatewayOk.isEmpty() || !gatewayOk.get()) {
+        //    String gtwErr = msgResolver.resolve(mapError(gatewayOk));
+        //    log.error("{}.id={} {}",
+        //            rgs.getRegistryCode(),
+        //            rgs.getId(),
+        //            gtwErr);
+        //    notification.sendNotification(ObjectType.rgst,
+        //            "Отметка о получении выписки: %s".formatted(gtwErr),
+        //            Priority.HIGH);
+        //}
         rgs.setRegistryStatus(payload.getRegistryStatus());
         log.debug("changing registry.id={} status to {}", rgs.getId(), payload.getRegistryStatus());
         registryImdg.update(rgs);
@@ -304,13 +307,6 @@ public class RegistryService {
         return reqHelp.success(req.getId());
     }
 
-    private AssetOperationListRequest gtwReq(Registry rgs) {
-        AssetOperationRequest item = GatewayRequestCreator.from(rgs, InOutDirection.in);
-        AssetOperationListRequest gtwReq = new AssetOperationListRequest();
-        gtwReq.setAssetOperationRequests(Collections.singletonList(item));
-        return gtwReq;
-    }
-
     public RequestInfoUpdate identificationFunds(BaseRequest<IdentificationFundsRequest> req) {
         if (!rights.userHasRole(req.getUserId(), UserRole.Admin)) {
             return reqHelp.error(req.getId(), ClearingError.UserVerifyDenial);
@@ -415,14 +411,8 @@ public class RegistryService {
         if (moneyPredicate.isEmpty() && depoPredicate.isEmpty()) {
             return Optional.empty();
         }
-        ImdgPredicate accIdPrdct;
-        if (moneyPredicate.isPresent() && depoPredicate.isPresent()) {
-            accIdPrdct = prdBldr.or(moneyPredicate.get(), depoPredicate.get());
-        } else {
-            accIdPrdct = prdBldr.and(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue()));
-        }
         return Optional.ofNullable(prdBldr.and(
-                accIdPrdct,
+                prdBldr.and(moneyPredicate.orElse(prdBldr.alwaysTrue()), depoPredicate.orElse(prdBldr.alwaysTrue())),
                 prdBldr.equals("companyId", companyId),
                 prdBldr.sql("tradingClearingRegistryId == null")
         ));
@@ -447,70 +437,56 @@ public class RegistryService {
     }
 
 
-    public record RgsKey (Long companyId, Long accountId, Long securityId) {
-        public static RgsKey fromRgs(Registry rgs) {
-            return new RgsKey(rgs.getCompanyId(), rgs.getAccountId(), rgs.getSecurityId());
-        }
-    }
-
-    private Optional<Registry> find(List<Registry> group, RegistryTradingParams rgsCode) {
-        List<Registry> byCodeRes = group.stream()
-                .filter(rgs -> RegistryManager.equalsByCode(rgsCode, rgs))
-                .toList();
-
-        if (byCodeRes.size() > 1) {
-            Optional<Registry> any = group.stream().findFirst();
-            if (any.isEmpty()) throw new IllegalStateException(); //never
-            String err = "FATAL: found %d entries by code %s in group %s".formatted(
-                    byCodeRes.size(),
-                    rgsCode,
-                    RgsKey.fromRgs(any.get()).toString()
-            );
-            throw new IllegalStateException(err);
-        }
-        return byCodeRes.stream().findFirst();
-    }
-
     public void resetBalances() {
         Collection<Registry> registriesA = registryImdg.getCollectionObjectsByFieldValues(Map.of(
                 "registryDesignation", RegistryDesignation.A.getKey())
         );
 
-        Map<RgsKey, List<Registry>> allAssets = registriesA
+        for (Registry registry : registriesA) {
-                .stream()
+            if (RegistryUnit.B.equalsByKey(registry.getRegistryUnit())) {
-                .collect(Collectors.groupingBy(RgsKey::fromRgs));
+                registry.setBalance(BigDecimal.ZERO);
+            }
+            if (RegistryUnit.F.equalsByKey(registry.getRegistryUnit())) {
+                Optional<Registry> registryBOptional = registriesA.stream().filter(rgs ->
+                        rgs.getAccount() != null && rgs.getSecurityId() != null &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getCompanyId() != null &&
+                                RegistryUnit.B.equalsByKey(rgs.getRegistryUnit()) &&
+                                rgs.getSecurityId() != null && rgs.getSecurityId().equals(registry.getSecurityId()) &&
+                                rgs.getCompanyId() != null && rgs.getCompanyId().equals(registry.getCompanyId()) &&
+                                rgs.getAccount() != null && rgs.getAccount().equals(registry.getAccount()) &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getTradingClearingRegistryId().equals(registry.getTradingClearingRegistryId())
+                ).findFirst();
+                Optional<Registry> registryTOptional = registriesA.stream().filter(rgs ->
+                        rgs.getAccount() != null && rgs.getSecurityId() != null &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getCompanyId() != null &&
+                                RegistryUnit.T.equalsByKey(rgs.getRegistryUnit()) &&
+                                rgs.getSecurityId() != null && rgs.getSecurityId().equals(registry.getSecurityId()) &&
+                                rgs.getCompanyId() != null && rgs.getCompanyId().equals(registry.getCompanyId()) &&
+                                rgs.getAccount() != null && rgs.getAccount().equals(registry.getAccount()) &&
+                                rgs.getTradingClearingRegistryId() != null && rgs.getTradingClearingRegistryId().equals(registry.getTradingClearingRegistryId())
+                ).findFirst();
+                BigDecimal balanceB;
+                if (registryBOptional.isPresent()) {
+                    balanceB = registryBOptional.get().getBalance();
+                } else {
+                    balanceB = BigDecimal.ZERO;
+                }
+                registryTOptional.ifPresent(rgsT -> registry.setBalance(rgsT.getBalance().subtract(balanceB)));
+            }
+            if (RegistryUnit.T.equalsByKey(registry.getRegistryUnit())) {
+                registry.setOpenBalance(registry.getBalance());
+            }
 
-        Instant timestamp = Instant.now();
+            registry.setDebit(BigDecimal.ZERO);
-        for (Map.Entry<RgsKey, List<Registry>> entry : allAssets.entrySet()) {
+            registry.setSettledDebit(BigDecimal.ZERO);
-            RgsKey key = entry.getKey();
+            registry.setCredit(BigDecimal.ZERO);
-            List<Registry> group = entry.getValue();
+            registry.setSettledCredit(BigDecimal.ZERO);
-            Registry a__f = find(group, RegistryTradingParams.A__F).orElse(null);
+            registry.setPlanBalance(BigDecimal.ZERO);
-            Registry a__t = find(group, RegistryTradingParams.A__T).orElse(null);
+            registry.setCloseBalance(registry.getBalance());
-            Registry a__b = find(group, RegistryTradingParams.A__B).orElse(null);
+
-            if (a__t == null) {
+            registry.setUpdated(Instant.now());
-                log.warn("registry group {}: no A**T registry found.", key);
+            registryImdg.update(registry);
-                continue;
-            }
-            BigDecimal a__tBalance = safeBD(a__t.getBalance());
-            a__t.setOpenBalance(a__tBalance);
-            a__t.setCloseBalance(a__tBalance);
-            a__t.setCredit(BigDecimal.ZERO);
-            a__t.setDebit(BigDecimal.ZERO);
-            a__t.setSettledCredit(BigDecimal.ZERO);
-            a__t.setSettledDebit(BigDecimal.ZERO);
-            a__t.setUpdated(timestamp);
-            registryImdg.update(a__t);
-            if (a__f == null) {
-                a__f = assets.copy(a__t, RegistryUnit.F);
-                registryImdg.insert(a__f);
-            }
-            if (a__b != null) {
-                a__b.setBalance(BigDecimal.ZERO);
-                registryImdg.update(a__b);
-            }
-            assets.process(a__b, a__t, a__f, BigDecimal.ZERO);
         }
-
     }
 
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderDepositReturn.java

@@ -0,0 +1,42 @@
+package ru.spcex.clearing.service.builder;
+
+import ru.clearing.classes.statics.data.payment.PaymentInstruction;
+import ru.clearing.classes.statics.data.registry.Registry;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+import java.math.BigDecimal;
+
+public class PaymentInstructionBuilderDepositReturn {
+
+    private ImdgProvider imdgProvider;
+    private Long sessionId;
+    private BigDecimal amount;
+    private Registry lm_tRgs;
+
+    public static PaymentInstructionBuilderDepositReturn builder(ImdgProvider imdgProvider) {
+        return new PaymentInstructionBuilderDepositReturn(imdgProvider);
+    }
+
+    private PaymentInstructionBuilderDepositReturn(ImdgProvider imdgProvider) {
+        this.imdgProvider = imdgProvider;
+    }
+
+    public PaymentInstructionBuilderDepositReturn sessionId(Long sessionId) {
+        this.sessionId = sessionId;
+        return this;
+    }
+
+    public PaymentInstructionBuilderDepositReturn amount(BigDecimal amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    public PaymentInstructionBuilderDepositReturn lm_tRgs(Registry rgs) {
+        this.lm_tRgs = rgs;
+        return this;
+    }
+
+    public PaymentInstruction build() {
+        return null;
+    }
+}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderFinalMkrDeals.java

@@ -44,7 +44,6 @@ public class PaymentInstructionBuilderFinalMkrDeals {
     protected AtomicLong documentNumberId = new AtomicLong(0L); // порядковый номер (сквозной по всем компаниям за день
     private static final DateTimeFormatter DATE_FORMATTER_ddMMyy = DateTimeFormatter.ofPattern("ddMMyy");
     private String purpose;
-    private String lmtPurpose = null;
 
     public static PaymentInstructionBuilderFinalMkrDeals builder(ImdgProvider imdgProvider) {
         return new PaymentInstructionBuilderFinalMkrDeals(imdgProvider);
@@ -87,11 +86,6 @@ public class PaymentInstructionBuilderFinalMkrDeals {
         return this;
     }
 
-    public PaymentInstructionBuilderFinalMkrDeals paymentPurposeLmt(String purpose) {
-        this.lmtPurpose = purpose;
-        return this;
-    }
-
     public Pair<PaymentInstruction, PaymentInstruction> build() {
 
         PaymentInstruction payment1;
@@ -134,11 +128,7 @@ public class PaymentInstructionBuilderFinalMkrDeals {
 
             payment1.setPaymentDate(TimeUtil.localDateToInstant(lm_t.getSettlementDate()));
 
-            if (lmtPurpose != null) {
+            payment1.setPaymentPurpose(purpose);
-                payment1.setPaymentPurpose(lmtPurpose);
-            } else {
-                payment1.setPaymentPurpose(purpose);
-            }
 
             payment1.setSettlementDate(lm_t.getSettlementDate());
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionBuilderV2.java

@@ -4,9 +4,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.clearing.classes.statics.data.account.Account;
-import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
 import ru.clearing.classes.statics.data.company.Company;
-import ru.clearing.classes.statics.data.company.CompanyRoleSet;
 import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.payment.PaymentInstruction;
 import ru.clearing.classes.statics.data.registry.Registry;
@@ -14,17 +12,12 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
 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.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
-import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.time.TimeUtil;
 
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -34,9 +27,6 @@ public class PaymentInstructionBuilderV2 {
     private ImdgProvider imdgProvider;
     private Imdg<Company> companyImdg;
     private Imdg<CompanySymbols> companySymbolsImdg;
-    private Imdg<Registry> rgsImdg;
-    private final Imdg<ClearingMemberCategory> clearingCategoryImdg;
-    private final Imdg<CompanyRoleSet> cmpRoleImdg;
     private Long sessionId;
     private BigDecimal amount;
     private Account creditLegAccount;
@@ -47,9 +37,6 @@ public class PaymentInstructionBuilderV2 {
     private static final DateTimeFormatter DATE_FORMATTER_ddMMyy = DateTimeFormatter.ofPattern("ddMMyy");
     private Long senderId;
     private Long addresseeId;
-    private boolean useCS_BLKD = false;
-
-    private Registry am_b;
 
     public static PaymentInstructionBuilderV2 builder(ImdgProvider imdgProvider) {
         return new PaymentInstructionBuilderV2(imdgProvider);
@@ -59,18 +46,6 @@ public class PaymentInstructionBuilderV2 {
         this.imdgProvider = imdgProvider;
         this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
         this.companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
-        this.rgsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
-        this.clearingCategoryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class);
-        this.cmpRoleImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanyRoleSet, CompanyRoleSet.class);
-    }
-
-    public PaymentInstructionBuilderV2 checkBLKD(Registry rgs) {
-        if (rgs == null) {
-            return this;
-        }
-        this.useCS_BLKD = true;
-        this.am_b = rgs;
-        return this;
     }
 
     public PaymentInstructionBuilderV2 sessionId(Long sessionId) {
@@ -153,12 +128,7 @@ public class PaymentInstructionBuilderV2 {
             payment.setPaymentDate(Instant.now());
             payment.setSettlementDate(LocalDate.now());
         }
-
+        payment.setPaymentPurpose(purpose);
-        if (useCS_BLKD && checkAgent()) {
-            payment.setPaymentPurpose(SpecifFlag.CS_BLKD.getKey() + "_" + sessionId + " " + purpose);
-        } else {
-            payment.setPaymentPurpose(purpose);
-        }
         payment.setCreditLeg_amount(amount);
         payment.setDebitLeg_amount(amount);
 
@@ -223,41 +193,4 @@ public class PaymentInstructionBuilderV2 {
             return cSymbol.getCompanySymbolValue();
         }
     }
-
-    private boolean checkAgent() {
-        ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
-        ImdgPredicate prdct = pb.and(
-                pb.equals("sessionId", sessionId),
-                pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.CM__).build()),
-                pb.equals("companyId", addresseeId),
-                pb.equals("accountId", am_b.getAccountId())
-        );
-        Collection<Registry> claims = rgsImdg.getCollectionObjectsByPredicate(prdct);
-        boolean hasCounterPartyInitiator = false;
-        for (Registry claim : claims) {
-            Long counterPartyId = claim.getCounterPartyId();
-            if (categoryIOrVInitiator(counterPartyId) && companyRoleODEPPresent(counterPartyId)) {
-                hasCounterPartyInitiator = true;
-                break;
-            }
-        }
-        return hasCounterPartyInitiator;
-    }
-
-    public boolean categoryIOrVInitiator(Long companyId) {
-        ClearingMemberCategory category = clearingCategoryImdg.getFirstObjectByFieldValues(
-                Map.of("companyId", companyId));
-        ClearingCategory ctg = IEnumKey.getEnumByKey(ClearingCategory.class, category.getClearingMemberCategory());
-        return ctg != null && (ctg.equals(ClearingCategory.V) || ctg.equals(ClearingCategory.I)) ;
-    }
-
-    public boolean companyRoleODEPPresent(Long companyId) {
-        return cmpRoleImdg.getFirstObjectBySQL(
-                "companyId = %d and companyRole = '%s' and workflowStatus = '%s'".formatted(
-                        companyId,
-                        CompanyRole.ODEP.getKey(),
-                        WorkflowStatus.Active.getKey()
-                )
-        ) != null;
-    }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/RegistryBuilder.java

@@ -133,7 +133,6 @@ public class RegistryBuilder {
         rgs.setCredit(BigDecimal.ZERO);
         rgs.setDiffBalance(BigDecimal.ZERO);
         rgs.setCheckBalance(BigDecimal.ZERO);
-        rgs.setOpenBalance(BigDecimal.ZERO);
         return rgs;
     }
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/RegistrySecurityBuilder.java

@@ -133,7 +133,6 @@ public class RegistrySecurityBuilder {
         rgs.setCredit(BigDecimal.ZERO);
         rgs.setDiffBalance(BigDecimal.ZERO);
         rgs.setCheckBalance(BigDecimal.ZERO);
-        rgs.setOpenBalance(BigDecimal.ZERO);
         return rgs;
     }
 

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java

@@ -11,34 +11,29 @@ import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.account.ClientCode;
 import ru.clearing.classes.statics.data.company.Company;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
-import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow;
-import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
 import ru.clearing.classes.statics.data.misc.Listing;
 import ru.clearing.classes.statics.data.misc.STrades;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.clearing.classes.statics.data.security.Security;
-import ru.spcex.clearing.config.element.ClearingServiceSettings;
 import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.error.ClearingException;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.notification.NotificationSender;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.DealRegisterNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionType;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 import ru.spcex.clearing.service.validation.ValidationStored;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.CurrencyCode;
+import ru.spcex.platform.enumeration.Section;
+import ru.spcex.platform.enumeration.Side;
 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.*;
 import ru.spcex.platform.utils.log.ExceptionUtils;
 import ru.spcex.platform.utils.time.TimeUtil;
 import ru.spcex.platform.utils.validation.IValidator;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -46,8 +41,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
-import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
-
 @Component
 @EnableScheduling
 public class ExecutionFondComponent {
@@ -57,7 +50,6 @@ public class ExecutionFondComponent {
     private final Imdg<ExecutionFond> executionFondImdg;
     private final Imdg<Listing> listingImdg;
     private final Imdg<ClientCode> clientCodeImdg;
-    private final Imdg<FixedIncomeCashFlow> fixedIncomeCashFlowImdg;
     private final Imdg<ru.clearing.classes.statics.data.misc.Market> marketImdg;
 
     //fixme ждать ТЗ
@@ -66,26 +58,19 @@ public class ExecutionFondComponent {
     private final IMessageResolver msgResolver = new SimpleMessageResolver();
     private final Function<STrades, IValidator> stradesValidator;
     private final KafkaSender kafkaSender;
-    private final NotificationSender notifications;
-    private final boolean valuation;
 
 
     @Autowired
-    public ExecutionFondComponent(ImdgProvider imdgProvider,
+    public ExecutionFondComponent(ImdgProvider imdgProvider, Producer<String, Object> kafka,
-                                  ClearingServiceSettings settings,
-                                  Producer<String, Object> kafka,
                                   @Qualifier("sTradesValidatorFond") Function<STrades, IValidator> stradesValidator,
-                                  @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender, NotificationSender notifications) {
+                                  @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafkaSender) {
         this.sTradeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_STrades, STrades.class);
         this.executionFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class);
         this.listingImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Listing, Listing.class);
         this.clientCodeImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class);
         this.marketImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Market, ru.clearing.classes.statics.data.misc.Market.class);
-        this.fixedIncomeCashFlowImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeCashFlow, FixedIncomeCashFlow.class);
-        this.valuation = settings.getTrade().getValuation(); //fixme
         this.stradesValidator = stradesValidator;
         this.kafkaSender = kafkaSender;
-        this.notifications = notifications;
 
         resetTradingDay();
     }
@@ -134,7 +119,7 @@ public class ExecutionFondComponent {
         log.info("{} strades left after already-added filtering", sTrades.size());
 
         for (STrades sTrd : sTrades) {
-            log.info("new S_TRADE[{}], valuation {}", sTrd.getId(), valuation);
+            log.trace("S_TRADE[{}] new", sTrd.getId());
 
             //проверки
             IValidator validator = stradesValidator.apply(sTrd);
@@ -180,7 +165,6 @@ public class ExecutionFondComponent {
     protected ExecutionFond createExecutionFond(STrades sTrades,
                                                    IValidator validator) throws ClearingException {
         Security security = validator.getStored(ValidationStored.STradesSecurity);
-//        Listing listing = listingImdg.getFirstObjectByFieldValues(Map.of("securityId", security.getId()));
         Company company = validator.getStored(ValidationStored.STradesCompany);
         Company counterCompany = validator.getStored(ValidationStored.STradesCounterCompany);
         TradingClearingRegistry rgstr = validator.getStored(ValidationStored.STradesTradingClearingRegistry);
@@ -228,57 +212,7 @@ public class ExecutionFondComponent {
         eFond.setSecurityId(security.getId());
         eFond.setInterestAmount(sTrades.getAccruedint());
         eFond.setExchangeOrderId(sTrades.getOrderNum());
-        if (valuation) {
+        eFond.setSettlementAmount(sTrades.getValue());
-            Listing listing = listingImdg.getFirstObjectBySQL("securityId = %d and market = '%s'".formatted(security.getId(), sTrades.getClassCode()));
-            BigDecimal lotSize = listing != null ? safeBD(listing.getLotSize()) : BigDecimal.ONE;
-            BigDecimal qty = safeBD(eFond.getLots()).multiply(lotSize);
-            eFond.setQuantity(qty);
-            BigDecimal price = safeBD(sTrades.getPrice());// eFond.setPrice
-            BigDecimal settlementAmount = BigDecimal.ZERO;
-            if (InstrumentType.BOND.equalsByKey(security.getInstrumentType())) {
-                FixedIncomeSecurity fixedIncome = (FixedIncomeSecurity) security;
-                BigDecimal nominalValue;
-                ImdgPredicateBuilder pb = fixedIncomeCashFlowImdg.predicateBuilder();
-                ImdgPredicate prdct = pb.and(
-                        pb.equals("securityId", fixedIncome.getId()),
-                        sTrades.getSettleDate() != null ?
-                                pb.equals("valueDate", sTrades.getSettleDate()) : pb.alwaysFalse()
-                );
-                FixedIncomeCashFlow cashFlow = fixedIncomeCashFlowImdg.getFirstObjectByPredicate(prdct);
-                if (cashFlow != null) {
-                    nominalValue = safeBD(cashFlow.getNominalValue());
-                } else {
-                    nominalValue = safeBD(fixedIncome.getNominalValue());
-                }
-                {
-                    settlementAmount = eFond.getQuantity()
-                            .multiply(nominalValue)
-                            .multiply(price)
-                            .divide(new BigDecimal(100), RoundingMode.HALF_UP)
-                            .setScale(2, RoundingMode.HALF_UP);
-                }
-            } else if (InstrumentType.EQTY.equalsByKey(security.getInstrumentType())) {
-                BigDecimal lotsEqty = safeBD(eFond.getQuantity());
-                settlementAmount = lotsEqty.multiply(price).setScale(2, RoundingMode.HALF_UP);
-            }
-            eFond.setSettlementAmount(settlementAmount);
-            if (settlementAmount.compareTo(safeBD(sTrades.getValue())) != 0) {
-                log.warn("sTrades.TradeNum={} sTrades.value({}) != eFond({})",
-                        sTrades.getTradeNum(),
-                        safeBD(sTrades.getValue()),
-                        settlementAmount);
-                notifications.sendNotification(
-                        ObjectType.vfrs,
-                        "Для сделки %s объем сделки в ТС %s не совпадает с расчитанным в КС %s"
-                                .formatted(sTrades.getTradeNum(),
-                                        safeBD(sTrades.getValue()).toString(),
-                                        settlementAmount.toString()),
-                        Priority.HIGH
-                );
-            }
-        } else {
-            eFond.setSettlementAmount(sTrades.getValue());
-        }
         eFond.setCounterPartyId(counterCompany.getId());
         {
             ImdgPredicateBuilder strPb = sTradeImdg.predicateBuilder();

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Reviser.java

@@ -25,8 +25,8 @@ import java.util.Optional;
 @Component
 public class Reviser {
     private final Logger log = LoggerFactory.getLogger(Reviser.class);
-    private static final String reviseFailedMessage = "После сверки обнаружена разница между сверочным и фактическим балансом.";
+    private static final String reviseFailedMessage = "Сверка остатков денежных средств по результатам клиринговой сессии завершена с ошибками.";
-    private static final String reviseSuccessMessage = "Ошибок после получения остатков не обнаружено.";
+    private static final String reviseSuccessMessage = "Сверка остатков денежных средств по результатам клиринговой сессии завершена успешно.";
     private final Imdg<Registry> registryImdg;
     private final Imdg<Statement> statementImdg;
     private final Imdg<SDf01> sdf01Imdg;
@@ -66,7 +66,7 @@ public class Reviser {
             log.trace("revise ok for sdf01.id={}, stmt.id={}, registry.id={}", sdf.getId(), statement.get().getId(), registry.get().getId());
         }
         NotificationNewRequest reviseNotification = new NotificationNewRequest();
-        reviseNotification.setObjectType(ObjectType.diff.getKey());
+        reviseNotification.setObjectType(ObjectType.rgst.getKey());
         reviseNotification.setComment(reviseFailed ? reviseFailedMessage : reviseSuccessMessage);
         reviseNotification.setPriority(reviseFailed ? Priority.HIGH.getKey() : Priority.LOW.getKey());
         kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, reviseNotification);

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

@@ -41,7 +41,9 @@ import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 
 @Service
@@ -110,9 +112,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
         result.setChildGenerationId(generationIdForGroup);
         result.setFileName(filenameObtainer.getFilename(sdf, sdf01Imdg, statementRequest.getGroupId()));
         log.info("SDF01 execution: sdf01 file={} number={}, groupId={}", result.getFileName(), sdf.size(), sdf.stream().findFirst().map(SDf01::getGenerationId).orElse(null));
-        ArrayList<SDf01> orderedSdf = new ArrayList<>(sdf);
+        for (SDf01 sdf01 : sdf) {
-        orderedSdf.sort(Comparator.comparing(SDf01::getId));// Сортировка по возрастанию id, чтобы сохранить последовательность строк SDF02, как в SDF01
-        for (SDf01 sdf01 : orderedSdf) {
             IValidator validator = sDf01Validator.apply(sdf01);
             Optional<EnumMessage> error = validator.tillFirstError();
             Company company = validator.getStored(ValidationStored.Sdf01Company);

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf06Executor.java

@@ -22,9 +22,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationRe
 import ru.spcex.clearing.platform.messaging.domain.cud.gateway.AssetOperationApprovalRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.gateway.SingleAssetResponse;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.clearing.service.AssetTrio;
 import ru.spcex.clearing.service.integration.GatewayRequestCreator;
-import ru.spcex.clearing.service.registry.AssetTBFProcessing;
 import ru.spcex.clearing.service.registry.DmiService;
 import ru.spcex.clearing.service.schedule.TradingTimeService;
 import ru.spcex.clearing.service.validation.Sdf06NewValidationRule;
@@ -68,7 +66,6 @@ public class Sdf06Executor {
     private final KafkaSender kafkaSender;
     private final FilenameObtainer filenameObtainer;
     private final DmiService dmiService;
-    private final AssetTBFProcessing assets;
 
     private final static BigDecimal successResult = BigDecimal.ZERO;
     //идет сессия (не возвращаем такую ошибку)
@@ -90,7 +87,7 @@ public class Sdf06Executor {
     public Sdf06Executor(ImdgProvider imdgProvider,
                          IMessageResolver messageResolver,
                          @Qualifier("sdf06ValidatorNew") Function<SDf06, IValidator> sDf06Validator,
-                         TradingTimeService tradingTimeService, KafkaSender kafkaSender, FilenameObtainer filenameObtainer, DmiService dmiService, AssetTBFProcessing assets) {
+                         TradingTimeService tradingTimeService, KafkaSender kafkaSender, FilenameObtainer filenameObtainer, DmiService dmiService) {
         this.imdgProvider = imdgProvider;
         this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
         this.tradingTimeService = tradingTimeService;
@@ -105,7 +102,6 @@ public class Sdf06Executor {
         this.sdf07Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf07, SDf07.class);
         this.filenameObtainer = filenameObtainer;
         this.dmiService = dmiService;
-        this.assets = assets;
     }
 
     public void execute(BaseRequest<StatementRequest> systemRequest) {
@@ -164,8 +160,6 @@ public class Sdf06Executor {
                             CurrencyCode.RUB.getKey(),
                             safeBD(sDf06.getSum()),
                             sDf06.getNumber().toString());
-                    Optional<AssetTrio> asts = assets.searchMoneyByAccAndCompany(company.getId(), tcr.getMoneyAccountId());
-                    asts.ifPresent(ast -> assets.process(ast.a__b(), ast.a__t(), ast.a__f(), BigDecimal.ZERO));
                 }
                 sdf07WasCreated = true;
             }
@@ -272,16 +266,11 @@ public class Sdf06Executor {
             Instant updatedTime = Instant.now();
             if (gatewayMsg.isApproved()) {
                 processedApproved(stmt, sdf06, updatedTime);
-                Optional<TradingClearingRegistry> tcr = searchTcrOnGatewayResponse(sdf06);
+                dmiService.setProcContract(searchTcrOnGatewayResponse(sdf06).map(SpcexObjectBase::getId).orElse(null),
-                dmiService.setProcContract(tcr.map(SpcexObjectBase::getId).orElse(null),
                         CurrencyCode.RUB.getKey(),
                         safeBD(sdf06.getSum()),
                         sdf06.getNumber().toString()
                 );
-                if (tcr.isPresent()) {
-                    Optional<AssetTrio> asts = assets.searchMoneyByAccAndCompany(tcr.get().getCompanyId(), tcr.get().getMoneyAccountId());
-                    asts.ifPresent(a -> assets.process(a.a__b(), a.a__t(), a.a__f(), BigDecimal.ZERO));
-                }
             } else {
                 log.trace("statement.id={}, sdf07.id={}, sdf06.id={} rejected (by gateway answer)",
                         statementId,

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf08Executor.java

@@ -346,7 +346,6 @@ public class Sdf08Executor extends AbstractExecutor<SDf08> {
         rgs.setCredit(BigDecimal.ZERO);
         rgs.setDiffBalance(BigDecimal.ZERO);
         rgs.setCheckBalance(BigDecimal.ZERO);
-        rgs.setOpenBalance(BigDecimal.ZERO);
         rgs.setBalanceDimension(BalanceDimension.MONY.getKey());
         rgs.setTradingDate(statement.getSettlementDate());
         rgs.setClearingDate(LocalDate.now());

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf10Executor.java

@@ -25,7 +25,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.gateway.AssetOperationApp
 import ru.spcex.clearing.platform.messaging.domain.cud.gateway.SingleAssetResponse;
 import ru.spcex.clearing.platform.messaging.domain.cud.importexport.SwtExporterRequest;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
-import ru.spcex.clearing.service.registry.AssetTBFProcessing;
 import ru.spcex.clearing.service.registry.RegistryManager;
 import ru.spcex.clearing.service.schedule.TradingTimeService;
 import ru.spcex.clearing.service.validation.ValidationStored;
@@ -69,7 +68,6 @@ public class Sdf10Executor {
     private final TradingTimeService tradingTimeService;
     private final KafkaSender kafkaSender;
     private final SecuritySelector<Security> scrtSlct;
-    private final AssetTBFProcessing assets;
 
     private final static String OK = "OK";
     private final static String SYNTAX_ERROR = "Синтаксическая ошибка (файл сформирован неверно)";
@@ -90,7 +88,7 @@ public class Sdf10Executor {
     public Sdf10Executor(ImdgProvider imdgProvider,
                          RegistryManager rgsMng, IMessageResolver messageResolver,
                          @Qualifier("sdf10Validator") Function<SDf10, IValidator> sDf10Validator,
-                         TradingTimeService tradingTimeService, KafkaSender kafkaSender, AssetTBFProcessing assets) {
+                         TradingTimeService tradingTimeService, KafkaSender kafkaSender) {
         this.imdgProvider = imdgProvider;
         this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
         this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
@@ -104,7 +102,6 @@ public class Sdf10Executor {
         this.sdf11Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf11, SDf11.class);
         this.plannerAllTodayImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerAllToday, PlannerAllToday.class);
         this.scrtSlct = new SecuritySelector<>(imdgProvider, Security.class);
-        this.assets = assets;
     }
 
     public void execute(BaseRequest<StatementRequest> systemRequest) {
@@ -169,11 +166,7 @@ public class Sdf10Executor {
                 SDf11 sDf11 = processedApproved(stmt, sDf10, now, sdf11GroupId);
                 BigDecimal amount = InOutDirection.in.equalsByKey(stmt.getInOutDirection()) ?
                         stmt.getAmount() : safeBD(stmt.getAmount()).negate();
-                createDs_iWithoutGateway(tcr.getId(),
+                createDs_iWithoutGateway(tcr.getId(), company.getId(), security.getSecuritySymbol(), amount, sDf10.getOutDocument());
-                        company.getId(),
-                        security.getSecuritySymbol(),
-                        amount,
-                        sDf10.getOutDocument());
                 sdf11WasCreated = true;
             }
         }
@@ -197,7 +190,6 @@ public class Sdf10Executor {
             return;
         }
         createDs_i(as_t.get(), summ, outDocument);
-        assets.processByA__t(as_t.get(), BigDecimal.ZERO);
     }
 
     private void createDs_iWithoutGateway(Long tcrId, Long companyId, String securitySymobl, BigDecimal summ, String outDocument) {
@@ -211,19 +203,19 @@ public class Sdf10Executor {
             return;
         }
         createDs_i(as_t.get(), summ, outDocument);
-        assets.processByA__t(as_t.get(), BigDecimal.ZERO);
     }
 
     private void createDs_i(Registry as_t, BigDecimal summ, String outDocument) {
         Registry rgsD = as_t.clone();
-        RegistryManager.zeroState(rgsD);
         rgsD.setRegistryDesignation(RegistryDesignation.D.getKey());
         rgsD.setRegistryUnit(RegistryUnit.I.getKey());
         rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD));
         rgsD.setBalance(summ);
+        rgsD.setDebit(BigDecimal.ZERO);
+        rgsD.setCredit(BigDecimal.ZERO);
+        rgsD.setDiffBalance(BigDecimal.ZERO);
+        rgsD.setCheckBalance(BigDecimal.ZERO);
         rgsD.setRegistryStatus(RegistryStatus.PROC.getKey());
-        rgsD.setOpenBalance(BigDecimal.ZERO);
-        rgsD.setCloseBalance(BigDecimal.ZERO);
         rgsD.setContract(outDocument);
         registryImdg.insert(rgsD);
         log.debug("created DS*I.id={}", rgsD.getId());

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java

@@ -195,7 +195,7 @@ public class Sdf20Executor {
                                       Long securityId) {
         Statement stmt = new Statement();
         stmt.setAddresseeId(companyId);
-        stmt.setSenderId(Sender.Rdc.getId());
+        stmt.setSenderId(Sender.Prc.getId());
         stmt.setStatementType(StatementType.incr.getKey());
         //fixme stmt.setComment(sdf10.());
         stmt.setAccountId(account.getId());

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java

@@ -137,11 +137,11 @@ public class Sdf21Executor extends AbstractExecutor<SDf21> {
         result.setChildGenerationId(generationIdForGroup);
         log.info("SDF21 execution: sdf21 number={}, groupId={}", sdf.size(), sdf.stream().findFirst().map(SDf21::getGenerationId).orElse(null));
         for (SDf21 sdf21 : sdf) {
-            //LocalDate opDt = operationDateParse(sdf21.getOperationDate());
+            LocalDate opDt = operationDateParse(sdf21.getOperationDate());
-            //if (opDt == null || !opDt.equals(LocalDate.now())) {
+            if (opDt == null || !opDt.equals(LocalDate.now())) {
-            //    log.debug("skip sdf21.id={}, operation date {}", sdf21.getId(), sdf21.getOperationDate());
+                log.debug("skip sdf21.id={}, operation date {}", sdf21.getId(), sdf21.getOperationDate());
-            //    continue;
+                continue;
-            //}
+            }
             IValidator validator = sDf21Validator.apply(sdf21);
             Optional<EnumMessage> error = validator.tillFirstError();
             if (error.isPresent()) {
@@ -260,7 +260,7 @@ public class Sdf21Executor extends AbstractExecutor<SDf21> {
     private Statement create(SDf21 sdf21, Company cmp, Account acc) {
         Statement statement = new Statement();
         statement.setAddresseeId(cmp.getId());
-        statement.setSenderId(Sender.Rdc.getId());
+        statement.setSenderId(Sender.Prc.getId());
         statement.setStatementType(StatementType.incr.getKey());
         //fixme statement.setComment(sdf21.());
         statement.setAccountId(acc.getId());

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java

@@ -19,7 +19,6 @@ import ru.clearing.classes.statics.data.security.Security;
 import ru.clearing.classes.statics.data.statement.Statement;
 import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.notification.NotificationSender;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.clearing.AssetOperationListRequest;
@@ -48,7 +47,6 @@ import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
-import ru.spcex.platform.utils.log.ExceptionUtils;
 import ru.spcex.platform.utils.text.TextUtil;
 import ru.spcex.platform.utils.validation.IValidator;
 
@@ -63,7 +61,6 @@ import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static ru.spcex.platform.enumeration.RegistryTradingParams.D__V;
@@ -96,14 +93,13 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
     private final TradingTimeService timeService;
     private final KafkaSender kafka;
     private final AssetTBFProcessing assets;
-    private final NotificationSender notification;
     private final Pattern pattern = Pattern.compile("№.*");
 
     public Sdf57Executor(@Qualifier("sdf57Validator") Function<SDf57, IValidator> sDf57Validator,
                          LoggingService errorLogger,
                          ImdgProvider imdgProvider,
                          IMessageResolver errorResolver, AnltSearcher anltSearcher, IMessageResolver messageResolver, DmiService dmiService, TradingTimeService timeService,
-                         @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafka, AssetTBFProcessing assets, NotificationSender notification) {
+                         @Qualifier("kafkaSenderWithoutRequestInfo") KafkaSender kafka, AssetTBFProcessing assets) {
         this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
         this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
         this.sdf02Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf02, SDf02.class);
@@ -125,7 +121,6 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
         this.timeService = timeService;
         this.kafka = kafka;
         this.assets = assets;
-        this.notification = notification;
     }
 
     //todo доделать контроль sdf01 и sdf57
@@ -169,9 +164,6 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
         result.setChildGenerationId(generationIdForGroup);
         log.info("SDF57 execution: sdf57 number={}, groupId={}", sdf.size(), sdf.stream().findFirst().map(SDf57::getGenerationId).orElse(null));
         AtomicReference<Boolean> sessionIsNeededFlag = new AtomicReference<>(false);
-        boolean sessionIsPresent = sessionImdg.getFirstObjectByFieldValues(Map.of(
-                "workflowStatus", SessionStatus.ACTV.getKey()
-        )) != null;
         for (SDf57 sdf57 : sdf) {
             IValidator validator = sDf57Validator.apply(sdf57);
             Optional<EnumMessage> error = validator.tillFirstError();
@@ -368,11 +360,10 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
                                     stmt.getId(), asts.a__t().getRegistryCode(), asts.a__t().getId());
                         } else {
                             log.trace("sending gateway request for stmt.id={}", stmt.getId());
-                            Optional<AssetOperationListRequest> gtwReq = gatewayRequest(stmt,
+                            kafka.sendRequestToQueue(Consts.ASSET_OPERATION,
-                                    company,
+                                    gatewayRequest(stmt,
-                                    account,
+                                            company.getTradingCode(),
-                                    asts.a__t().getTradingClearingRegistry());
+                                            asts.a__t().getTradingClearingRegistry()));
-                            gtwReq.ifPresent(r -> kafka.sendRequestToQueue(Consts.ASSET_OPERATION, r));
                         }
                     }
                     return Optional.of(asts);
@@ -399,17 +390,10 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
                                 searchResult.getCompany().getId());
                         asts = createRegistryIfNeeded.apply(new StmtCmpAcc(stmt, searchResult.getCompany(), searchResult.getAccount()));
                         if (OperationStatus.Executed.equalsByKey(stmt.getOperationStatus())) {
-                            Optional<BigDecimal> dmiBalance = dmiService.setOk(searchResult.getTcr().getId(),
+                            dmiService.setOk(searchResult.getTcr().getId(),
                                     CurrencyCode.RUB.getKey(),
                                     sdf57.getDbfId().toString());
-                            asts.ifPresent(trio -> {
+                            asts.ifPresent(trio -> assets.process(trio.a__b(), trio.a__t(), trio.a__f(), BigDecimal.ZERO));
-                                if (dmiBalance.isPresent() && sessionIsPresent) {
-                                    BigDecimal planBalance = safeBD(trio.a__t().getPlanBalance());
-                                    trio.a__t().setPlanBalance(planBalance.add(dmiBalance.get()));
-                                    registryImdg.update(trio.a__t());
-                                }
-                                assets.process(trio.a__b(), trio.a__t(), trio.a__f(), BigDecimal.ZERO);
-                            });
                         }
                     } else if (InOutDirection.in.equals(IEnumKey.getEnumByKey(InOutDirection.class, stmt.getInOutDirection()))) {
                         log.debug("stmt.id={} comment='{}' error: {}. Operating through DMAU registry",
@@ -443,17 +427,10 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
                     }
                 } else if (OperationStatus.Executed.equalsByKey(stmt.getOperationStatus())) {
                     if (asts.isPresent()) {
-                        Optional<BigDecimal> dmiBalance = dmiService.setOk(asts.get().a__t().getTradingClearingRegistryId(),
+                        dmiService.setOk(asts.get().a__t().getTradingClearingRegistryId(),
                                 CurrencyCode.RUB.getKey(),
                                 sdf57.getDbfId().toString());
-                        asts.ifPresent(trio -> {
+                        asts.ifPresent(trio -> assets.process(trio.a__b(), trio.a__t(), trio.a__f(), BigDecimal.ZERO));
-                            if (dmiBalance.isPresent() && sessionIsPresent) {
-                                BigDecimal planBalance = safeBD(trio.a__t().getPlanBalance());
-                                trio.a__t().setPlanBalance(planBalance.add(dmiBalance.get()));
-                                registryImdg.update(trio.a__t());
-                            }
-                            assets.process(trio.a__b(), trio.a__t(), trio.a__f(), BigDecimal.ZERO);
-                        });
                     } else {
                         log.error("stmt.id={} operationStatus={} but couldn't extract TCR.id for DM*I update",
                                 stmt.getId(),
@@ -465,16 +442,11 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
             statementCred.map(stmt -> new StmtCmpAcc(stmt, companyCred, accountCred)).ifPresent(registersUpdate);
         }
         if (sessionIsNeededFlag.get()) {
-            if (!timeService.timeForXdep()) {
+            result.setSessionWasStarted(true);
-                EnumMessage err = new EnumMessage(ClearingError.XdepTimeIntervalNotMatch);
+            LauncherCommandRequest sessionTask = new LauncherCommandRequest();
-                notification.sendNotification(ObjectType.session, messageResolver.resolve(err), Priority.HIGH);
+            sessionTask.setSection(Section.MKR.getKey());
-            } else {
+            sessionTask.setSessionType(SessionType.XDEP.getKey());
-                result.setSessionWasStarted(true);
+            kafka.sendRequestToQueue(Task.startOfClearing.topic(), sessionTask);
-                LauncherCommandRequest sessionTask = new LauncherCommandRequest();
-                sessionTask.setSection(Section.MKR.getKey());
-                sessionTask.setSessionType(SessionType.XDEP.getKey());
-                kafka.sendRequestToQueue(Task.startOfClearing.topic(), sessionTask);
-            }
         }
         return result;
     }
@@ -754,56 +726,25 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
         R apply(T1 arg1, T2 arg2, T3 arg3);
     }
 
-    private static final Pattern csBlkd = Pattern.compile(SpecifFlag.CS_BLKD.getKey() + "_(\\d+).*");
+    private AssetOperationListRequest gatewayRequest(Statement stmt, String tradingCode, String tcrCode) {
-
-    private Optional<AssetOperationListRequest> gatewayRequest(Statement stmt, Company company, Account account, String tcrCode) {
-        if (AccountType.Anlt.equalsByKey(account.getAccountType())) {
-            return Optional.empty();
-        }
-        String tradingCode = company.getTradingCode();
         AssetOperationListRequest gatewayRequest = new AssetOperationListRequest();
         AssetOperationRequest req = GatewayRequestCreator.from(stmt, tradingCode, tcrCode);
-        String specif = stmt.getComment();
+        Session existActiveSession = sessionImdg.getFirstObjectByFieldValues(Map.of(
-
+                "workflowStatus", SessionStatus.ACTV.getKey()
-        Matcher m;
+        ));
-        if (!TextUtil.isEmpty(specif) && (m = csBlkd.matcher(specif)).find()) {
+        if (existActiveSession != null) {
-            try {
+            log.debug("active session.id={} type {}", existActiveSession.getId(), existActiveSession.getSessionType());
-                Long sessionId = Long.valueOf(m.group(1));
+            List<Registry> d__vs = assets.searchByParams(stmt.getAccount(), CurrencyCode.RUB.getKey(), stmt.getSenderId(), D__V)
-                List<Registry> d__vs = assets.searchByParams(account.getAccount(), CurrencyCode.RUB.getKey(), company.getId(), D__V)
+                    .stream()
-                        .stream()
+                    .filter(rgs -> existActiveSession.getId().equals(rgs.getSessionId()))
-                        .filter(rgs -> sessionId.equals(rgs.getSessionId()))
+                    .toList();
-                        .toList();
+            BigDecimal d__vSum = d__vs.stream()
-                BigDecimal d__vSum = d__vs.stream()
+                .map(rgs -> safeBD(rgs.getBalance()))
-                        .map(rgs -> safeBD(rgs.getBalance()))
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal amount = req.getAmount();
-                BigDecimal amount = req.getAmount();
+            req.setAmount(safeBD(amount).subtract(d__vSum));
-                req.setAmount(safeBD(amount).subtract(d__vSum));
-            } catch (NumberFormatException e) {
-                log.error("stmt.id={} failed to parse specif {} {}",
-                        stmt.getId(),
-                        specif,
-                        ExceptionUtils.getStackTrace(e));
-            }
-        }
-        //Session existActiveSession = sessionImdg.getFirstObjectByFieldValues(Map.of(
-        //        "workflowStatus", SessionStatus.ACTV.getKey()
-        //));
-        //if (existActiveSession != null) {
-        //    log.debug("active session.id={} type {}", existActiveSession.getId(), existActiveSession.getSessionType());
-        //    List<Registry> d__vs = assets.searchByParams(stmt.getAccount(), CurrencyCode.RUB.getKey(), stmt.getSenderId(), D__V)
-        //            .stream()
-        //            .filter(rgs -> existActiveSession.getId().equals(rgs.getSessionId()))
-        //            .toList();
-        //    BigDecimal d__vSum = d__vs.stream()
-        //        .map(rgs -> safeBD(rgs.getBalance()))
-        //        .reduce(BigDecimal.ZERO, BigDecimal::add);
-        //    BigDecimal amount = req.getAmount();
-        //    req.setAmount(safeBD(amount).subtract(d__vSum));
-        //}
-        if (req.getAmount().compareTo(BigDecimal.ZERO) == 0) {
-            return Optional.empty();
         }
         gatewayRequest.setAssetOperationRequests(List.of(req));
-        return Optional.of(gatewayRequest);
+        return gatewayRequest;
     }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java

@@ -125,13 +125,12 @@ public class PaymentInstructionOutboundService {
         log.debug("all checks passed, accCred.id={}, accDeb.id={}, addressee.id={}, sender.id={}, amount: {}",
                 accCred.getId(), accDeb.getId(), addressee.getId(), sender.getId(), amount);
 
-        String purpose = tcr != null ? "Возврат денежных средств, свободных от обязательств с ТКР " + tcr.getCode() + " ." : "Вывод средств.";
+        String purpose = tcr != null ? "Вывод средств по ТКР " + tcr.getCode() + " ." : "Вывод средств.";
         if (payload.getPaymentPurpose() != null) {
-            String reqPmtPrpse = payload.getPaymentPurpose();
+            purpose += " " + payload.getPaymentPurpose();
-            if (!(reqPmtPrpse.endsWith(".") || reqPmtPrpse.endsWith("!") || reqPmtPrpse.endsWith("?") || reqPmtPrpse.endsWith(";"))) {
+            if (!(purpose.endsWith(".") || purpose.endsWith("!") || purpose.endsWith("?") || purpose.endsWith(";"))) {
-                reqPmtPrpse += ".";
+                purpose += ".";
             }
-            purpose = reqPmtPrpse + " " + purpose;
         }
         PaymentInstruction pmt = PaymentInstructionBuilderV2.builder(imdgProvider)
                 .registry(new Registry())
@@ -145,7 +144,7 @@ public class PaymentInstructionOutboundService {
                 .build();
         BankAccount bnkAcc = bnkAccImdg.getFirstObjectBySQL("accountId = %d".formatted(accDeb.getId()));
         if (bnkAcc != null) {
-            pmt.setAddresseeBankName(bnkAcc.getBankName());
+            pmt.setAddresseeBankName(bnkAcc.getBankIdentificationCode());
             pmt.setDebit_csAccount(bnkAcc.getCorrespondentAccount());
         }
         Currency currency = currImdg.getFirstObjectBySQL("currencyCode = '%s'".formatted(CurrencyCode.RUB.getKey()));

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

@@ -45,62 +45,34 @@ public class AssetTBFProcessing {
         this.rgsMng = new RegistryManager(rgsImdg);
     }
 
-    //если нет B ссчитаем что он 0
-    //если нет F надо его создать...
-    //если нет T журнал WARN и ничего не делаем
-    public Registry copy(Registry a__t, RegistryUnit rgsUnit) {
-        Registry a___ = a__t.clone();
-        a___.setRegistryUnit(rgsUnit.getKey());
-        a___.setRegistryCode(RegistryUtil.clearingCode(a___));
-        RegistryManager.zeroState(a___);
-        return a___;
-    }
-
-    /**
-     * пересчитывает A**F = A**T - A**B + D**I - D**V
-     * учитываются только D**I с отрицательным balance.
-     * @param am_b регистр блокированных средств
-     * @param am_t регистр средств под торги
-     * @param am_f регистр свободных средств
-     * @param sum отнимается от блокировки.
-     */
     public void process(Registry am_b, Registry am_t, Registry am_f, BigDecimal sum) {
-        boolean am_bExists = am_b != null;
-        if (!am_bExists) {
-            am_b = new Registry();
-        }
         safeWrapField(am_t::getBalance, am_t::setBalance);
         safeWrapField(am_b::getBalance, am_b::setBalance);
         safeWrapField(am_f::getBalance, am_f::setBalance);
-        Collection<Registry> d__is = searchByParams(am_t.getAccount(),
+        Collection<Registry> d__is = searchByParams(am_b.getAccount(),
-                am_t.getSecuritySymbol(),
+                am_b.getSecuritySymbol(),
-                am_t.getCompanyId(),
+                am_b.getCompanyId(),
-                D__I.type(am_t.getRegistryInstrumentType()));
+                D__I.type(am_b.getRegistryInstrumentType()));
         BigDecimal d__iSum = d__is.stream()
                 .filter(d__i -> safeBD(d__i.getBalance()).compareTo(BigDecimal.ZERO) < 0)
                 .map(rgs -> safeBD(rgs.getBalance()))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
-        Collection<Registry> d__vs = searchByParams(am_t.getAccount(),
+        Collection<Registry> d__vs = searchByParams(am_b.getAccount(),
-                am_t.getSecuritySymbol(),
+                am_b.getSecuritySymbol(),
-                am_t.getCompanyId(),
+                am_b.getCompanyId(),
-                D__V.type(am_t.getRegistryInstrumentType()));
+                D__V.type(am_b.getRegistryInstrumentType()));
         BigDecimal d__vSum = d__vs.stream()
                 .map(rgs -> safeBD(rgs.getBalance()))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         Instant now = Instant.now();
         BigDecimal am_fBalanceForLoging = am_f.getBalance();
         BigDecimal am_bBalanceForLoging = am_b.getBalance();
-        if (!am_bExists && sum != null && sum.compareTo(BigDecimal.ZERO) != 0) {
-            log.error("FATAL: A**F.id={}; A**T.id={} A**B is null, yet #sum={}", am_f.getId(), am_t.getId(), sum);
-        }
         am_b.setBalance(am_b.getBalance().subtract(sum));
         am_f.setBalance(am_t.getBalance().subtract(am_b.getBalance()).add(d__iSum).subtract(d__vSum));
-        if (am_bExists) {
+        am_b.setUpdated(now);
-            am_b.setUpdated(now);
-            rgsImdg.update(am_b);
-        }
         am_f.setUpdated(now);
 
+        rgsImdg.update(am_b);
         rgsImdg.update(am_f);
         log.debug("assets processing [{}#id={}#balance={} | {}#id={}#balance={} | {}#id={}#balance={}] " +
                         "D**I.size={} D**V.size={}. {}.balance -> {}, {}.balance -> {}",
@@ -143,7 +115,7 @@ public class AssetTBFProcessing {
         }
     }
 
-    public Optional<AssetTrio> processByAm_f(Registry am_f, BigDecimal sum) {
+    public void processByAm_f(Registry am_f, BigDecimal sum) {
         Optional<Registry> am_b = rgsMng.findRegByUnit(am_f.getCompanyId(),
                 am_f.getAccountId(),
                 am_f.getContract(),
@@ -156,28 +128,6 @@ public class AssetTBFProcessing {
                 RegistryUnit.T);
         if (am_b.isPresent() && am_t.isPresent()) {
             process(am_b.get(), am_t.get(), am_f, sum);
-            return Optional.of(new AssetTrio(am_f, am_b.get(), am_t.get()));
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    public Optional<AssetTrio> processByA__t(Registry a__t, BigDecimal sum) {
-        Optional<Registry> a__b = rgsMng.findRegByUnit(a__t.getCompanyId(),
-                a__t.getAccountId(),
-                a__t.getContract(),
-                a__t,
-                RegistryUnit.B);
-        Optional<Registry> a__f = rgsMng.findRegByUnit(a__t.getCompanyId(),
-                a__t.getAccountId(),
-                a__t.getContract(),
-                a__t,
-                RegistryUnit.F);
-        if (a__b.isPresent() && a__f.isPresent()) {
-            process(a__b.get(), a__t, a__f.get(), sum);
-            return Optional.of(new AssetTrio(a__t, a__b.get(), a__f.get()));
-        } else {
-            return Optional.empty();
         }
     }
 
@@ -209,10 +159,15 @@ public class AssetTBFProcessing {
         ast.setTradingClearingRegistry(tcr);
         ast.setRegistryStatus(RegistryStatus.OK.getKey());
         ast.setBalanceDimension(BalanceDimension.PICS.getKey());
-        ast.setOpenBalance(BigDecimal.ZERO);
         RegistryManager.zeroState(ast);
-        Registry asf = copy(ast, RegistryUnit.F);
+        Registry asf = ast.clone();
-        Registry asb = copy(ast, RegistryUnit.B);
+        asf.setRegistryUnit(RegistryUnit.F.getKey());
+        asf.setRegistryCode(RegistryUtil.clearingCode(asf));
+        RegistryManager.zeroState(asf);
+        Registry asb = ast.clone();
+        asb.setRegistryUnit(RegistryUnit.B.getKey());
+        asb.setRegistryCode(RegistryUtil.clearingCode(asb));
+        RegistryManager.zeroState(asb);
         return new AssetTrio(asf, asb, ast);
     }
 
@@ -244,7 +199,6 @@ public class AssetTBFProcessing {
         ast.setTradingClearingRegistry(tcr);
         ast.setRegistryStatus(RegistryStatus.OK.getKey());
         ast.setBalanceDimension(BalanceDimension.MONY.getKey());
-        ast.setOpenBalance(BigDecimal.ZERO);
         RegistryManager.zeroState(ast);
         Registry asf = ast.clone();
         asf.setRegistryUnit(RegistryUnit.F.getKey());
@@ -287,23 +241,6 @@ public class AssetTBFProcessing {
         return Optional.empty();
     }
 
-    public Optional<AssetTrio> searchSecurityByAccAndCompany(Long companyId, Long accountId, String securitySymbol) {
-        ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
-        Function<RegistryTradingParams, ImdgPredicate> prdct = rgsCode -> pb.and(
-                pb.sql(RegistryCodeSqlBuilder.getInstance(rgsCode).build()),
-                pb.equals("companyId", companyId),
-                pb.equals("accountId", accountId),
-                pb.equals("securitySymbol", securitySymbol)
-        );
-        Registry amf = rgsImdg.getFirstObjectByPredicate(prdct.apply(AS_F));
-        Registry amb = rgsImdg.getFirstObjectByPredicate(prdct.apply(AS_B));
-        Registry amt = rgsImdg.getFirstObjectByPredicate(prdct.apply(AS_T));
-        if (amf != null && amb != null && amt != null) {
-            return Optional.of(new AssetTrio(amf, amb, amt));
-        }
-        return Optional.empty();
-    }
-
     public boolean insufficientBalance(Registry registry, BigDecimal amount) {
         return safeBD(registry.getBalance()).compareTo(safeBD(amount)) < 0;
     }

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

@@ -4,18 +4,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import ru.clearing.classes.statics.data.registry.Registry;
-import ru.clearing.classes.statics.data.sdf.SDf57;
-import ru.clearing.classes.statics.data.statement.Statement;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.session.stage.util.RegistryUtil;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.RegistryDesignation;
+import ru.spcex.platform.enumeration.RegistryStatus;
+import ru.spcex.platform.enumeration.RegistryTradingParams;
+import ru.spcex.platform.enumeration.RegistryUnit;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
-import ru.spcex.platform.utils.log.ExceptionUtils;
-import ru.spcex.platform.utils.number.BigDecimalUtil;
 
 import java.math.BigDecimal;
 import java.time.Instant;
@@ -25,14 +24,10 @@ import java.util.Optional;
 public class DmiService {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Imdg<Registry> rgsImdg;
-    private final Imdg<SDf57> sDf57Imdg;
-    private final Imdg<Statement> statementImdg;
     private final RegistryManager rgsMng;
 
     public DmiService(ImdgProvider imdgProvider, RegistryManager rgsMng) {
         this.rgsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
-        this.sDf57Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf57, SDf57.class);
-        this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
         this.rgsMng = rgsMng;
     }
 
@@ -91,33 +86,6 @@ public class DmiService {
         findDmiByComment(tcrId, securitySymbol, comment).ifPresentOrElse(d__i -> {
             d__i.setContract(contract);
             d__i.setUpdated(Instant.now());
-            try {
-                Long dbfId = Long.valueOf(contract);
-                SDf57 sdf57 = sDf57Imdg.getFirstObjectBySQL("dbfId=%d".formatted(dbfId));
-                if (sdf57 != null) {
-                    ImdgPredicateBuilder pb = statementImdg.predicateBuilder();
-                    ImdgPredicate stmtPrdct = pb.and(
-                            pb.equals("inSDfId", sdf57.getId()),
-                            pb.equals("inOutSDfType", InOutSDfType.type57.getKey())
-                    );
-                    Statement stmt = statementImdg.getFirstObjectByPredicate(stmtPrdct);
-                    if (stmt != null && OperationStatus.Executed.equalsByKey(stmt.getOperationStatus())) {
-                        d__i.setRegistryStatus(RegistryStatus.OK.getKey());
-                    } else {
-                        log.warn("tcrId={} securitySymbol={} comment={} sdf57 dbfId={} found, stmt.id={} status {}. d**i status will not be updated",
-                                tcrId,
-                                securitySymbol,
-                                comment,
-                                dbfId,
-                                stmt != null ? stmt.getId() : null,
-                                stmt != null ? stmt.getOperationStatus() : null);
-                    }
-                }
-            } catch (Throwable e) {
-                log.error("sdf57 search by {}: error {}",
-                        contract,
-                        ExceptionUtils.getStackTrace(e));
-            }
             rgsImdg.update(d__i);
             log.trace("set {}.id={} contract {}", d__i.getRegistryCode(), d__i.getId(), contract);
         }, () -> log.trace("didn't find DM*I by tcr.id={} securitySymbol={} comment={}",
@@ -129,21 +97,18 @@ public class DmiService {
      * ищем D**I по tcrId/security/contract
      * задаем статус ОК
      */
-    public Optional<BigDecimal> setOk(Long tcrId,
+    public void setOk(Long tcrId,
                       String securitySymbol,
                       String contract) {
-        BigDecimal[] dmiBalance = {null};
         findDmiByContract(tcrId, securitySymbol, contract).ifPresentOrElse(d__i -> {
             d__i.setRegistryStatus(RegistryStatus.OK.getKey());
             d__i.setUpdated(Instant.now());
             log.trace("updating {} status to {}", d__i.getRegistryCode(), d__i.getRegistryStatus());
             rgsImdg.update(d__i);
-            dmiBalance[0] = BigDecimalUtil.safeBD(d__i.getBalance());
         }, () -> {
             log.trace("didn't find DM*I by tcr.id={} securitySymbol={} contract={}",
                     tcrId, securitySymbol, contract);
         });
-        return Optional.ofNullable(dmiBalance[0]);
     }
 
     private Optional<Registry> findDmiByContract(Long tcrId, String securitySymbol, String contract) {
@@ -191,14 +156,15 @@ public class DmiService {
             return Optional.empty();
         }
         Registry rgsD = am_t.clone();
-        RegistryManager.zeroState(rgsD);
-        rgsD.setOpenBalance(BigDecimal.ZERO);
-        rgsD.setCloseBalance(BigDecimal.ZERO);
         rgsD.setRegistryDesignation(RegistryDesignation.D.getKey());
         rgsD.setRegistryUnit(RegistryUnit.I.getKey());
         rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD));
         rgsD.setBalance(summ);
 
+        rgsD.setDebit(BigDecimal.ZERO);
+        rgsD.setCredit(BigDecimal.ZERO);
+        rgsD.setDiffBalance(BigDecimal.ZERO);
+        rgsD.setCheckBalance(BigDecimal.ZERO);
         rgsD.setRegistryStatus(RegistryStatus.PROC.getKey());
         return Optional.of(rgsD);
     }

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

@@ -54,9 +54,6 @@ public class PaymentStateMarkService {
         Collection<Registry> claimsAndLiabilities = rgsImdg.getCollectionObjectsByPredicate(prdct);
         Map<Long, List<Registry>> groups = claimsAndLiabilities
                 .stream()
-                .filter(rgs -> rgs.getValueDate() != null)
-                .filter(rgs -> rgs.getSettlementDate() != null)
-                .filter(rgs -> rgs.getSettlementDate().equals(rgs.getValueDate()))
                 .collect(Collectors.groupingBy(Registry::getGroupId));
         log.debug("found {} ({} groups) CM*T/LM*T by {}", claimsAndLiabilities.size(), groups.size(), prdct.toString());
         for (Map.Entry<Long, List<Registry>> group : groups.entrySet()) {

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

@@ -38,17 +38,11 @@ public class RegistryManager {
 
     public Optional<Registry> searchDmxByCounterParty(Registry rgs) {
         if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty();
-        ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
+        String sqlCondition = String.format("(%s) and companyId = %d and contract = '%s'",
-        ImdgPredicate prdct = pb.and(
+                RegistryCodeSqlBuilder.getInstance(DM_X).build(),
-                pb.sql(RegistryCodeSqlBuilder.getInstance(DM_X).build()),
+                rgs.getCounterPartyId(),
-                pb.equals("companyId", rgs.getCounterPartyId()),
+                rgs.getContract());
-                pb.equals("contract", rgs.getContract()),
+        Registry dmx = rgsImdg.getFirstObjectBySQL(sqlCondition);
-                pb.or(
-                        pb.equals("registryStatus", RegistryStatus.PROC.getKey()),
-                        pb.equals("registryStatus", RegistryStatus.MNG.getKey())
-                )
-        );
-        Registry dmx = rgsImdg.getFirstObjectByPredicate(prdct);
         return Optional.ofNullable(dmx);
     }
 

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

@@ -9,8 +9,6 @@ import ru.spcex.platform.enumeration.ClearingCategory;
 import ru.spcex.platform.enumeration.RegistryStatus;
 import ru.spcex.platform.enumeration.RegistryTradingParams;
 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.api.predicate.specific.RegistryCodeSqlBuilder;
 import ru.spcex.platform.imdg.validation.ImdgValidationContext;
 import ru.spcex.platform.imdg.validation.Stored;
@@ -66,12 +64,7 @@ public enum ReturnDepositValidationRule implements IValidationRule<ImdgValidatio
             }
             if (ctgr.get().equals(ClearingCategory.V)) {
                 Imdg<Registry> rgsImdg = context.obtainMap(IMDGDistributedNames.Map_Registry, Registry.class);
-                ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
+                Collection<Registry> group = rgsImdg.getCollectionObjectsBySQL("groupId = %d".formatted(rgs.getGroupId()));
-                ImdgPredicate prdct = pb.and(
-                        pb.equals("groupId", rgs.getGroupId()),
-                        pb.equals("contract", rgs.getContract())
-                );
-                Collection<Registry> group = rgsImdg.getCollectionObjectsByPredicate(prdct);
                 Optional<Registry> om_t = group.stream()
                         .filter(r -> r.getSettlementDate() != null)
                         .filter(r -> r.getValueDate() != null)

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

@@ -131,7 +131,7 @@ public enum Sdf06NewValidationRule implements IValidationRule<ImdgValidationCont
                     prdctBldr.and(
                             prdctByRegistryCode.apply(RegistryTradingParams.DM_T),
                             prdctBldr.or(
-                                    prdctBldr.equals("registryStatus", RegistryStatus.PROC.getKey()),
+                                    prdctBldr.equals("registryStatus", RegistryStatus.OK.getKey()),
                                     prdctBldr.equals("registryStatus", RegistryStatus.MNG.getKey())
                             )
                     )

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

@@ -12,7 +12,9 @@ import ru.spcex.clearing.error.ClearingError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.service.AssetTrio;
 import ru.spcex.clearing.service.registry.RegistryManager;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.NoRef;
+import ru.spcex.platform.enumeration.OperationCode;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
@@ -65,12 +67,6 @@ public enum Sdf20ValidationRule implements IValidationRule<ImdgValidationContext
             if (acc == null) {
                 return of(ClearingError.AccountNotFoundB, depoCodeCl);
             }
-            ServiceStatus status = IEnumKey.getEnumByKey(ServiceStatus.class, acc.getStatus());
-            if (!ServiceStatus.Active.equals(status)
-                    && !ServiceStatus.Reopened.equals(status)
-                    && !ServiceStatus.Appl.equals(status)) {
-                return of(ClearingError.AccountNotActive, acc.getId());
-            }
             context.storeObject(ValidationStored.Sdf20Account, acc);
             return empty();
         }
@@ -90,9 +86,6 @@ public enum Sdf20ValidationRule implements IValidationRule<ImdgValidationContext
             if (company == null) {
                 return of(ClearingError.CompanyNotFoundB, acc.getCompanyId());
             }
-            if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) {
-                return of(ClearingError.CompanyNotActive, company.getId());
-            }
             context.storeObject(ValidationStored.Sdf20Company, company);
             return empty();
         }

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

@@ -1,55 +0,0 @@
-package ru.spcex.clearing.service.validation;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import ru.clearing.classes.statics.data.misc.Session;
-import ru.spcex.clearing.error.ClearingError;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.session.stage.TaskType;
-import ru.spcex.platform.enumeration.SessionStatus;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.validation.ImdgValidationContext;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.enumeration.IEnumKey;
-import ru.spcex.platform.utils.validation.IValidationRule;
-
-import java.util.Map;
-import java.util.Optional;
-
-public enum SessionTerminationValidationRule implements IValidationRule<ImdgValidationContext<Session>> {
-    SessionPresent() {
-        @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<Session> context) {
-            Imdg<Session> sessionImdg = context.obtainMap(IMDGDistributedNames.Map_Session, Session.class);
-            Session session = sessionImdg.getFirstObjectByFieldValues(Map.of(
-                    "workflowStatus", SessionStatus.ACTV.getKey()
-            ));
-            if (session == null) {
-                log.warn("Cannot stop session, failed to find workflowStatus 'ACTV'");
-                return of(ClearingError.RecordNotFound, "с активной клиринговой сессией для обнуления");
-            }
-            context.storeObject(ValidationStored.SessionTerminate, session);
-            context.setValidatedObject(session);
-            return empty();
-        }
-    },
-    StatusCheck() {
-        @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<Session> context) {
-            Session session = context.getStoredObject(ValidationStored.SessionTerminate);
-            TaskType status = IEnumKey.getEnumByKey(TaskType.class, session.getSessionStatus());
-            if (status == null || status.ordinal() >= TaskType.FormingPaymentInstruction.ordinal()) {
-                log.warn("Cannot stop session.id={}, unknown sessionStatus '{}'",
-                        session.getId(), session.getSessionStatus());
-                return of(ClearingError.IncorrectValue, "статуса для обнуления клиринговой сессии");
-            }
-            return empty();
-        }
-    }
-    ;
-    private final static Logger log = LoggerFactory.getLogger(SessionTerminationValidationRule.class);
-    @Override
-    public String ruleName() {
-        return "SessionTerminationValidationRule." + name();
-    }
-}

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

@@ -63,7 +63,7 @@ public enum StatusExtractValidationRule implements IValidationRule<ImdgValidatio
             return empty();
         }
     },
-    RequestStatusValid() {
+    RegistryStatusValid() {
         @Override
         public Optional<EnumMessage> validate(ImdgValidationContext<RegistryChangeStatusExtractRequest> context) {
             RegistryChangeStatusExtractRequest validatedObject = context.getValidatedObject();
@@ -76,17 +76,6 @@ public enum StatusExtractValidationRule implements IValidationRule<ImdgValidatio
             }
             return empty();
         }
-    },
-    RegistryStatusValid() {
-        @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<RegistryChangeStatusExtractRequest> context) {
-            Registry rgs = context.getStoredObject(Stored.PresentById);
-            RegistryStatus status = IEnumKey.getEnumByKey(RegistryStatus.class, rgs.getRegistryStatus());
-            if (RegistryStatus.OK.equals(status)) {
-                return of(ClearingError.ObligationsAlreadyCalculated);
-            }
-            return empty();
-        }
     }
     ;
     private final static Logger log = LoggerFactory.getLogger(StatusExtractValidationRule.class);

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

@@ -32,7 +32,5 @@ public enum ValidationStored {
 
     SecurityBySecurityCode,
 
-    SessionTerminate,
-
     RegistrysByContract, SplitDepositMaxNumber
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/AbstractSession.java

@@ -105,11 +105,6 @@ public abstract class AbstractSession {
 
     protected void continueRunning(TaskType t) {
         synchronized (this.currStage) {
-            //if (WorkflowStatus.Blocked.equalsByKey(this.currSession.getWorkflowStatus())) {
-            //    log.error("cannot run task {}.{}. session.id={} workflowStatus is {}",
-            //            t, t.getKey(), this.currSession.getId(), this.currSession.getWorkflowStatus());
-            //    throw new StageException();
-            //}
             this.currStage.set(t);
             this.currSession.setSessionStatus(t.getKey());
             this.currSession.setUpdated(Instant.now());

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java

@@ -112,7 +112,6 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
         inspectionObligations.setSection(section());
         formingPaymentInstructionDeals.setSection(section());
         formingPaymentInstructionDeals.setSessionType(sessionType());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java

@@ -106,7 +106,6 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
         inspectionObligations.setSection(section());
         formingPaymentInstructionDeals.setSection(section());
         formingPaymentInstructionDeals.setSessionType(sessionType());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java

@@ -98,7 +98,6 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
         inclusionObligations.setSessionType(sessionType());
         inspectionObligations.setSection(section());
         finishingSession.setSection(section());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java

@@ -99,7 +99,6 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
         inclusionObligations.setSessionType(sessionType());
         inspectionObligations.setSection(section());
         finishingSession.setSection(section());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java

@@ -99,7 +99,6 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
         inclusionObligations.setSessionType(sessionType());
         inspectionObligations.setSection(section());
         finishingSession.setSection(section());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java

@@ -90,7 +90,6 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
                         rgsPrctBuilder.less("valueDate", LocalDate.now())
                 )
         );
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java

@@ -93,7 +93,6 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
         inclusionObligations.setSessionType(sessionType());
         inspectionObligations.setSection(section());
         finishingSession.setSection(section());
-        finishingSession.setSessionType(sessionType());
         imdgProvider.waitAvailable();
         initSessionIfPresent();
     }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionManager.java

@@ -66,43 +66,6 @@ public class SessionManager {
             return;
         }
         BaseRequest<?> baseRequest = new BaseRequest<>();
-        AbstractSession session = sessionByType(sessionType);
-        if (session != null) {
-            //checkActive
-            checkAllowSessionStart();
-
-            session.runSession(baseRequest);
-        }
-    }
-
-    protected void checkAllowSessionStart() throws ValidationException {
-        EnumMessage err = null;
-        Session existActiveSession = sessionImdg.getFirstObjectByFieldValues(Map.of(
-                "workflowStatus", SessionStatus.ACTV.getKey()
-        ));
-        if (existActiveSession != null) {
-            log.warn("Can not start new session, cause exist active session.id={}", existActiveSession.getId());
-            err = new EnumMessage(ClearingError.ActiveSessionIsPresent, String.valueOf(existActiveSession.getId()));
-        }
-        if (err != null) {
-            notification.sendNotification(ObjectType.session, msgs.resolve(err), Priority.HIGH);
-            throw new ValidationException(err);
-        }
-    }
-
-    public void endSession(Session session) {
-        SessionType sessionType = IEnumKey.getEnumByKey(SessionType.class, session.getSessionType());
-        String err = "failed to stop session.id=%d: unknown sessionType: %s"
-                .formatted(session.getId(), session.getSessionType());
-        if (sessionType == null) {
-            throw new IllegalStateException(err);
-        }
-        AbstractSession sessionFlow = sessionByType(sessionType);
-        if (sessionFlow == null) throw new IllegalStateException(err);
-        sessionFlow.endSession();
-    }
-
-    private AbstractSession sessionByType(SessionType sessionType) {
         AbstractSession session = null;
         switch (sessionType){
             case IPOB -> session = primaryAuctionBnSession;
@@ -113,6 +76,32 @@ public class SessionManager {
             case FINL -> session = finalMkrSession;
             case XDEP -> session = returnDepositSession;
         }
-        return session;
+
+        if (session != null) {
+            //checkActive
+            checkAllowSessionStart(sessionType);
+
+            session.runSession(baseRequest);
+        }
+    }
+
+    protected void checkAllowSessionStart(SessionType sessionType) throws ValidationException {
+        EnumMessage err = null;
+        if (sessionType.equals(SessionType.XDEP) && !time.timeForXdep()) {
+            log.warn("cannot launch {} reason: time interval not matched", sessionType);
+            err = new EnumMessage(ClearingError.XdepTimeIntervalNotMatch);
+        } else {
+            Session existActiveSession = sessionImdg.getFirstObjectByFieldValues(Map.of(
+                    "workflowStatus", SessionStatus.ACTV.getKey()
+            ));
+            if (existActiveSession != null) {
+                log.warn("Can not start new session, cause exist active session.id={}", existActiveSession.getId());
+                err = new EnumMessage(ClearingError.ActiveSessionIsPresent, String.valueOf(existActiveSession.getId()));
+            }
+        }
+        if (err != null) {
+            notification.sendNotification(ObjectType.session, msgs.resolve(err), Priority.HIGH);
+            throw new ValidationException(err);
+        }
     }
 }

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SessionTerminator.java

@@ -1,151 +0,0 @@
-package ru.spcex.clearing.session.stage;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.execution.ExecutionCommon;
-import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
-import ru.clearing.classes.statics.data.execution.ExecutionFond;
-import ru.clearing.classes.statics.data.misc.Session;
-import ru.clearing.classes.statics.data.registry.Registry;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.notification.NotificationSender;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
-import ru.spcex.clearing.service.registry.AssetTBFProcessing;
-import ru.spcex.clearing.service.validation.ValidationStored;
-import ru.spcex.clearing.util.services.RequestHelper;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.enumeration.ObjectType;
-import ru.spcex.platform.enumeration.Priority;
-import ru.spcex.platform.enumeration.RegistryTradingParams;
-import ru.spcex.platform.enumeration.Section;
-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.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
-import ru.spcex.platform.utils.enumeration.EnumMessage;
-import ru.spcex.platform.utils.enumeration.IMessageResolver;
-import ru.spcex.platform.utils.validation.IValidator;
-
-import java.math.BigDecimal;
-import java.time.Instant;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-@Service
-public class SessionTerminator {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<ExecutionDeposit> execDpstImdg;
-    private final Imdg<ExecutionFond> execFondImdg;
-    private final Imdg<Registry> rgsImdg;
-
-    private final NotificationSender notification;
-    private final AssetTBFProcessing assets;
-    private final IMessageResolver msgs;
-    private final RequestHelper reqInfo;
-    private final Supplier<IValidator> validation;
-    private final SessionManager sessionMng;
-
-
-    public SessionTerminator(ImdgProvider imdgProvider,
-                             NotificationSender notification,
-                             AssetTBFProcessing assets, IMessageResolver msgs,
-                             RequestHelper reqInfo,
-                             @Qualifier("terminateSessionValidator") Supplier<IValidator> validation, SessionManager sessionMng) {
-        this.notification = notification;
-        this.assets = assets;
-        this.msgs = msgs;
-        this.execDpstImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class);
-        this.execFondImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionFond, ExecutionFond.class);
-        this.rgsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class);
-        this.reqInfo = reqInfo;
-        this.validation = validation;
-        this.sessionMng = sessionMng;
-    }
-
-    public RequestInfoUpdate stopCurrentSession(BaseRequest<?> req) {
-        IValidator validator = validation.get();
-        Optional<EnumMessage> err = validator.tillFirstError();
-        if (err.isPresent()) {
-            notification.sendNotification(ObjectType.session, msgs.resolve(err.get()), Priority.HIGH);
-            return reqInfo.error(req.getId(), err.get());
-        }
-        Session session = validator.getStored(ValidationStored.SessionTerminate);
-        rollbackExecutions(session);
-        rollbackAssetBalances(session.getId());
-        deleteLiabilitiesAndClaims(session.getId());
-        sessionMng.endSession(session);
-        return reqInfo.success(session.getId());
-    }
-
-    private void rollbackExecutions(Session session) {
-        Instant now = Instant.now();
-
-        Consumer<Imdg<ExecutionCommon>> nullifier = imdg -> {
-            Collection<ExecutionCommon> execs = imdg.getCollectionObjectsBySQL(
-                    "sessionId = " + session.getId()
-            );
-            for (ExecutionCommon exec : execs) {
-                exec.setSessionId(null);
-                exec.setCoverageStatus(null);
-                exec.setUpdated(now);
-                imdg.update(exec);
-            }
-            log.info("updated {} executions with sessionId={}", execs.size(), session.getId());
-        };
-        log.debug("session.id={} section {}", session.getId(), session.getSection());
-
-        if (Section.FOND.equalsByKey(session.getSection())) {
-            nullifier.accept(upcastImdg(execFondImdg));
-        } else if (Section.MKR.equalsByKey(session.getSection())) {
-            nullifier.accept(upcastImdg(execDpstImdg));
-        } else throw new IllegalStateException("unknown section.");
-    }
-
-    private void rollbackAssetBalances(Long sessionId) {
-        Instant now = Instant.now();
-        ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
-        ImdgPredicate prdct = pb.and(
-                pb.equals("sessionId", sessionId),
-                pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.A__B).build()),
-                pb.not(pb.equals("balance", BigDecimal.ZERO))
-        );
-
-        Collection<Registry> a__bs = rgsImdg.getCollectionObjectsByPredicate(prdct);
-        a__bs.forEach(rgs -> {
-            rgs.setBalance(BigDecimal.ZERO);
-            rgs.setUpdated(now);
-            rgsImdg.update(rgs);
-            assets.processByAm_b(rgs, BigDecimal.ZERO);
-        });
-        log.debug("set ZERO balance for {} A**B by predicate: {}", a__bs.size(), prdct);
-    }
-
-    private void deleteLiabilitiesAndClaims(Long sessionId) {
-        ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
-        ImdgPredicate prdct = pb.and(
-                pb.equals("sessionId", sessionId),
-                pb.or(
-                        pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.C__T).build()),
-                        pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.L__T).build()),
-                        pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.O__T).build()),
-                        pb.sql(RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.T__T).build())
-                )
-        );
-        Collection<Registry> liabilitiesAndClaims = rgsImdg.getCollectionObjectsByPredicate(prdct);
-        liabilitiesAndClaims.forEach(rgsImdg::delete);
-        log.debug("deleted {} liabilities and claims by predicate: {}", liabilitiesAndClaims.size(), prdct);
-    }
-
-
-    private static <T extends SpcexObjectBase, U extends T> Imdg<T> upcastImdg(Imdg<U> imdg) {
-        @SuppressWarnings("unchecked")
-        Imdg<T> result = (Imdg<T>) imdg;
-        return result;
-    }
-}

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java

@@ -166,7 +166,7 @@ public class BalanceRevise implements ISessionStage {
             NotificationNewRequest nRequest = new NotificationNewRequest();
             nRequest.setObjectType(ObjectType.rgst.getKey());
             nRequest.setPriority(Priority.HIGH.getKey());
-            nRequest.setComment("Сверка по результатам клиринговой сессии завершена с ошибками.");
+            nRequest.setComment("После сверки обнаружена разница между плановым и фактическим балансом");
             kafkaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, nRequest);
             return new StageResult<>(new EnumMessage(ClearingError.PlanBalanceReviseError), false);
         } else {

clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FinishingSession.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.execution.ExecutionCommon;
 import ru.clearing.classes.statics.data.execution.ExecutionDeposit;
 import ru.clearing.classes.statics.data.execution.ExecutionFond;
 import ru.clearing.classes.statics.data.misc.Session;
@@ -28,22 +29,18 @@ 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.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
-import ru.spcex.platform.utils.collection.Pair;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 import ru.spcex.platform.utils.enumeration.IEnumKey;
 import ru.spcex.platform.utils.enumeration.IMessageResolver;
 
 import java.time.Instant;
-import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static ru.spcex.clearing.error.ClearingErrorInternal.SessionGeneralError;
-import static ru.spcex.platform.utils.enumeration.IEnumKey.getEnumByKey;
 
 @Service
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@@ -60,7 +57,6 @@ public class FinishingSession implements ISessionStage {
     private final IMessageResolver msgResolver;
     private final Sdf05Sender sdf05Sender;
     private final Sdf14Sender sdf14Sender;
-    private SessionType sessionType;
     private Section section;
 
     @Autowired
@@ -80,9 +76,6 @@ public class FinishingSession implements ISessionStage {
     public void setSection(Section section) {
         this.section = section;
     }
-    public void setSessionType(SessionType sessionType) {
-        this.sessionType = sessionType;
-    }
 
     @Override
     public StageResult<?> submit(Task<?> task) {
@@ -115,79 +108,39 @@ public class FinishingSession implements ISessionStage {
             log.error("Session id={} not found. Can not update Execution's.", sessionId);
         } else {
             Collection<Registry> oRegs = findORegistryBySessionId(sessionId);
-            Map<Long, RegistryStatus> obligationStatusByGroupId;
+            Set<Long> exchangeExecutionIdAllowed = oRegs.stream()
-            obligationStatusByGroupId = oRegs.stream()
+                    .filter(rgs -> RegistryStatus.CLRD.equalsByKey(rgs.getRegistryStatus()))
-                    .map(rgs -> new Pair<>(rgs.getGroupId(), getEnumByKey(RegistryStatus.class, rgs.getRegistryStatus())))
+                    .map(Registry::getGroupId) // Registry::getGroupId == Execution.ExchangeExecutionId, см. RegistryFondBuilder/RegistryDepoBuilder
-                    .filter(pair -> pair.getSecond() != null)
-                    .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond, (o1, o2) -> o1));
-            Function<Long, CoverageStatus> statusByExchangeId = id-> {
-                RegistryStatus obligationStatus = obligationStatusByGroupId.get(id);
-                if (obligationStatus == null) return null;
-                return switch (obligationStatus) {
-                    case CLRD -> CoverageStatus.ALWD;
-                    case FAIL, UNCV, NACK, NACC ->  CoverageStatus.DEND;
-                    default -> null;
-                };
-            };
-            Set<Long> exchangeExecutionIdsPreviousDay = oRegs.stream()
-                    .filter(rgs -> Objects.nonNull(rgs.getSettlementDate()))
-                    .filter(rgs -> Objects.nonNull(rgs.getTradingDate()))
-                    .filter(rgs -> rgs.getSettlementDate().compareTo(rgs.getTradingDate()) > 0)
-                    .map(Registry::getGroupId)
                     .collect(Collectors.toSet());
-            log.trace("obligations number with second leg in the past: {}", exchangeExecutionIdsPreviousDay.size());
+
-            int allowed = 0;
-            int notAllowed = 0;
             if (IEnumKey.contains(session.getSessionType(), SessionType.FINL, SessionType.MEDM)) {
                 Collection<ExecutionDeposit> executions = findExecutionDepositBySessionId(sessionId);
-                log.trace("loaded {} ExecutionDeposits for sessionId {}", executions.size(), sessionId);
+                int notAllowed = 0;
                 for (ExecutionDeposit execution : executions) {
-                    CoverageStatus toStatus = statusByExchangeId.apply(execution.getExchangeExecutionId());
+                    CoverageStatus toStatus = exchangeExecutionIdAllowed.contains(execution.getExchangeExecutionId()) ?
-                    if (toStatus == null) {
+                            CoverageStatus.ALWD : CoverageStatus.DNED;
-                        log.trace("CoverageStatus not defined for execution.id={}", execution.getId());
+                    if (toStatus == CoverageStatus.DNED)
-                        continue;
-                    }
-                    if (toStatus == CoverageStatus.DEND) {
                         notAllowed++;
-                    }
-                    if (toStatus == CoverageStatus.ALWD) {
-                        allowed++;
-                    }
                     execution.setCoverageStatus(toStatus.getKey());
                     execution.setUpdated(Instant.now());
                     executionDepositImdg.update(execution);
                 }
-                log.trace("By sessionId={} processed {} ExecutionDeposit: {} allowed, {} denied, skipped {}",
+                log.trace("By sessionId={} update {} ExecutionDeposit: {} allowed, {} denied", sessionId,
-                        sessionId,
+                        executions.size(), exchangeExecutionIdAllowed.size(), notAllowed);
-                        executions.size(),
-                        allowed,
-                        notAllowed,
-                        executions.size() - (allowed + notAllowed));
             } else if (IEnumKey.contains(session.getSessionType(), SessionType.TRDT, SessionType.IPOB, SessionType.IPO0, SessionType.IPOT)) {
                 Collection<ExecutionFond> executions = findExecutionFondBySessionId(sessionId);
-                log.trace("loaded {} ExecutionFonds for sessionId {}", executions.size(), sessionId);
+                int notAllowed = 0;
                 for (ExecutionFond execution : executions) {
-                    CoverageStatus toStatus = statusByExchangeId.apply(execution.getExchangeExecutionId());
+                    CoverageStatus toStatus = exchangeExecutionIdAllowed.contains(execution.getExchangeExecutionId()) ?
-                    if (toStatus == null) {
+                            CoverageStatus.ALWD : CoverageStatus.DNED;
-                        log.trace("CoverageStatus not defined for execution.id={}", execution.getId());
+                    if (toStatus == CoverageStatus.DNED)
-                        continue;
-                    }
-                    if (toStatus == CoverageStatus.DEND) {
                         notAllowed++;
-                    }
-                    if (toStatus == CoverageStatus.ALWD) {
-                        allowed++;
-                    }
                     execution.setCoverageStatus(toStatus.getKey());
                     execution.setUpdated(Instant.now());
                     executionFondImdg.update(execution);
                 }
-                log.trace("By sessionId={} processed {} ExecutionFond: allowed {}, denied {}, skipped {}",
+                log.trace("By sessionId={} update {} ExecutionFond: {} allowed, {} denied", sessionId,
-                        sessionId,
+                        executions.size(), exchangeExecutionIdAllowed.size(), notAllowed);
-                        executions.size(),
-                        allowed,
-                        notAllowed,
-                        executions.size() - (allowed + notAllowed));
             } else {
                 log.warn("Unsupported session[{}].SessionType={} for update Executions", sessionId, session.getSessionType());
             }
@@ -203,7 +156,7 @@ public class FinishingSession implements ISessionStage {
             return sResult;
         }
         for (Registry registryA : forRegistries) {
-            if (!RegistryDesignation.A.equalsByKey(registryA.getRegistryUnit())) { //fixme Unit -> Designation
+            if (!RegistryDesignation.A.equalsByKey(registryA.getRegistryUnit())) {
                 log.warn("For registry {}.RegistryDesignation is not A.", registryA.getId());
                 continue;
             }
@@ -287,43 +240,23 @@ public class FinishingSession implements ISessionStage {
 //              registryStatus - любой статус
                 pb.equals("registryDesignation", RegistryDesignation.O.getKey()));
         Collection<Registry> result = registryImdg.getCollectionObjectsByPredicate(prdct);
-        int size = result.size();
+        log.trace("found {} liabilities by query {} ", result.size(), prdct);
         result = result.stream()
-                .filter(registry -> Objects.equals(registry.getSettlementDate(), LocalDate.now()))
                 .filter(registry -> Objects.equals(registry.getValueDate(), registry.getSettlementDate()))
-                .collect(Collectors.toList());
+                        .collect(Collectors.toList());
-        log.debug("found {} liabilities by query {} and {} liabilities after filtering ValueDate==SettlementDate",
+        log.debug("found {} liabilities 'O' by query {} and ValueDate==SettlementDate", result.size(), prdct);
-                size, result.size(), prdct);
         return result;
     }
 
     protected Collection<ExecutionFond> findExecutionFondBySessionId(Long sessionId) {
-        ImdgPredicateBuilder pb = executionFondImdg.predicateBuilder();
+        Collection<ExecutionFond> result = executionFondImdg.getCollectionObjectsByFieldValues(Map.of("sessionId", sessionId));
-        ImdgPredicate prdct = pb.or(
-                pb.equals("sessionId", sessionId),
-                pb.equals("settlementDate", LocalDate.now())
-        );
-        Collection<ExecutionFond> result = executionFondImdg.getCollectionObjectsByPredicate(prdct)
-                .stream()
-                .filter(eFond -> Objects.nonNull(eFond.getSessionId()))
-                .filter(eFond -> {
-                    if (sessionId.equals(eFond.getSessionId())) return true;
-                    Session session = sessionImdg.getSingleObjectByID(eFond.getSessionId());
-                    return sessionType.equalsByKey(session.getSessionType());
-                })
-                .toList();
         log.trace("found {} ExecutionFond by sessionId={}", result.size(), sessionId);
         return result;
     }
 
     protected Collection<ExecutionDeposit> findExecutionDepositBySessionId(Long sessionId) {
-        ImdgPredicateBuilder pb = executionDepositImdg.predicateBuilder();
+        Collection<ExecutionDeposit> result = executionDepositImdg.getCollectionObjectsByFieldValues(Map.of("sessionId", sessionId));
-        ImdgPredicate prdct = pb.or(
+        log.trace("found {} ExecutionDeposit by sessionId={}", result.size(), sessionId);
-                pb.equals("sessionId", sessionId),
-                pb.equals("firstLegSettlementDate", LocalDate.now())
-        );
-        Collection<ExecutionDeposit> result = executionDepositImdg.getCollectionObjectsByPredicate(prdct);
-        log.trace("found {} ExecutionDeposit by {}", result.size(), prdct);
         return result;
     }