http://jira.mfd.msk:8088/browse/CLS-131

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/AccountBackendGetAll.java

@@ -45,7 +45,7 @@ public class AccountBackendGetAll extends BasicSpcexResponse {
             singleItem.setAccount(account.getAccount());
             singleItem.setAccountType(account.getAccountType());
             singleItem.setRelationId(account.getRelationId());
-            singleItem.setStatus(account.getStatus());
+            singleItem.setStatus(account.getAccountStatus());
             singleItem.setProcessingSign(account.getProcessingSign());
             singleItem.setCreated(account.getCreated());
             singleItem.setUpdated(account.getUpdated());

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetAll.java

@@ -57,7 +57,6 @@ public class BankAccountBackendGetAll extends BasicSpcexResponse {
             singleItem.setSwiftCode(bankAccount.getSwiftCode());
             singleItem.setTaxpayerIdentificationNumber(bankAccount.getTaxpayerIdentificationNumber());
             singleItem.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode());
-            singleItem.setAccount(bankAccount.getAccount());
             payload.getItems().add(singleItem);
         }
     }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetById.java

@@ -42,7 +42,6 @@ public class BankAccountBackendGetById extends BasicSpcexResponse {
         payload.setSwiftCode(bankAccount.getSwiftCode());
         payload.setTaxpayerIdentificationNumber(bankAccount.getTaxpayerIdentificationNumber());
         payload.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode());
-        payload.setAccount(bankAccount.getAccount());
     }
 
 }

clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java

@@ -138,7 +138,7 @@ public class StatementService extends QueueConsumer implements InitializingBean
                 statement.setErrorText(errorResolver.resolve(accountResult.getError()));
             } else {
                 accountBalanceImdg.insert(accountResult.getAccount()); //insert == update?
-                statement.setStatus(OperationStatus.Executed.getKey());
+                statement.setOperationStatus(OperationStatus.Executed.getKey());
             }
             statementImdg.update(statement);
 
@@ -165,7 +165,7 @@ public class StatementService extends QueueConsumer implements InitializingBean
         statement.setSettlementDate(TimeUtil.localDateToInstant(LocalDate.parse(sdf01.getDat(), datFormatter)));
         statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder()));
         statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
-        statement.setStatus(OperationStatus.Pending.getKey());
+        statement.setOperationStatus(OperationStatus.Pending.getKey());
         statement.setInSDfId(sdf01.getId());
         statement.setInOutSDfType(InOutSDfType.type1.getKey());
         statementImdg.insert(statement);

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

@@ -39,7 +39,7 @@ public enum AccountBalanceValidationRule implements IValidationRule<ImdgValidati
             if (account == null) {
                 return of(BalanceError.AccountNotPresent);
             }
