treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-293 meta 4: доделал опечатку в TradingClearingRegistry

Browse source
This commit is contained in:
AKurakin 2023-05-12 12:23:25 +03:00
parent e13968a148
commit 39b476b917
10 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini
tradingClearingRegistry.setId(id); tradingClearingRegistry.setId(id);
tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setCompanyId(req.getCompanyId());
tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
Account depoAccountMain = depoAccount != null ? accountImdg.getSingleObjectByID(depoAccount.getAccountId()) : 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.setId(id);
tradingClearingRegistry.setCompanyId(req.getCompanyId()); tradingClearingRegistry.setCompanyId(req.getCompanyId());
tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId()); tradingClearingRegistry.setMoneyAccountId(req.getMoneyAccountId());
tradingClearingRegistry.setDepoAaccountId(req.getDepoAccountId()); tradingClearingRegistry.setDepoAccountId(req.getDepoAccountId());
DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null; DepoAccount depoAccount = req.getDepoAccountId() != null ? depoAccountImdg.getSingleObjectByID(req.getDepoAccountId()) : null;
ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId()); ClearingAccount clearingAccount = clearingAccountImdg.getSingleObjectByID(req.getMoneyAccountId());

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

@ -228,7 +228,7 @@ class TradingClearingRegistryServiceTest {
predictableTradingClearingRegistry.setCompanyId(companyId); predictableTradingClearingRegistry.setCompanyId(companyId);
predictableTradingClearingRegistry.setCode("0077CDAT"); predictableTradingClearingRegistry.setCode("0077CDAT");
predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId); predictableTradingClearingRegistry.setMoneyAccountId(clearingAccountId);
predictableTradingClearingRegistry.setDepoAaccountId(depoAccountId); predictableTradingClearingRegistry.setDepoAccountId(depoAccountId);
predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT"); predictableTradingClearingRegistry.setTradingClearingRegistryType("DAT");
predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.C.getKey()); predictableTradingClearingRegistry.setTradingClearingRegistryPurpose(TradingClearingRegistryPurpose.C.getKey());
predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey()); predictableTradingClearingRegistry.setStatus(ServiceStatus.Active.getKey());

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetById.java
View file

