http://jira.mfd.msk:8088/browse/CLS-684 // http://jira.mfd.msk:8088/browse/CLS-685

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

@@ -1,5 +1,13 @@
 package ru.spcex.clearing.account.service;
 
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.function.Function;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerRecord;
@@ -11,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import ru.clearing.classes.statics.data.account.Account;
 import ru.clearing.classes.statics.data.account.ClientCode;
+import ru.clearing.classes.statics.data.company.CompanySymbols;
 import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
 import ru.spcex.clearing.account.errors.AccountError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -20,7 +31,10 @@ 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.account.TkrAccount;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccountsGatewayRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.gateway.MoneyAccountMsg;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryListNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryListUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
@@ -32,6 +46,9 @@ import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.util.services.RequestHelper;
 import ru.spcex.clearing.validation.common.ValidationHelper;
+import ru.spcex.platform.enumeration.AccountType;
+import ru.spcex.platform.enumeration.CompanySymbol;
+import ru.spcex.platform.enumeration.CurrencyCode;
 import ru.spcex.platform.enumeration.TradingClearingRegistryType;
 import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
@@ -42,15 +59,6 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver;
 import ru.spcex.platform.utils.log.ExceptionUtils;
 import ru.spcex.platform.utils.validation.IValidator;
 
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.function.Function;
-
 @Service
 public class ClientCodeService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -59,8 +67,8 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
     private final ImdgProvider imdgProvider;
     private final Imdg<ClientCode> clientCodeMap;
     private final Imdg<TradingClearingRegistry> tradingClearingRegistryMap;
-
+    private final Imdg<CompanySymbols> companySymbolsImdg;
-
+    private final Imdg<Account> accountImdg;
     private final Function<ClientCodeNewRequest, IValidator> clientCodeNewRequestValidator;
     private final Function<ClientCodeUpdateRequest, IValidator> clientCodeUpdateRequestValidator;
     private final Function<CommonDeleteRequest, IValidator> clientCodeDeleteRequestValidator;
@@ -92,6 +100,8 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         this.idGenerator = imdgProvider.getImdgIdGenerator();
         this.clientCodeMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClientCode, ClientCode.class);
         this.tradingClearingRegistryMap = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
+        this.companySymbolsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
+        this.accountImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Account, Account.class);
         this.clientCodeNewRequestValidator = clientCodeNewRequestValidator;
         this.clientCodeUpdateRequestValidator = clientCodeUpdateRequestValidator;
         this.clientCodeDeleteRequestValidator = clientCodeDeleteRequestValidator;
@@ -110,6 +120,9 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         callback(ClientCodeNewRequest.class)
             .setFunction(this::clientCodeNew)
             .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW, callbacks::put);
+        callback(TkrAccountsGatewayRequest.class)
+            .setFunction(this::clientCodeNewFromGateway)
+            .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW_FROM_GATEWAY, callbacks::put);
         callback(ClientCodeNewRequest.class)
             .setFunction(this::clientCodeNewFromApiUmCompany)
             .forDestination(Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, callbacks::put);
@@ -157,6 +170,55 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
         return clientCodeNew0(userRequest, false);
     }
 
+    protected RequestInfoUpdate clientCodeNewFromGateway(BaseRequest<TkrAccountsGatewayRequest> tkrRequest) {
+        TkrAccountsGatewayRequest tkr = tkrRequest.getRequestPayload();
+        for (TkrAccount tkrAccount : tkr.getAccounts()) {
+            ClientCodeNewRequest clientCodeNewRequest = new ClientCodeNewRequest();
+            clientCodeNewRequest.setCode(tkrAccount.getClientCode());
+            if (tkrAccount.getCompanyId() != null) {
+                CompanySymbols companySymbols = companySymbolsImdg.getFirstObjectByFieldValues(
+                    Map.of(
+                        "companySymbol", CompanySymbol.UUID.getKey(),
+                        "companySymbolValue", tkrAccount.getCompanyId()
+                    )
+                );
+                if (companySymbols != null) {
+                    clientCodeNewRequest.setCompanyId(companySymbols.getCompanyId());
+                }
+            }
+            if (StringUtils.hasText(tkrAccount.getDepoAccount())) {
+                Account account = accountImdg.getFirstObjectByFieldValues(
+                    Map.of(
+                        "account", tkrAccount.getDepoAccount(),
+                        "accountType", AccountType.Depo.getKey()
+                    )
+                );
+                if (account != null) {
+                    clientCodeNewRequest.setDepoAccountId(account.getId());
+                }
+            }
+            for (MoneyAccountMsg moneyAccountMsg : tkrAccount.getMoneyAccounts()) {
+                if (moneyAccountMsg.getCurrCode().equals(CurrencyCode.RUB.getKey())) {
+                    Account account = accountImdg.getFirstObjectByFieldValues(
+                        Map.of(
+                            "account", moneyAccountMsg.getAccount()
+                        )
+                    );
+                    if (account != null) {
+                        clientCodeNewRequest.setMoneyAccountId(account.getId());
+                    }
+                }
+            }
+            BaseRequest<ClientCodeNewRequest> request = new BaseRequest<>();
+            request.setRequestPayload(clientCodeNewRequest);
+            RequestInfoUpdate requestInfoUpdate = clientCodeNew0(request, false);
+            if (requestInfoUpdate != null) {
+                log.debug("processing result is: {}", requestInfoUpdate.getMessage());
+            }
+        }
+        return null;
+    }
+
     protected RequestInfoUpdate clientCodeNew0(BaseRequest<ClientCodeNewRequest> userRequest, boolean fromTCRList) {
         log.debug("ClientCodeNewRequest received {}", userRequest.getId());
 

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

@@ -31,7 +31,7 @@ import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccount;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccountsCheckRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccountsGatewayRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.clearing.CreateRegistryRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.gateway.MoneyAccountMsg;
@@ -139,7 +139,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         callback(CommonIdRequest.class)
             .setFunction(this::tradingClearingRegistryBlock)
             .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_BLOCK, callbacks::put);