-            if (!Status.Active.equalsByKey(account.getStatus())) {
+            if (!Status.Active.equalsByKey(account.getAccountStatus())) {
                 return of(BalanceError.AccountNotActive, account.getId());
             }
             context.storeObject(ValidationStored.Account, account);

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

@@ -14,7 +14,7 @@ public class Account extends BusinessObject {
     private String account;
     private String accountType;
     private Long relationId;
-    private String status;
+    private String accountStatus;
     private String processingSign;
 
     public String getAccount() {
@@ -41,12 +41,12 @@ public class Account extends BusinessObject {
         this.relationId = value;
     }
 
-    public String getStatus() {
-        return status;
+    public String getAccountStatus() {
+        return accountStatus;
     }
 
-    public void setStatus(String value) {
-        this.status = value;
+    public void setAccountStatus(String value) {
+        this.accountStatus = value;
     }
 
     public String getProcessingSign() {

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java

@@ -25,7 +25,7 @@ public class Statement extends BusinessObject {
     private Instant settlementDate;
     private BigDecimal amount;
     private String cashMovementCurrencyCode;
-    private String status;
+    private String operationStatus;
     private String errorCode;
     private String errorText;
     private Long inSDfId;
@@ -120,12 +120,12 @@ public class Statement extends BusinessObject {
         this.cashMovementCurrencyCode = value;
     }
 
-    public String getStatus() {
-        return status;
+    public String getOperationStatus() {
+        return operationStatus;
     }
 
-    public void setStatus(String value) {
-        this.status = value;
+    public void setOperationStatus(String value) {
+        this.operationStatus = value;
     }
 
     public String getErrorCode() {

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/AccountHistoryMapStore.java

@@ -46,7 +46,7 @@ public class AccountHistoryMapStore extends TemplateEventMapStore<AccountHistory
                 object.getAccount(),
                 object.getAccountType(),
                 object.getRelationId(),
-                object.getStatus(),
+                object.getAccountStatus(),
                 object.getProcessingSign()
         };
         return args;

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java

@@ -27,7 +27,7 @@ public class BankAccountHistoryMapStore extends TemplateEventMapStore<BankAccoun
     @Override
     public String[] getFields() {
         return new String[]{"ID", "EVENT_TIME", "EVENT_USER_ID",
-                "BANK_ACCOUNT_ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE", "ACCOUNT"
+                "BANK_ACCOUNT_ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE"
         };
     }
 
@@ -51,8 +51,7 @@ public class BankAccountHistoryMapStore extends TemplateEventMapStore<BankAccoun
                 object.getInternationalTransferSign(),
                 object.getSwiftCode(),
                 object.getTaxpayerIdentificationNumber(),
-                object.getTaxRegistrationReasonCode(),
-                object.getAccount()
+                object.getTaxRegistrationReasonCode()
         };
         return args;
     }

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/AccountMapStore.java

@@ -43,7 +43,7 @@ public class AccountMapStore extends TemplateMapStore<Account> {
         object.setAccount(resultSet.getObject("ACCOUNT", String.class));
         object.setAccountType(resultSet.getObject("ACCOUNT_TYPE", String.class));
         object.setRelationId(resultSet.getObject("RELATION_ID", Long.class));
-        object.setStatus(resultSet.getObject("STATUS", String.class));
+        object.setAccountStatus(resultSet.getObject("STATUS", String.class));
         object.setProcessingSign(resultSet.getObject("PROCESSING_SIGN", String.class));
         return object;
     }
@@ -57,7 +57,7 @@ public class AccountMapStore extends TemplateMapStore<Account> {
                 object.getAccount(),
                 object.getAccountType(),
                 object.getRelationId(),
-                object.getStatus(),
+                object.getAccountStatus(),
                 object.getProcessingSign()
         };
         return args;

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java

@@ -52,7 +52,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
         object.setSettlementDate(getInstantFromTimestamp(resultSet, "SETTLEMENT_DATE"));
         object.setAmount(resultSet.getObject("AMOUNT", BigDecimal.class));
         object.setCashMovementCurrencyCode(resultSet.getObject("CASH_MOVEMENT_CURRENCY_CODE", String.class));
-        object.setStatus(resultSet.getObject("STATUS", String.class));
+        object.setOperationStatus(resultSet.getObject("STATUS", String.class));
         object.setErrorCode(resultSet.getObject("ERROR_CODE", String.class));
         object.setErrorText(resultSet.getObject("ERROR_TEXT", String.class));
         object.setInSDfId(resultSet.getObject("IN_S_DF_ID", Long.class));
@@ -78,7 +78,7 @@ public class StatementMapStore extends TemplateMapStore<Statement> {
                 TimeUtil.toDateFromInstant(object.getSettlementDate()),
                 object.getAmount(),
                 object.getCashMovementCurrencyCode(),
-                object.getStatus(),
+                object.getOperationStatus(),
                 object.getErrorCode(),
                 object.getErrorText(),
                 object.getInSDfId(),

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/BankAccountMapStore.java

@@ -29,7 +29,7 @@ public class BankAccountMapStore extends TemplateMapStore<BankAccount> {
     @Override
     public String[] getFields() {
         return new String[]{
-                "ID",  "ACCOUNT_ID",  "BANK_IDENTIFICATION_CODE",  "BANK_NAME",  "CORRESPONDENT_ACCOUNT",  "CORRESPONDENT_ACCOUNT_NAME",  "CURRENCY",  "DESTINATION",  "IBAN",  "INTERNATIONAL_TRANSFER_SIGN",  "SWIFT_CODE",  "TAXPAYER_IDENTIFICATION_NUMBER",  "TAX_REGISTRATION_REASON_CODE",  "ACCOUNT"
+                "ID",  "ACCOUNT_ID",  "BANK_IDENTIFICATION_CODE",  "BANK_NAME",  "CORRESPONDENT_ACCOUNT",  "CORRESPONDENT_ACCOUNT_NAME",  "CURRENCY",  "DESTINATION",  "IBAN",  "INTERNATIONAL_TRANSFER_SIGN",  "SWIFT_CODE",  "TAXPAYER_IDENTIFICATION_NUMBER",  "TAX_REGISTRATION_REASON_CODE"
         };
     }
 
@@ -49,7 +49,6 @@ public class BankAccountMapStore extends TemplateMapStore<BankAccount> {
         object.setSwiftCode(resultSet.getObject("SWIFT_CODE", String.class));
         object.setTaxpayerIdentificationNumber(resultSet.getObject("TAXPAYER_IDENTIFICATION_NUMBER", String.class));
         object.setTaxRegistrationReasonCode(resultSet.getObject("TAX_REGISTRATION_REASON_CODE", String.class));
-        object.setAccount(resultSet.getObject("ACCOUNT", String.class));
         return object;
     }
 
@@ -68,8 +67,7 @@ public class BankAccountMapStore extends TemplateMapStore<BankAccount> {
                 object.getInternationalTransferSign(),
                 object.getSwiftCode(),
                 object.getTaxpayerIdentificationNumber(),
-                object.getTaxRegistrationReasonCode(),
-                object.getAccount()
+                object.getTaxRegistrationReasonCode()
         };
         return args;
     }

clearing-parent/securities-service/src/main/resources/application.properties

@@ -5,9 +5,9 @@ securities-service.hazelcast.login=dev
 securities-service.hazelcast.password=dev-pass
 
 securities-service.kafka.bootstrap-servers=localhost:9092
-securities-service.kafka.group-id=dev-group
+securities-service.kafka.group-id=dev-group-moneyMarketSecurity
 securities-service.kafka.enable-auto-commit=false
-securities-service.kafka.session-timeout-ms=30000
+securities-service.kafka.session-timeout-ms=300000
 securities-service.kafka.auto-offset-reset=latest
 securities-service.kafka.linger-ms=1
 securities-service.kafka.buffer-memory=33554432