diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index 479db94a1..2d2ab5c80 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -130,7 +130,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini tradingClearingRegistry.setId(id); tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); - tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); + tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId()); DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; Account depoAccountMain = depoAccount != null ? accountImdg.getSingleObjectByID(depoAccount.getAccountId()) : null; @@ -277,7 +277,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini tradingClearingRegistry.setId(id); tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); - tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); + tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId()); DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId()); diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java index 8dfb3495e..2961ebb7f 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/TradingClearingRegistryServiceTest.java @@ -228,7 +228,7 @@ class TradingClearingRegistryServiceTest { predictableTradingClearingRegistry.setCompanyId(companyId); predictableTradingClearingRegistry.setCode("0077CDAT"); predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId); - predictableTradingClearingRegistry.setDepoAaccountId(depoAccountId); + predictableTradingClearingRegistry.setDepoAccountId(depoAccountId); predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT"); predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.C.getKey()); predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java index 27feabab4..d734efa4e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java @@ -34,7 +34,7 @@ public class TradingClearingRegistryBackendGetById extends BasicSpcexResponse { payload.setCompanyId(tcr.getCompanyId()); payload.setCode(tcr.getCode()); payload.setMoneyAccountId(tcr.getMoneyAccountId()); - payload.setDepoAaccountId(tcr.getDepoAaccountId()); + payload.setDepoAccountId(tcr.getDepoAccountId()); payload.setTradingClearingRegistryType(tcr.getTradingClearingRegistryType()); payload.setTradingClearingRegistryLevel(tcr.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryPurpose(tcr.getTradingClearingRegistryPurpose()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java index d4822d731..b83d03219 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java @@ -22,7 +22,7 @@ public class TradingClearingRegistryBackendGetFields { private Long moneyAccountId; @JsonProperty @ApiModelProperty(value = "Идентификатор депозитарного счета", example = "") - private Long depoAaccountId; + private Long depoAccountId; @JsonProperty @ApiModelProperty(value = "Код торгово-клирингового регистра", example = "") private String tradingClearingRegistryType; @@ -77,12 +77,12 @@ public class TradingClearingRegistryBackendGetFields { this.moneyAccountId = moneyAccountId; } - public Long getDepoAaccountId() { - return depoAaccountId; + public Long getDepoAccountId() { + return depoAccountId; } - public void setDepoAaccountId(Long depoAaccountId) { - this.depoAaccountId = depoAaccountId; + public void setDepoAccountId(Long depoAaccountId) { + this.depoAccountId = depoAaccountId; } public String getTradingClearingRegistryType() { diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java index be9151b6b..959b5ae21 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java @@ -113,7 +113,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setMoneyAccountId(404L); - existTradingClearingRegistry.setDepoAaccountId(512L); + existTradingClearingRegistry.setDepoAccountId(512L); existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); @@ -129,7 +129,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { payload.setCompanyId(existTradingClearingRegistry.getCompanyId()); payload.setCode(existTradingClearingRegistry.getCode()); payload.setMoneyAccountId(existTradingClearingRegistry.getMoneyAccountId()); - payload.setDepoAaccountId(existTradingClearingRegistry.getDepoAaccountId()); + payload.setDepoAccountId(existTradingClearingRegistry.getDepoAccountId()); payload.setTradingClearingRegistryType(existTradingClearingRegistry.getTradingClearingRegistryType()); payload.setTradingClearingRegistryLevel(existTradingClearingRegistry.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryPurpose(existTradingClearingRegistry.getTradingClearingRegistryPurpose()); @@ -160,7 +160,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest { existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setMoneyAccountId(404L); - existTradingClearingRegistry.setDepoAaccountId(512L); + existTradingClearingRegistry.setDepoAccountId(512L); existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java index 91bb3ca6f..41ebf3d12 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java @@ -15,8 +15,7 @@ public class TradingClearingRegistry extends BusinessObject { private Long companyId; private String code; private Long moneyAccountId; - // todo fix typo - private Long depoAaccountId; + private Long depoAccountId; private String tradingClearingRegistryType; private String tradingClearingRegistryLevel; private String tradingClearingRegistryPurpose; @@ -46,12 +45,12 @@ public class TradingClearingRegistry extends BusinessObject { this.moneyAccountId = value; } - public Long getDepoAaccountId() { - return depoAaccountId; + public Long getDepoAccountId() { + return depoAccountId; } - public void setDepoAaccountId(Long value) { - this.depoAaccountId = value; + public void setDepoAccountId(Long value) { + this.depoAccountId = value; } public String getTradingClearingRegistryType() { diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java index 183e6da6d..030a8195d 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java @@ -260,7 +260,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean query.put("moneyAccountId", moneyAccountId); query.put("tradingClearingRegistryType", TradingClearingRegistryType.Client_B.getKey()); if (depoAccountId != null) { - query.put("depoAaccountId", depoAccountId); // todo опечатка в поле класса, см. meta.xml! + query.put("depoAccountId", depoAccountId); } TradingClearingRegistry result = tradingClearingRegistryMap.getSingleObjectByFieldValues(query); log.trace("TradingClearingRegistry by: {}; {}found", query, result == null ? "not " : ""); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java index 2599a0ec9..d4246da92 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java @@ -114,7 +114,7 @@ class ClientCodeServiceTest { registry1.setCompanyId(COMPANY_ID); registry1.setCode("code-120-101"); registry1.setMoneyAccountId(131L); - registry1.setDepoAaccountId(132L); + registry1.setDepoAccountId(132L); registry1.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey()); registry1.setStatus(WorkflowStatus.Active.getKey()); tcrImdg.insert(registry1); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java index 5f9abd315..990116db2 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java @@ -28,7 +28,7 @@ public class TradingClearingRegistryHistoryMapStore extends TemplateEventMapStor @Override public String[] getFields() { return new String[]{"ID","EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", - "TRADING_CLEARING_REGISTRY_ID", "COMPANY_ID", "CODE", "MONEY_ACCOUNT_ID", "DEPO_AACCOUNT_ID", "TRADING_CLEARING_REGISTRY_TYPE", "TRADING_CLEARING_REGISTRY_LEVEL", "TRADING_CLEARING_REGISTRY_PURPOSE", "STATUS", "CREATED_AT", "UPDATED_AT" + "TRADING_CLEARING_REGISTRY_ID", "COMPANY_ID", "CODE", "MONEY_ACCOUNT_ID", "DEPO_ACCOUNT_ID", "TRADING_CLEARING_REGISTRY_TYPE", "TRADING_CLEARING_REGISTRY_LEVEL", "TRADING_CLEARING_REGISTRY_PURPOSE", "STATUS", "CREATED_AT", "UPDATED_AT" }; } @@ -45,7 +45,7 @@ public class TradingClearingRegistryHistoryMapStore extends TemplateEventMapStor object.getCompanyId(), object.getCode(), object.getMoneyAccountId(), - object.getDepoAaccountId(), + object.getDepoAccountId(), object.getTradingClearingRegistryType(), object.getTradingClearingRegistryLevel(), object.getTradingClearingRegistryPurpose(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java index ad13a8dc1..9c19249f5 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java @@ -30,7 +30,7 @@ public class TradingClearingRegistryMapStore extends TemplateMapStore