-        callback(TkrAccountsCheckRequest.class)
+        callback(TkrAccountsGatewayRequest.class)
             .setFunction(this::tradingClearingRegistryCheck)
             .forDestination(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_CHECK, callbacks::put);
         init();
@@ -495,8 +495,8 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
         return null;
     }
 
-    public RequestInfoUpdate tradingClearingRegistryCheck(BaseRequest<TkrAccountsCheckRequest> gatewayRequest) {
+    public RequestInfoUpdate tradingClearingRegistryCheck(BaseRequest<TkrAccountsGatewayRequest> gatewayRequest) {
-        TkrAccountsCheckRequest req = gatewayRequest.getRequestPayload();
+        TkrAccountsGatewayRequest req = gatewayRequest.getRequestPayload();
         log.debug("TradingClearingRegistryCheckRequest received with requestId : {}", req.getRequestId());
         for (TkrAccount accountForCheck : req.getAccounts()) {
             log.debug("Checking TKR with code: {}", accountForCheck.getTkrCode());

clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java

@@ -7,7 +7,7 @@ import ru.spcex.clearing.gatewayapi.controller.inbound.request.tkr.request.TkrRe
 import ru.spcex.clearing.gatewayapi.service.adapter.TkrAdapter;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccount;
-import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccountsCheckRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.account.TkrAccountsGatewayRequest;
 import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
 
 @Service
@@ -22,14 +22,26 @@ public class TkrService {
     }
 
     public void processedTkrRequest(TkrRequest tkrRequest) {
-        List<TkrAccount> tkrAccounts = tkrRequest.getInfoAccount()
+        List<TkrAccount> tkrAccountsForCheck = tkrRequest.getInfoAccount()
             .stream().filter(infoAccount -> !StringUtils.hasText(infoAccount.getClientCode()))
             .map(tkrAdapter::toTkrResponse).toList();
-        if (!tkrAccounts.isEmpty()) {
+
-            TkrAccountsCheckRequest tkrAccountsCheckRequest = new TkrAccountsCheckRequest();
+        List<TkrAccount> tkrAccountsForNew = tkrRequest.getInfoAccount()
-            tkrAccountsCheckRequest.setRequestId(tkrRequest.getId());
+            .stream().filter(infoAccount -> !StringUtils.hasText(infoAccount.getTkrCode()))
-            tkrAccountsCheckRequest.setAccounts(tkrAccounts);
+            .map(tkrAdapter::toTkrResponse).toList();
-            kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_CHECK, tkrAccountsCheckRequest);
+
+        if (!tkrAccountsForCheck.isEmpty()) {
+            TkrAccountsGatewayRequest tkrAccountsRequest = new TkrAccountsGatewayRequest();
+            tkrAccountsRequest.setRequestId(tkrRequest.getId());
+            tkrAccountsRequest.setAccounts(tkrAccountsForCheck);
+            kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_CHECK, tkrAccountsRequest);
+        }
+
+        if (!tkrAccountsForNew.isEmpty()) {
+            TkrAccountsGatewayRequest tkrAccountsRequest = new TkrAccountsGatewayRequest();
+            tkrAccountsRequest.setRequestId(tkrRequest.getId());
+            tkrAccountsRequest.setAccounts(tkrAccountsForNew);
+            kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW_FROM_GATEWAY, tkrAccountsRequest);
         }
     }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java

@@ -101,6 +101,7 @@ public interface Consts {
     String DESTINATION_PROFILE_DOCUMENT_DELETE = "profile-document-delete";
 
     String DESTINATION_CLIENT_CODE_NEW = "client-code-new";
+    String DESTINATION_CLIENT_CODE_NEW_FROM_GATEWAY = "client-code-new-from-gateway";
     String DESTINATION_CLIENT_CODE_NEW_UM_COMPANY = "client-code-new-from-api-um-company";
     String DESTINATION_CLIENT_CODE_UPDATE = "client-code-update";
     String DESTINATION_CLIENT_CODE_DELETE = "client-code-delete";

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/ClientCodeNewRequest.java

@@ -1,8 +1,7 @@
 package ru.spcex.clearing.platform.messaging.domain.cud.account;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ClientCodeNewRequest {
     @JsonProperty

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/TkrAccountsGatewayRequest.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class TkrAccountsCheckRequest {
+public class TkrAccountsGatewayRequest {
     @JsonProperty
     private UUID requestId;
     @JsonProperty