@ -34,7 +34,7 @@ public class TradingClearingRegistryBackendGetById extends BasicSpcexResponse {
payload.setCompanyId(tcr.getCompanyId()); payload.setCompanyId(tcr.getCompanyId());
payload.setCode(tcr.getCode()); payload.setCode(tcr.getCode());
payload.setMoneyAccountId(tcr.getMoneyAccountId()); payload.setMoneyAccountId(tcr.getMoneyAccountId());
payload.setDepoAaccountId(tcr.getDepoAaccountId()); payload.setDepoAccountId(tcr.getDepoAccountId());
payload.setTradingClearingRegistryType(tcr.getTradingClearingRegistryType()); payload.setTradingClearingRegistryType(tcr.getTradingClearingRegistryType());
payload.setTradingClearingRegistryLevel(tcr.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryLevel(tcr.getTradingClearingRegistryLevel());
payload.setTradingClearingRegistryPurpose(tcr.getTradingClearingRegistryPurpose()); payload.setTradingClearingRegistryPurpose(tcr.getTradingClearingRegistryPurpose());

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/registry/TradingClearingRegistryBackendGetFields.java
View file

@ -22,7 +22,7 @@ public class TradingClearingRegistryBackendGetFields {
private Long moneyAccountId; private Long moneyAccountId;
@JsonProperty @JsonProperty
@ApiModelProperty(value = "Идентификатор депозитарного счета", example = "") @ApiModelProperty(value = "Идентификатор депозитарного счета", example = "")
private Long depoAaccountId; private Long depoAccountId;
@JsonProperty @JsonProperty
@ApiModelProperty(value = "Код торгово-клирингового регистра", example = "") @ApiModelProperty(value = "Код торгово-клирингового регистра", example = "")
private String tradingClearingRegistryType; private String tradingClearingRegistryType;
@ -77,12 +77,12 @@ public class TradingClearingRegistryBackendGetFields {
this.moneyAccountId = moneyAccountId; this.moneyAccountId = moneyAccountId;
} }
public Long getDepoAaccountId() { public Long getDepoAccountId() {
return depoAaccountId; return depoAccountId;
} }
public void setDepoAaccountId(Long depoAaccountId) { public void setDepoAccountId(Long depoAaccountId) {
this.depoAaccountId = depoAaccountId; this.depoAccountId = depoAaccountId;
} }
public String getTradingClearingRegistryType() { public String getTradingClearingRegistryType() {

6
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/registry/TradingClearingRegistryControllerTest.java
View file

@ -113,7 +113,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCompanyId(365L);
existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setCode("99999");
existTradingClearingRegistry.setMoneyAccountId(404L); existTradingClearingRegistry.setMoneyAccountId(404L);
existTradingClearingRegistry.setDepoAaccountId(512L); existTradingClearingRegistry.setDepoAccountId(512L);
existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryType("RUB");
existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA");
existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484");
@ -129,7 +129,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
payload.setCompanyId(existTradingClearingRegistry.getCompanyId()); payload.setCompanyId(existTradingClearingRegistry.getCompanyId());
payload.setCode(existTradingClearingRegistry.getCode()); payload.setCode(existTradingClearingRegistry.getCode());
payload.setMoneyAccountId(existTradingClearingRegistry.getMoneyAccountId()); payload.setMoneyAccountId(existTradingClearingRegistry.getMoneyAccountId());
payload.setDepoAaccountId(existTradingClearingRegistry.getDepoAaccountId()); payload.setDepoAccountId(existTradingClearingRegistry.getDepoAccountId());
payload.setTradingClearingRegistryType(existTradingClearingRegistry.getTradingClearingRegistryType()); payload.setTradingClearingRegistryType(existTradingClearingRegistry.getTradingClearingRegistryType());
payload.setTradingClearingRegistryLevel(existTradingClearingRegistry.getTradingClearingRegistryLevel()); payload.setTradingClearingRegistryLevel(existTradingClearingRegistry.getTradingClearingRegistryLevel());
payload.setTradingClearingRegistryPurpose(existTradingClearingRegistry.getTradingClearingRegistryPurpose()); payload.setTradingClearingRegistryPurpose(existTradingClearingRegistry.getTradingClearingRegistryPurpose());
@ -160,7 +160,7 @@ class TradingClearingRegistryControllerTest extends AbstractControllerTest {
existTradingClearingRegistry.setCompanyId(365L); existTradingClearingRegistry.setCompanyId(365L);
existTradingClearingRegistry.setCode("99999"); existTradingClearingRegistry.setCode("99999");
existTradingClearingRegistry.setMoneyAccountId(404L); existTradingClearingRegistry.setMoneyAccountId(404L);
existTradingClearingRegistry.setDepoAaccountId(512L); existTradingClearingRegistry.setDepoAccountId(512L);
existTradingClearingRegistry.setTradingClearingRegistryType("RUB"); existTradingClearingRegistry.setTradingClearingRegistryType("RUB");
existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA"); existTradingClearingRegistry.setTradingClearingRegistryLevel("OOO ROGA I KOPITA");
existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484"); existTradingClearingRegistry.setTradingClearingRegistryPurpose("848484848484");

11
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/TradingClearingRegistry.java
View file

@ -15,8 +15,7 @@ public class TradingClearingRegistry extends BusinessObject {
private Long companyId; private Long companyId;
private String code; private String code;
private Long moneyAccountId; private Long moneyAccountId;
// todo fix typo private Long depoAccountId;
private Long depoAaccountId;
private String tradingClearingRegistryType; private String tradingClearingRegistryType;
private String tradingClearingRegistryLevel; private String tradingClearingRegistryLevel;
private String tradingClearingRegistryPurpose; private String tradingClearingRegistryPurpose;
@ -46,12 +45,12 @@ public class TradingClearingRegistry extends BusinessObject {
this.moneyAccountId = value; this.moneyAccountId = value;
} }
public Long getDepoAaccountId() { public Long getDepoAccountId() {
return depoAaccountId; return depoAccountId;
} }
public void setDepoAaccountId(Long value) { public void setDepoAccountId(Long value) {
this.depoAaccountId = value; this.depoAccountId = value;
} }
public String getTradingClearingRegistryType() { public String getTradingClearingRegistryType() {

2
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/ClientCodeService.java
View file

@ -260,7 +260,7 @@ public class ClientCodeService extends QueueConsumer implements InitializingBean
query.put("moneyAccountId", moneyAccountId); query.put("moneyAccountId", moneyAccountId);
query.put("tradingClearingRegistryType", TradingClearingRegistryType.Client_B.getKey()); query.put("tradingClearingRegistryType", TradingClearingRegistryType.Client_B.getKey());
if (depoAccountId != null) { if (depoAccountId != null) {
query.put("depoAaccountId", depoAccountId); // todo опечатка в поле класса, см. meta.xml! query.put("depoAccountId", depoAccountId);
} }
TradingClearingRegistry result = tradingClearingRegistryMap.getSingleObjectByFieldValues(query); TradingClearingRegistry result = tradingClearingRegistryMap.getSingleObjectByFieldValues(query);
log.trace("TradingClearingRegistry by: {}; {}found", query, result == null ? "not " : ""); log.trace("TradingClearingRegistry by: {}; {}found", query, result == null ? "not " : "");

2
clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClientCodeServiceTest.java
View file

@ -114,7 +114,7 @@ class ClientCodeServiceTest {
registry1.setCompanyId(COMPANY_ID); registry1.setCompanyId(COMPANY_ID);
registry1.setCode("code-120-101"); registry1.setCode("code-120-101");
registry1.setMoneyAccountId(131L); registry1.setMoneyAccountId(131L);
registry1.setDepoAaccountId(132L); registry1.setDepoAccountId(132L);
registry1.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey()); registry1.setTradingClearingRegistryType(TradingClearingRegistryType.Client_B.getKey());
registry1.setStatus(WorkflowStatus.Active.getKey()); registry1.setStatus(WorkflowStatus.Active.getKey());
tcrImdg.insert(registry1); tcrImdg.insert(registry1);

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/TradingClearingRegistryHistoryMapStore.java
View file

@ -28,7 +28,7 @@ public class TradingClearingRegistryHistoryMapStore extends TemplateEventMapStor
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{"ID","EVENT_TIME", "EVENT_USER_ID", "EVENT_TYPE", 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.getCompanyId(),
object.getCode(), object.getCode(),
object.getMoneyAccountId(), object.getMoneyAccountId(),
object.getDepoAaccountId(), object.getDepoAccountId(),
object.getTradingClearingRegistryType(), object.getTradingClearingRegistryType(),
object.getTradingClearingRegistryLevel(), object.getTradingClearingRegistryLevel(),
object.getTradingClearingRegistryPurpose(), object.getTradingClearingRegistryPurpose(),

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingClearingRegistryMapStore.java
View file

@ -30,7 +30,7 @@ public class TradingClearingRegistryMapStore extends TemplateMapStore<TradingCle
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{ return new String[]{
"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" "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"
}; };
} }
@ -41,7 +41,7 @@ public class TradingClearingRegistryMapStore extends TemplateMapStore<TradingCle
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setCode(resultSet.getObject("CODE", String.class)); object.setCode(resultSet.getObject("CODE", String.class));
object.setMoneyAccountId(resultSet.getObject("MONEY_ACCOUNT_ID", Long.class)); object.setMoneyAccountId(resultSet.getObject("MONEY_ACCOUNT_ID", Long.class));
object.setDepoAaccountId(resultSet.getObject("DEPO_AACCOUNT_ID", Long.class)); object.setDepoAccountId(resultSet.getObject("DEPO_ACCOUNT_ID", Long.class));
object.setTradingClearingRegistryType(resultSet.getObject("TRADING_CLEARING_REGISTRY_TYPE", String.class)); object.setTradingClearingRegistryType(resultSet.getObject("TRADING_CLEARING_REGISTRY_TYPE", String.class));
object.setTradingClearingRegistryLevel(resultSet.getObject("TRADING_CLEARING_REGISTRY_LEVEL", String.class)); object.setTradingClearingRegistryLevel(resultSet.getObject("TRADING_CLEARING_REGISTRY_LEVEL", String.class));
object.setTradingClearingRegistryPurpose(resultSet.getObject("TRADING_CLEARING_REGISTRY_PURPOSE", String.class)); object.setTradingClearingRegistryPurpose(resultSet.getObject("TRADING_CLEARING_REGISTRY_PURPOSE", String.class));
@ -58,7 +58,7 @@ public class TradingClearingRegistryMapStore extends TemplateMapStore<TradingCle
object.getCompanyId(), object.getCompanyId(),
object.getCode(), object.getCode(),
object.getMoneyAccountId(), object.getMoneyAccountId(),
object.getDepoAaccountId(), object.getDepoAccountId(),
object.getTradingClearingRegistryType(), object.getTradingClearingRegistryType(),
object.getTradingClearingRegistryLevel(), object.getTradingClearingRegistryLevel(),
object.getTradingClearingRegistryPurpose(), object.getTradingClearingRegistryPurpose(),