From c6f0abfea33bec8393e7e8f8b9cdfd8c653adc76 Mon Sep 17 00:00:00 2001 From: aalehin Date: Wed, 10 May 2023 18:13:44 +0300 Subject: [PATCH 1/4] http://jira.mfd.msk:8088/browse/CLS-280 --- registry service done --- .../register/AdmittedLiabilitiesRegister.java | 117 ++++++ .../register/CoveredLiabilitiesRegister.java | 117 ++++++ .../data/register/DepoBalanceRegister.java | 81 +++++ .../DepoPaymentInstructionRegister.java | 99 +++++ .../register/ExcludeLiabilitiesRegister.java | 153 ++++++++ .../data/register/ExecutionRegister.java | 189 ++++++++++ .../data/register/LiabilitiesRegister.java | 155 ++++++++ .../data/register/MoneyBalanceRegister.java | 128 +++++++ .../MoneyPaymentInstructionRegister.java | 99 +++++ .../service/AdmittedDealRegisterService.java | 63 ---- .../AdmittedLiabilitiesRegisterService.java | 60 +++ .../service/BalanceRegisterService.java | 62 ---- .../ClearMemberRegisterChangeService.java | 51 --- .../service/ClearMemberRegisterService.java | 73 ---- .../service/ContractRegisterService.java | 63 ---- .../service/CoveredDealRegisterService.java | 63 ---- .../CoveredLiabilitiesRegisterService.java | 58 +++ .../service/DepoBalanceRegisterService.java | 58 +++ ...DepoPaymentInstructionRegisterService.java | 56 +++ .../ExcludeLiabilitiesRegisterService.java | 62 ++++ .../service/ExecutionRegisterService.java | 83 +++++ .../service/LiabilitiesRegisterService.java | 63 ++++ .../service/MoneyBalanceRegisterService.java | 61 ++++ ...oneyPaymentInstructionRegisterService.java | 56 +++ .../service/OrderRegisterService.java | 56 --- .../service/UncoveredDealRegisterService.java | 63 ---- .../AdmittedDealRegisterServiceTest.java | 118 ------ .../service/BalanceRegisterServiceTest.java | 113 ------ .../ClearMemberRegisterChangeServiceTest.java | 90 ----- .../ClearMemberRegisterServiceTest.java | 135 ------- .../service/ContractRegisterServiceTest.java | 112 ------ .../CoveredDealRegisterServiceTest.java | 116 ------ .../service/OrderRegisterServiceTest.java | 105 ------ .../UncoveredDealRegisterServiceTest.java | 118 ------ .../clearing/imdg/IMDGDistributedNames.java | 10 +- .../platform/messaging/domain/Consts.java | 15 +- ...AdmittedLiabilitiesRegisterNewRequest.java | 139 +++++++ .../ClearMemberRegisterChangeNewRequest.java | 44 --- .../ClearMemberRegisterNewRequest.java | 343 ------------------ .../registry/ContractRegisterNewRequest.java | 214 ----------- .../CoveredDealRegisterNewRequest.java | 225 ------------ .../CoveredLiabilitiesRegisterNewRequest.java | 139 +++++++ .../DepoBalanceRegisterNewRequest.java | 101 ++++++ ...oPaymentInstructionRegisterNewRequest.java | 117 ++++++ .../ExcludeLiabilitiesRegisterNewRequest.java | 184 ++++++++++ .../registry/ExecutionRegisterNewRequest.java | 223 ++++++++++++ .../ExecutionRegisterUpdateRequest.java | 65 ++++ .../LiabilitiesRegisterNewRequest.java | 183 ++++++++++ ...va => MoneyBalanceRegisterNewRequest.java} | 91 +---- ...PaymentInstructionRegisterNewRequest.java} | 60 +-- .../UncoveredDealRegisterNewRequest.java | 235 ------------ 51 files changed, 2897 insertions(+), 2587 deletions(-) create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java create mode 100644 clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/BalanceRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredDealRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java create mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/OrderRegisterService.java delete mode 100644 clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterService.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/BalanceRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/CoveredDealRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/OrderRegisterServiceTest.java delete mode 100644 clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterServiceTest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java delete mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterChangeNewRequest.java delete mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterNewRequest.java delete mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java delete mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredDealRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java create mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/{BalanceRegisterNewRequest.java => MoneyBalanceRegisterNewRequest.java} (64%) rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/{OrderRegisterNewRequest.java => MoneyPaymentInstructionRegisterNewRequest.java} (66%) delete mode 100644 platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/UncoveredDealRegisterNewRequest.java diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java new file mode 100644 index 000000000..f8979d606 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java @@ -0,0 +1,117 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class AdmittedLiabilitiesRegister extends BusinessObject { + private String companyFullName; + private Long sessionId; + private String securitySymbol; + private String securityFullName; + private Long companyId; + private String clearingCode; + private String account; + private BigDecimal amount; + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Instant clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java new file mode 100644 index 000000000..a5271f24a --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java @@ -0,0 +1,117 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class CoveredLiabilitiesRegister extends BusinessObject { + private String companyFullName; + private Long sessionId; + private String securitySymbol; + private String securityFullName; + private Long companyId; + private String clearingCode; + private String account; + private BigDecimal amount; + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Instant clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java new file mode 100644 index 000000000..f63943f3e --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java @@ -0,0 +1,81 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigInteger; +import java.time.Instant; + +public class DepoBalanceRegister extends BusinessObject { + private Long id; + private Instant createdAt; + private Instant updatedAt; + private String companyId; + private Long sessionId; + private String depoCode; + private String quantity; + private String securityCode; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getDepoCode() { + return depoCode; + } + + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getSecurityCode() { + return securityCode; + } + + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java new file mode 100644 index 000000000..702abfc21 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java @@ -0,0 +1,99 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class DepoPaymentInstructionRegister extends BusinessObject { + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Long companyId; + private String tradingClearingRegistryType; + private String tradingClearingRegistry; + private String cbCode; + private BigDecimal quantity; + private Long direction; + private Long sessionId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getTradingClearingRegistryType() { + return tradingClearingRegistryType; + } + + public void setTradingClearingRegistryType(String tradingClearingRegistryType) { + this.tradingClearingRegistryType = tradingClearingRegistryType; + } + + public String getTradingClearingRegistry() { + return tradingClearingRegistry; + } + + public void setTradingClearingRegistry(String tradingClearingRegistry) { + this.tradingClearingRegistry = tradingClearingRegistry; + } + + public String getCbCode() { + return cbCode; + } + + public void setCbCode(String cbCode) { + this.cbCode = cbCode; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getDirection() { + return direction; + } + + public void setDirection(Long direction) { + this.direction = direction; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java new file mode 100644 index 000000000..55b4c491e --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java @@ -0,0 +1,153 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExcludeLiabilitiesRegister extends BusinessObject { + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Long sessionId; + private Instant validFromDate; + private Instant validToDate; + private Long companyId; + private String companyFullName; + private String inn; + private String segment; + private String registryCode; + private String account; + private String registryStatus; + private String currency; + private BigDecimal sumLiabilities; + private Instant settlementDate; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Instant getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(Instant validFromDate) { + this.validFromDate = validFromDate; + } + + public Instant getValidToDate() { + return validToDate; + } + + public void setValidToDate(Instant validToDate) { + this.validToDate = validToDate; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant settlementDate) { + this.settlementDate = settlementDate; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java new file mode 100644 index 000000000..900a859d0 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java @@ -0,0 +1,189 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExecutionRegister extends BusinessObject { + private Instant tradingDate; + private Long exchangeExecutionId; + private Instant exchangeExecutionTime; + private Long securityId; + private Long seller; + private String sellerClearingCode; + private String sellerTradingClearingRegister; + private String sellerMoneyAccount; + private String sellerDepoAccount; + private Long buyer; + private String buyerClearingCode; + private String buyerTradingClearingRegister; + private String buyerMoneyAccount; + private String buyerDepoAccount; + private BigDecimal amount; + private BigDecimal quantity; + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Instant clearingDate; + + public Instant getTradingDate() { + return tradingDate; + } + + public void setTradingDate(Instant tradingDate) { + this.tradingDate = tradingDate; + } + + public Long getExchangeExecutionId() { + return exchangeExecutionId; + } + + public void setExchangeExecutionId(Long exchangeExecutionId) { + this.exchangeExecutionId = exchangeExecutionId; + } + + public Instant getExchangeExecutionTime() { + return exchangeExecutionTime; + } + + public void setExchangeExecutionTime(Instant exchangeExecutionTime) { + this.exchangeExecutionTime = exchangeExecutionTime; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public Long getSeller() { + return seller; + } + + public void setSeller(Long seller) { + this.seller = seller; + } + + public String getSellerClearingCode() { + return sellerClearingCode; + } + + public void setSellerClearingCode(String sellerClearingCode) { + this.sellerClearingCode = sellerClearingCode; + } + + public String getSellerTradingClearingRegister() { + return sellerTradingClearingRegister; + } + + public void setSellerTradingClearingRegister(String sellerTradingClearingRegister) { + this.sellerTradingClearingRegister = sellerTradingClearingRegister; + } + + public String getSellerMoneyAccount() { + return sellerMoneyAccount; + } + + public void setSellerMoneyAccount(String sellerMoneyAccount) { + this.sellerMoneyAccount = sellerMoneyAccount; + } + + public String getSellerDepoAccount() { + return sellerDepoAccount; + } + + public void setSellerDepoAccount(String sellerDepoAccount) { + this.sellerDepoAccount = sellerDepoAccount; + } + + public Long getBuyer() { + return buyer; + } + + public void setBuyer(Long buyer) { + this.buyer = buyer; + } + + public String getBuyerClearingCode() { + return buyerClearingCode; + } + + public void setBuyerClearingCode(String buyerClearingCode) { + this.buyerClearingCode = buyerClearingCode; + } + + public String getBuyerTradingClearingRegister() { + return buyerTradingClearingRegister; + } + + public void setBuyerTradingClearingRegister(String buyerTradingClearingRegister) { + this.buyerTradingClearingRegister = buyerTradingClearingRegister; + } + + public String getBuyerMoneyAccount() { + return buyerMoneyAccount; + } + + public void setBuyerMoneyAccount(String buyerMoneyAccount) { + this.buyerMoneyAccount = buyerMoneyAccount; + } + + public String getBuyerDepoAccount() { + return buyerDepoAccount; + } + + public void setBuyerDepoAccount(String buyerDepoAccount) { + this.buyerDepoAccount = buyerDepoAccount; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java new file mode 100644 index 000000000..831645277 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java @@ -0,0 +1,155 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class LiabilitiesRegister extends BusinessObject { + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Long sessionId; + private Instant validFromDate; + private Instant validToDate; + private Long companyId; + private String companyFullName; + private String inn; + private String segment; + private String registryCode; + private String account; + private String registryStatus; + private String currency; + private BigDecimal sumLiabilities; + private Instant settlementDate; + + @Override + public Long getId() { + return id; + } + + @Override + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Instant getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(Instant validFromDate) { + this.validFromDate = validFromDate; + } + + public Instant getValidToDate() { + return validToDate; + } + + public void setValidToDate(Instant validToDate) { + this.validToDate = validToDate; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant settlementDate) { + this.settlementDate = settlementDate; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java new file mode 100644 index 000000000..6fef585f6 --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java @@ -0,0 +1,128 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class MoneyBalanceRegister extends BusinessObject { + private String setHouseName; + private String account; + private String infoAccount; + private BigDecimal remainderSum; + private BigDecimal blockedSum; + private BigDecimal unblockedSum; + private String inn; + private Long sessionId; + private String companyFullName; + private Long companyId; + private Long id; + private Instant createdAt; + private Instant updatedAt; + + public String getSetHouseName() { + return setHouseName; + } + + public void setSetHouseName(String setHouseName) { + this.setHouseName = setHouseName; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getInfoAccount() { + return infoAccount; + } + + public void setInfoAccount(String infoAccount) { + this.infoAccount = infoAccount; + } + + public BigDecimal getRemainderSum() { + return remainderSum; + } + + public void setRemainderSum(BigDecimal remainderSum) { + this.remainderSum = remainderSum; + } + + public BigDecimal getBlockedSum() { + return blockedSum; + } + + public void setBlockedSum(BigDecimal blockedSum) { + this.blockedSum = blockedSum; + } + + public BigDecimal getUnblockedSum() { + return unblockedSum; + } + + public void setUnblockedSum(BigDecimal unblockedSum) { + this.unblockedSum = unblockedSum; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + @Override + public Long getId() { + return id; + } + + @Override + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java new file mode 100644 index 000000000..f1f8c6b1d --- /dev/null +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java @@ -0,0 +1,99 @@ +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.Instant; + +public class MoneyPaymentInstructionRegister extends BusinessObject { + private String creditLegAccount; + private BigDecimal creditLegAmount; + private String creditLegCurrencyCode; + private String debitLegAccount; + private String sender; + private String addressee; + private Long id; + private Instant createdAt; + private Instant updatedAt; + private Instant clearingDate; + + public String getCreditLegAccount() { + return creditLegAccount; + } + + public void setCreditLegAccount(String creditLegAccount) { + this.creditLegAccount = creditLegAccount; + } + + public BigDecimal getCreditLegAmount() { + return creditLegAmount; + } + + public void setCreditLegAmount(BigDecimal creditLegAmount) { + this.creditLegAmount = creditLegAmount; + } + + public String getCreditLegCurrencyCode() { + return creditLegCurrencyCode; + } + + public void setCreditLegCurrencyCode(String creditLegCurrencyCode) { + this.creditLegCurrencyCode = creditLegCurrencyCode; + } + + public String getDebitLegAccount() { + return debitLegAccount; + } + + public void setDebitLegAccount(String debitLegAccount) { + this.debitLegAccount = debitLegAccount; + } + + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = sender; + } + + public String getAddressee() { + return addressee; + } + + public void setAddressee(String addressee) { + this.addressee = addressee; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterService.java deleted file mode 100644 index 61f5417e0..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterService.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.AdmittedDealRegister; -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.registry.AdmittedDealRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -@Service -public class AdmittedDealRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg admittedDealRegisterMap; - - @Autowired - public AdmittedDealRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.admittedDealRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_AdmittedDealRegister, AdmittedDealRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(AdmittedDealRegisterNewRequest.class) - .setConsumer(this::admittedDealRegisterNew) - .forDestination(Consts.REGISTRY_ADMITTED_DEAL_REGISTER_NEW, callbacks::put); - init(); - } - - public void admittedDealRegisterNew(BaseRequest userRequest) { - AdmittedDealRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("AdmittedDealRegisterNewRequest received"); - AdmittedDealRegister register = new AdmittedDealRegister(); - register.setExecutionId(req.getExecutionId()); - register.setCompanyFullName(req.getCompanyFullName()); - register.setTradingDate(req.getTradingDate()); - register.setExchangeExecutionId(req.getExchangeExecutionId()); - register.setExchangeExecutionTime(req.getExchangeExecutionTime()); - register.setSecuritySymbol(req.getSecuritySymbol()); - register.setSecurityFullName(req.getSecurityFullName()); - register.setSellerFullName(req.getSellerFullName()); - register.setSellerClearingCode(req.getSellerClearingCode()); - register.setSellerAccount(req.getSellerAccount()); - register.setBuyerFullName(req.getBuyerFullName()); - register.setBuyerClearingCode(req.getBuyerClearingCode()); - register.setBuyerAccount(req.getBuyerAccount()); - register.setAmount(req.getAmount()); - register.setClearingDate(req.getClearingDate()); - admittedDealRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java new file mode 100644 index 000000000..3875ddc24 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java @@ -0,0 +1,60 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +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.registry.AdmittedLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg admittedLiabilitiesRegisterMap; + + @Autowired + public AdmittedLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.admittedLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, AdmittedLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(AdmittedLiabilitiesRegisterNewRequest.class) + .setConsumer(this::admittedLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_ADMITTED_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void admittedLiabilitiesRegisterNew(BaseRequest userRequest) { + AdmittedLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("AdmittedLiabilitiesRegisterNewRequest received"); + AdmittedLiabilitiesRegister register = new AdmittedLiabilitiesRegister(); + register.setSecuritySymbol(req.getSecuritySymbol()); + register.setSecurityFullName(req.getSecurityFullName()); + register.setSessionId(req.getSessionId()); + register.setClearingCode(req.getClearingCode()); + register.setAccount(req.getAccount()); + register.setCompanyId(req.getCompanyId()); + register.setAmount(req.getAmount()); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + register.setCompanyFullName(req.getCompanyFullName()); + admittedLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/BalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/BalanceRegisterService.java deleted file mode 100644 index 21c639fe6..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/BalanceRegisterService.java +++ /dev/null @@ -1,62 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.misc.BalanceRegister; -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.registry.BalanceRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - - -@Service -public class BalanceRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg balanceRegisterMap; - - @Autowired - public BalanceRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.balanceRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_BalanceRegister, BalanceRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(BalanceRegisterNewRequest.class) - .setConsumer(this::balanceRegisterNew) - .forDestination(Consts.REGISTRY_BALANCE_REGISTER_NEW, callbacks::put); - init(); - } - - public void balanceRegisterNew(BaseRequest userRequest) { - BalanceRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("BalanceRegisterNewRequest received"); - BalanceRegister register = new BalanceRegister(); - register.setsDf01Date(req.getsDf01Date()); - register.setCurrencyCode(req.getCurrencyCode()); - register.setSetHouseName(req.getSetHouseName()); - register.setAccount(req.getAccount()); - register.setInfoAccount(req.getInfoAccount()); - register.setRemainderSum(req.getRemainderSum()); - register.setBlockedSum(req.getBlockedSum()); - register.setUnblockedSum(req.getUnblockedSum()); - register.setInn(req.getInn()); - register.setMarket(req.getMarket()); - register.setFullName(req.getFullName()); - register.setTypeRemains(req.getTypeRemains()); - register.setDocNumber(req.getDocNumber()); - register.setCompanyId(req.getCompanyId()); - balanceRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeService.java deleted file mode 100644 index 40bd281ef..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeService.java +++ /dev/null @@ -1,51 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.ClearMemberRegisterChange; -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.registry.ClearMemberRegisterChangeNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -@Service -public class ClearMemberRegisterChangeService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg clearMemberRegisterChangeMap; - - @Autowired - public ClearMemberRegisterChangeService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.clearMemberRegisterChangeMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearMemberRegisterChange, ClearMemberRegisterChange.class); - } - - @Override - public void afterPropertiesSet() { - callback(ClearMemberRegisterChangeNewRequest.class) - .setConsumer(this::clearMemberRegisterChangeNew) - .forDestination(Consts.REGISTRY_CLEAR_MEMBER_REGISTER_CHANGE_NEW, callbacks::put); - init(); - } - - public void clearMemberRegisterChangeNew(BaseRequest userRequest) { - ClearMemberRegisterChangeNewRequest req = userRequest.getRequestPayload(); - log.debug("ClearMemberRegisterChangeNewRequest received"); - ClearMemberRegisterChange register = new ClearMemberRegisterChange(); - register.setDate(req.getDate()); - register.setComment(req.getComment()); - register.setClearingCode(req.getClearingCode()); - clearMemberRegisterChangeMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterService.java deleted file mode 100644 index aeaab9ced..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ClearMemberRegisterService.java +++ /dev/null @@ -1,73 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.misc.ClearMemberRegister; -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.registry.ClearMemberRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - - -@Service -public class ClearMemberRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg clearMemberRegisterMap; - - @Autowired - public ClearMemberRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.clearMemberRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearMemberRegister, ClearMemberRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(ClearMemberRegisterNewRequest.class) - .setConsumer(this::clearMemberRegisterNew) - .forDestination(Consts.REGISTRY_CLEAR_MEMBER_REGISTER_NEW, callbacks::put); - init(); - } - - public void clearMemberRegisterNew(BaseRequest userRequest) { - ClearMemberRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("ClearMemberRegisterNewRequest received"); - ClearMemberRegister register = new ClearMemberRegister(); - register.setTradingCode(req.getTradingCode()); - register.setClearingCode(req.getClearingCode()); - register.setFullName(req.getFullName()); - register.setShortName(req.getShortName()); - register.setCategoryList(req.getCategoryList()); - register.setCorporationSole(req.getCorporationSole()); - register.setAccount(req.getAccount()); - register.setBank(req.getBank()); - register.setBankName(req.getBankName()); - register.setInn(req.getInn()); - register.setBic(req.getBic()); - register.setOgrn(req.getOgrn()); - register.setCpp(req.getCpp()); - register.setOcpo(req.getOcpo()); - register.setContractNumber(req.getContractNumber()); - register.setContractDate(req.getContractDate()); - register.setRegistrationDate(req.getRegistrationDate()); - register.setSystemDate(req.getSystemDate()); - register.setAccessDate(req.getAccessDate()); - register.setSuspentionDate(req.getSuspentionDate()); - register.setReopeningDate(req.getReopeningDate()); - register.setCloseDate(req.getCloseDate()); - register.setExclusionDate(req.getExclusionDate()); - register.setAddress(req.getAddress()); - register.setEmail(req.getEmail()); - clearMemberRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java deleted file mode 100644 index 7b52e2ccb..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.ContractRegister; -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.registry.ContractRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - - -@Service -public class ContractRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg contractRegisterMap; - - @Autowired - public ContractRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.contractRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ContractRegister, ContractRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(ContractRegisterNewRequest.class) - .setConsumer(this::contractRegisterNew) - .forDestination(Consts.REGISTRY_CONTRACT_REGISTER_NEW, callbacks::put); - init(); - } - - public void contractRegisterNew(BaseRequest userRequest) { - ContractRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("ContractRegisterNewRequest received"); - ContractRegister register = new ContractRegister(); - register.setName(req.getName()); - register.setNumber(req.getNumber()); - register.setIssueDate(req.getIssueDate()); - register.setCompanyFullName(req.getCompanyFullName()); - register.setCompanyId(req.getCompanyId()); - register.setDocumentType(req.getDocumentType()); - register.setIssuePlace(req.getIssuePlace()); - register.setIssuer(req.getIssuer()); - register.setIssuerCode(req.getIssuerCode()); - register.setPlace(req.getPlace()); - register.setValidFromDate(req.getValidFromDate()); - register.setValidToDate(req.getValidToDate()); - register.setCloseDate(req.getCloseDate()); - register.setComment(req.getComment()); - - contractRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredDealRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredDealRegisterService.java deleted file mode 100644 index 8b7c51dd3..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredDealRegisterService.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.CoveredDealRegister; -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.registry.CoveredDealRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -@Service -public class CoveredDealRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg coveredDealRegisterMap; - - @Autowired - public CoveredDealRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.coveredDealRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredDealRegister, CoveredDealRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(CoveredDealRegisterNewRequest.class) - .setConsumer(this::coveredDealRegisterNew) - .forDestination(Consts.REGISTRY_COVERED_DEAL_REGISTER_NEW, callbacks::put); - init(); - } - - public void coveredDealRegisterNew(BaseRequest userRequest) { - CoveredDealRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("CoveredDealRegisterNewRequest received"); - CoveredDealRegister register = new CoveredDealRegister(); - register.setExecutionId(req.getExecutionId()); - register.setCompanyFullName(req.getCompanyFullName()); - register.setTradingDate(req.getTradingDate()); - register.setExchangeExecutionId(req.getExchangeExecutionId()); - register.setExchangeExecutionTime(req.getExchangeExecutionTime()); - register.setSecuritySymbol(req.getSecuritySymbol()); - register.setSecurityFullName(req.getSecurityFullName()); - register.setSellerFullName(req.getSellerFullName()); - register.setSellerClearingCode(req.getSellerClearingCode()); - register.setSellerAccount(req.getSellerAccount()); - register.setBuyerFullName(req.getBuyerFullName()); - register.setBuyerClearingCode(req.getBuyerClearingCode()); - register.setBuyerAccount(req.getBuyerAccount()); - register.setAmount(req.getAmount()); - register.setClearingDate(req.getClearingDate()); - coveredDealRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java new file mode 100644 index 000000000..f95c4080a --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java @@ -0,0 +1,58 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +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.registry.CoveredLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class CoveredLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg coveredLiabilitiesRegisterMap; + + @Autowired + public CoveredLiabilitiesRegisterService(Consumer< String, Object > kafkaQueue, + Producer< String, Object > kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.coveredLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, CoveredLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet () { + callback(CoveredLiabilitiesRegisterNewRequest.class) + .setConsumer(this::coveredLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_COVERED_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void coveredLiabilitiesRegisterNew (BaseRequest userRequest) { + CoveredLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("CoveredLiabilitiesRegisterNewRequest received"); + CoveredLiabilitiesRegister register = new CoveredLiabilitiesRegister(); + register.setCompanyFullName(req.getCompanyFullName()); + register.setSessionId(req.getSessionId()); + register.setSecuritySymbol(req.getSecuritySymbol()); + register.setSecurityFullName(req.getSecurityFullName()); + register.setCompanyId(req.getCompanyId()); + register.setClearingCode(req.getClearingCode()); + register.setAccount(req.getAccount()); + register.setAmount(req.getAmount()); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + coveredLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java new file mode 100644 index 000000000..4bfbb3b64 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java @@ -0,0 +1,58 @@ +package ru.spcex.clearing.registry.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.Autowired; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.register.AdmittedDealRegister; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +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.registry.AdmittedDealRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +@Service +public class DepoBalanceRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg depoBalanceRegisterMap; + + @Autowired + public DepoBalanceRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.depoBalanceRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoBalanceRegister, DepoBalanceRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(DepoBalanceRegisterNewRequest.class) + .setConsumer(this::depoBalanceRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_BALANCE_REGISTER_NEW, callbacks::put); + init(); + } + + public void depoBalanceRegisterNew(BaseRequest userRequest) { + DepoBalanceRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("DepoBalanceRegisterNewRequest received"); + DepoBalanceRegister register = new DepoBalanceRegister(); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setCompanyId(req.getCompanyId()); + register.setSessionId(req.getSessionId()); + register.setDepoCode(req.getDepoCode()); + register.setQuantity(req.getQuantity()); + register.setSecurityCode(req.getSecurityCode()); + depoBalanceRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java new file mode 100644 index 000000000..9a05dfdfa --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java @@ -0,0 +1,56 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +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.registry.DepoPaymentInstructionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class DepoPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg depoPaymentInstructionRegisterMap; + + @Autowired + public DepoPaymentInstructionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.depoPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoPaymentInstructionRegister, DepoPaymentInstructionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(DepoPaymentInstructionRegisterNewRequest.class) + .setConsumer(this::depoPaymentInstructionRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void depoPaymentInstructionRegisterNew(BaseRequest userRequest) { + DepoPaymentInstructionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("DepoPaymentInstructionRegisterNewRequest received"); + DepoPaymentInstructionRegister register = new DepoPaymentInstructionRegister(); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setCompanyId(req.getCompanyId()); + register.setTradingClearingRegistryType(req.getTradingClearingRegistryType()); + register.setTradingClearingRegistry(req.getTradingClearingRegistry()); + register.setCbCode(req.getCbCode()); + register.setQuantity(req.getQuantity()); + register.setDirection(req.getDirection()); + register.setSessionId(req.getSessionId()); + depoPaymentInstructionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java new file mode 100644 index 000000000..778300dd1 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +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.registry.ExcludeLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg excludeLiabilitiesRegisterMap; + + @Autowired + public ExcludeLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.excludeLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, ExcludeLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(ExcludeLiabilitiesRegisterNewRequest.class) + .setConsumer(this::excludeLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void excludeLiabilitiesRegisterNew(BaseRequest userRequest) { + ExcludeLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("ExcludeLiabilitiesRegisterNewRequest received"); + ExcludeLiabilitiesRegister register = new ExcludeLiabilitiesRegister(); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setSessionId(req.getSessionId()); + register.setValidFromDate(req.getValidFromDate()); + register.setValidToDate(req.getValidToDate()); + register.setCompanyId(req.getCompanyId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setInn(req.getInn()); + register.setSegment(req.getSegment()); + register.setRegistryCode(req.getRegistryCode()); + register.setAccount(req.getAccount()); + register.setRegistryStatus(req.getRegistryStatus()); + register.setCurrency(req.getCurrency()); + register.setSumLiabilities(req.getSumLiabilities()); + + excludeLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java new file mode 100644 index 000000000..5dfcde942 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -0,0 +1,83 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +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.registry.ExecutionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterUpdateRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class ExecutionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg executionRegisterMap; + + @Autowired + public ExecutionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.executionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionRegister, ExecutionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(ExecutionRegisterNewRequest.class) + .setConsumer(this::executionRegisterNew) + .forDestination(Consts.REGISTRY_EXECUTION_REGISTER_NEW, callbacks::put); + callback(ExecutionRegisterUpdateRequest.class) + .setConsumer(this::executionRegisterUpdate) + .forDestination(Consts.REGISTRY_EXECUTION_REGISTER_UPDATE, callbacks::put); + init(); + } + + public void executionRegisterNew(BaseRequest userRequest) { + ExecutionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("ExecutionRegisterNewRequest received"); + ExecutionRegister register = new ExecutionRegister(); + register.setTradingDate(req.getTradingDate()); + register.setExchangeExecutionId(req.getExchangeExecutionId()); + register.setExchangeExecutionTime(req.getExchangeExecutionTime()); + register.setSecurityId(req.getSecurityId()); + register.setSeller(req.getSeller()); + register.setSellerClearingCode(req.getSellerClearingCode()); + register.setSellerTradingClearingRegister(req.getSellerTradingClearingRegister()); + register.setSellerMoneyAccount(req.getSellerMoneyAccount()); + register.setSellerDepoAccount(req.getSellerDepoAccount()); + register.setBuyer(req.getBuyer()); + register.setBuyerClearingCode(req.getBuyerClearingCode()); + register.setBuyerTradingClearingRegister(req.getBuyerTradingClearingRegister()); + register.setBuyerMoneyAccount(req.getBuyerMoneyAccount()); + register.setBuyerDepoAccount(req.getBuyerDepoAccount()); + register.setAmount(req.getAmount()); + register.setQuantity(req.getQuantity()); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + executionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } + + public void executionRegisterUpdate(BaseRequest userRequest) { + ExecutionRegisterUpdateRequest req = userRequest.getRequestPayload(); + log.debug("ExecutionRegisterUpdateRequest received"); + ExecutionRegister register = executionRegisterMap.getSingleObjectByID(req.getId()); + register.setSecurityId(req.getSecurityId()); + register.setExchangeExecutionTime(req.getExchangeExecutionTime()); + register.setQuantity(req.getQuantity()); + register.setAmount(req.getAmount()); + executionRegisterMap.update(register); + log.debug("successfully processed, id {}", register.getId()); + } +} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java new file mode 100644 index 000000000..a99fe279f --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java @@ -0,0 +1,63 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +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.registry.ExcludeLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class LiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg liabilitiesRegisterMap; + + @Autowired + public LiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.liabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesRegister, LiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(LiabilitiesRegisterNewRequest.class) + .setConsumer(this::liabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void liabilitiesRegisterNew(BaseRequest userRequest) { + LiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("LiabilitiesRegisterNewRequest received"); + LiabilitiesRegister register = new LiabilitiesRegister(); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setSessionId(req.getSessionId()); + register.setValidFromDate(req.getValidFromDate()); + register.setValidToDate(req.getValidToDate()); + register.setCompanyId(req.getCompanyId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setInn(req.getInn()); + register.setSegment(req.getSegment()); + register.setRegistryCode(req.getRegistryCode()); + register.setAccount(req.getAccount()); + register.setRegistryStatus(req.getRegistryStatus()); + register.setCurrency(req.getCurrency()); + register.setSumLiabilities(req.getSumLiabilities()); + register.setSettlementDate(req.getSettlementDate()); + liabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java new file mode 100644 index 000000000..eb1ca12e6 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -0,0 +1,61 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +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.registry.DepoBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class MoneyBalanceRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg moneyBalanceRegisterMap; + + @Autowired + public MoneyBalanceRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.moneyBalanceRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyBalanceRegister, MoneyBalanceRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(MoneyBalanceRegisterNewRequest.class) + .setConsumer(this::moneyBalanceRegisterNew) + .forDestination(Consts.REGISTRY_MONEY_BALANCE_REGISTER_NEW, callbacks::put); + init(); + } + + public void moneyBalanceRegisterNew(BaseRequest userRequest) { + MoneyBalanceRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("MoneyBalanceRegisterNewRequest received"); + MoneyBalanceRegister register = new MoneyBalanceRegister(); + register.setSetHouseName(req.getSetHouseName()); + register.setAccount(req.getAccount()); + register.setInfoAccount(req.getInfoAccount()); + register.setRemainderSum(req.getRemainderSum()); + register.setBlockedSum(req.getBlockedSum()); + register.setUnblockedSum(req.getUnblockedSum()); + register.setInn(req.getInn()); + register.setSessionId(req.getSessionId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setCompanyId(req.getCompanyId()); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + moneyBalanceRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java new file mode 100644 index 000000000..055e043ed --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java @@ -0,0 +1,56 @@ +package ru.spcex.clearing.registry.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.Autowired; +import ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister; +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.registry.MoneyPaymentInstructionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class MoneyPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg moneyPaymentInstructionRegisterMap; + + @Autowired + public MoneyPaymentInstructionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.moneyPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, MoneyPaymentInstructionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(MoneyPaymentInstructionRegisterNewRequest.class) + .setConsumer(this::moneyPaymentInstructionRegisterNew) + .forDestination(Consts.REGISTRY_MONEY_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void moneyPaymentInstructionRegisterNew(BaseRequest userRequest) { + MoneyPaymentInstructionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("MoneyPaymentInstructionRegisterNewRequest received"); + MoneyPaymentInstructionRegister register = new MoneyPaymentInstructionRegister(); + register.setCreditLegAccount(req.getCreditLegAccount()); + register.setCreditLegAmount(req.getCreditLegAmount()); + register.setCreditLegCurrencyCode(req.getCreditLegCurrencyCode()); + register.setDebitLegAccount(req.getDebitLegAccount()); + register.setSender(req.getSender()); + register.setAddressee(req.getAddressee()); + register.setId(req.getId()); + register.setCreatedAt(req.getCreatedAt()); + register.setUpdatedAt(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + moneyPaymentInstructionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/OrderRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/OrderRegisterService.java deleted file mode 100644 index af076b9dc..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/OrderRegisterService.java +++ /dev/null @@ -1,56 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.OrderRegister; -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.registry.OrderRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -@Service -public class OrderRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg orderRegisterMap; - - @Autowired - public OrderRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.orderRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_OrderRegister, OrderRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(OrderRegisterNewRequest.class) - .setConsumer(this::orderRegisterNew) - .forDestination(Consts.REGISTRY_ORDER_REGISTER_NEW, callbacks::put); - init(); - } - - public void orderRegisterNew(BaseRequest userRequest) { - OrderRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("OrderRegisterNewRequest received"); - OrderRegister register = new OrderRegister(); - register.setCreditLegAccount(req.getCreditLegAccount()); - register.setCreditLegAmount(req.getCreditLegAmount()); - register.setCreditLegCurrencyCode(req.getCreditLegCurrencyCode()); - register.setCreditLegDirection(req.getCreditLegDirection()); - register.setDebitLegAccount(req.getDebitLegAccount()); - register.setSender(req.getSender()); - register.setAddressee(req.getAddressee()); - register.setDocumentNumber(req.getDocumentNumber()); - register.setClearingDate(req.getClearingDate()); - orderRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterService.java deleted file mode 100644 index f9b0d6580..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterService.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.spcex.clearing.registry.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.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.UncoveredDealRegister; -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.registry.UncoveredDealRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - -@Service -public class UncoveredDealRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg uncoveredDealRegisterMap; - - @Autowired - public UncoveredDealRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.uncoveredDealRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_UncoveredDealRegister, UncoveredDealRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(UncoveredDealRegisterNewRequest.class) - .setConsumer(this::uncoveredDealRegisterNew) - .forDestination(Consts.REGISTRY_UNCOVERED_DEAL_REGISTER_NEW, callbacks::put); - init(); - } - - public void uncoveredDealRegisterNew(BaseRequest userRequest) { - UncoveredDealRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("UncoveredDealRegisterNewRequest received"); - UncoveredDealRegister register = new UncoveredDealRegister(); - register.setExecutionId(req.getExecutionId()); - register.setCompanyFullName(req.getCompanyFullName()); - register.setTradingDate(req.getTradingDate()); - register.setExchangeExecutionId(req.getExchangeExecutionId()); - register.setExchangeExecutionTime(req.getExchangeExecutionTime()); - register.setSecuritySymbol(req.getSecuritySymbol()); - register.setSecurityFullName(req.getSecurityFullName()); - register.setSellerFullName(req.getSellerFullName()); - register.setSellerClearingCode(req.getSellerClearingCode()); - register.setSellerAccount(req.getSellerAccount()); - register.setBuyerFullName(req.getBuyerFullName()); - register.setBuyerClearingCode(req.getBuyerClearingCode()); - register.setBuyerAccount(req.getBuyerAccount()); - register.setAmount(req.getAmount()); - register.setResultStatus(req.getResultStatus()); - register.setClearingDate(req.getClearingDate()); - uncoveredDealRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterServiceTest.java deleted file mode 100644 index acddc52d4..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/AdmittedDealRegisterServiceTest.java +++ /dev/null @@ -1,118 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.AdmittedDealRegister; -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.registry.AdmittedDealRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - AdmittedDealRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class AdmittedDealRegisterServiceTest { - - public static final MatcherFactory.Matcher ADMITTED_DEAL_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_ADMITTED_DEAL_REGISTER_NEW = Consts.REGISTRY_ADMITTED_DEAL_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - AdmittedDealRegisterService admittedDealRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg admittedDealRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.admittedDealRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_AdmittedDealRegister, AdmittedDealRegister.class); - } - - /** - * {@link AdmittedDealRegisterService#admittedDealRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link AdmittedDealRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link AdmittedDealRegisterNewRequest}:
- */ - @Test - void admittedDealRegisterNew() { - //ARRANGE - Long executionId = 1234L; - AdmittedDealRegisterNewRequest admittedDealRegisterNewRequest = new AdmittedDealRegisterNewRequest(); - admittedDealRegisterNewRequest.setExecutionId(executionId); - admittedDealRegisterNewRequest.setCompanyFullName("companyFullName"); - admittedDealRegisterNewRequest.setTradingDate(LocalDate.now()); - admittedDealRegisterNewRequest.setExchangeExecutionId(1L); - admittedDealRegisterNewRequest.setExchangeExecutionTime(Instant.now()); - admittedDealRegisterNewRequest.setSecuritySymbol("symbol"); - admittedDealRegisterNewRequest.setSecurityFullName("full name"); - admittedDealRegisterNewRequest.setSellerFullName("full name"); - admittedDealRegisterNewRequest.setSellerClearingCode("code"); - admittedDealRegisterNewRequest.setSellerAccount("1561658"); - admittedDealRegisterNewRequest.setBuyerFullName("full name"); - admittedDealRegisterNewRequest.setBuyerClearingCode("ClearingCode"); - admittedDealRegisterNewRequest.setBuyerAccount("65464643"); - admittedDealRegisterNewRequest.setAmount(new BigDecimal(12)); - admittedDealRegisterNewRequest.setClearingDate(LocalDate.now()); - - AdmittedDealRegister predictableAdmittedDealRegister = new AdmittedDealRegister(); - predictableAdmittedDealRegister.setExecutionId(admittedDealRegisterNewRequest.getExecutionId()); - predictableAdmittedDealRegister.setCompanyFullName(admittedDealRegisterNewRequest.getCompanyFullName()); - predictableAdmittedDealRegister.setTradingDate(admittedDealRegisterNewRequest.getTradingDate()); - predictableAdmittedDealRegister.setExchangeExecutionId(admittedDealRegisterNewRequest.getExchangeExecutionId()); - predictableAdmittedDealRegister.setExchangeExecutionTime(admittedDealRegisterNewRequest.getExchangeExecutionTime()); - predictableAdmittedDealRegister.setSecuritySymbol(admittedDealRegisterNewRequest.getSecuritySymbol()); - predictableAdmittedDealRegister.setSecurityFullName(admittedDealRegisterNewRequest.getSecurityFullName()); - predictableAdmittedDealRegister.setSellerFullName(admittedDealRegisterNewRequest.getSellerFullName()); - predictableAdmittedDealRegister.setSellerClearingCode(admittedDealRegisterNewRequest.getSellerClearingCode()); - predictableAdmittedDealRegister.setSellerAccount(admittedDealRegisterNewRequest.getSellerAccount()); - predictableAdmittedDealRegister.setBuyerFullName(admittedDealRegisterNewRequest.getBuyerFullName()); - predictableAdmittedDealRegister.setBuyerClearingCode(admittedDealRegisterNewRequest.getBuyerClearingCode()); - predictableAdmittedDealRegister.setBuyerAccount(admittedDealRegisterNewRequest.getBuyerAccount()); - predictableAdmittedDealRegister.setAmount(admittedDealRegisterNewRequest.getAmount()); - predictableAdmittedDealRegister.setClearingDate(admittedDealRegisterNewRequest.getClearingDate()); - - //ACT - String jsonString = getJsonStringForNew(admittedDealRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) admittedDealRegisterService.getConsumer(), TOPIC_REGISTRY_ADMITTED_DEAL_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - AdmittedDealRegister resultNew = admittedDealRegisterMap.getSingleObjectBySQL(String.format("executionId = %d", executionId)); - predictableAdmittedDealRegister.setId(resultNew.getId()); - ADMITTED_DEAL_REGISTER_MATCHER.assertMatch(resultNew, predictableAdmittedDealRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/BalanceRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/BalanceRegisterServiceTest.java deleted file mode 100644 index 4b5167e0d..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/BalanceRegisterServiceTest.java +++ /dev/null @@ -1,113 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.misc.BalanceRegister; -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.registry.BalanceRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.time.Instant; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - BalanceRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class BalanceRegisterServiceTest { - public static final MatcherFactory.Matcher ADMITTED_DEAL_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_BALANCE_REGISTER_NEW = Consts.REGISTRY_BALANCE_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - BalanceRegisterService balanceRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg balanceRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.balanceRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_BalanceRegister, BalanceRegister.class); - } - - /** - * {@link BalanceRegisterService#balanceRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link BalanceRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link BalanceRegisterNewRequest}:
- */ - @Test - void balanceRegisterNew() { - //ARRANGE - Long companyId = 1234L; - BalanceRegisterNewRequest balanceRegisterNewRequest = new BalanceRegisterNewRequest(); - balanceRegisterNewRequest.setsDf01Date(Instant.now()); - balanceRegisterNewRequest.setCurrencyCode("currencyCode"); - balanceRegisterNewRequest.setSetHouseName("houseName"); - balanceRegisterNewRequest.setAccount("121546854"); - balanceRegisterNewRequest.setInfoAccount("account"); - balanceRegisterNewRequest.setRemainderSum(new BigDecimal(76)); - balanceRegisterNewRequest.setBlockedSum(new BigDecimal(16)); - balanceRegisterNewRequest.setUnblockedSum(new BigDecimal(46)); - balanceRegisterNewRequest.setInn("inn"); - balanceRegisterNewRequest.setMarket(12L); - balanceRegisterNewRequest.setFullName("fullName"); - balanceRegisterNewRequest.setTypeRemains("typeRemains"); - balanceRegisterNewRequest.setDocNumber("docNumber"); - balanceRegisterNewRequest.setCompanyId(companyId); - - BalanceRegister predictableBalanceRegister = new BalanceRegister(); - predictableBalanceRegister.setsDf01Date(balanceRegisterNewRequest.getsDf01Date()); - predictableBalanceRegister.setCurrencyCode(balanceRegisterNewRequest.getCurrencyCode()); - predictableBalanceRegister.setSetHouseName(balanceRegisterNewRequest.getSetHouseName()); - predictableBalanceRegister.setAccount(balanceRegisterNewRequest.getAccount()); - predictableBalanceRegister.setInfoAccount(balanceRegisterNewRequest.getInfoAccount()); - predictableBalanceRegister.setRemainderSum(balanceRegisterNewRequest.getRemainderSum()); - predictableBalanceRegister.setBlockedSum(balanceRegisterNewRequest.getBlockedSum()); - predictableBalanceRegister.setUnblockedSum(balanceRegisterNewRequest.getUnblockedSum()); - predictableBalanceRegister.setInn(balanceRegisterNewRequest.getInn()); - predictableBalanceRegister.setMarket(balanceRegisterNewRequest.getMarket()); - predictableBalanceRegister.setFullName(balanceRegisterNewRequest.getFullName()); - predictableBalanceRegister.setTypeRemains(balanceRegisterNewRequest.getTypeRemains()); - predictableBalanceRegister.setDocNumber(balanceRegisterNewRequest.getDocNumber()); - predictableBalanceRegister.setCompanyId(balanceRegisterNewRequest.getCompanyId()); - //ACT - String jsonString = getJsonStringForNew(balanceRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) balanceRegisterService.getConsumer(), TOPIC_REGISTRY_BALANCE_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - BalanceRegister resultNew = balanceRegisterMap.getSingleObjectBySQL(String.format("companyId = %d", companyId)); - predictableBalanceRegister.setId(resultNew.getId()); - ADMITTED_DEAL_REGISTER_MATCHER.assertMatch(resultNew, predictableBalanceRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeServiceTest.java deleted file mode 100644 index 844ef4480..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterChangeServiceTest.java +++ /dev/null @@ -1,90 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.ClearMemberRegisterChange; -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.registry.ClearMemberRegisterChangeNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.time.Instant; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - ClearMemberRegisterChangeService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class ClearMemberRegisterChangeServiceTest { - public static final MatcherFactory.Matcher CLEAR_MEMBER_REGISTER_CHANGE_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_CLEAR_MEMBER_REGISTER_CHANGE_NEW = Consts.REGISTRY_CLEAR_MEMBER_REGISTER_CHANGE_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - ClearMemberRegisterChangeService clearMemberRegisterChangeService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg clearMemberRegisterChangeMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.clearMemberRegisterChangeMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ClearMemberRegisterChange, ClearMemberRegisterChange.class); - } - - /** - * {@link ClearMemberRegisterChangeService#clearMemberRegisterChangeNew(BaseRequest)}
- * Тест проверяет создание сущности {@link ClearMemberRegisterChange} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link ClearMemberRegisterChangeNewRequest}:
- */ - @Test - void clearMemberRegisterChangeNew() { - //ARRANGE - String comment = "comment"; - ClearMemberRegisterChangeNewRequest clearMemberRegisterChangeNewRequest = new ClearMemberRegisterChangeNewRequest(); - clearMemberRegisterChangeNewRequest.setDate(Instant.now()); - clearMemberRegisterChangeNewRequest.setComment("comment"); - clearMemberRegisterChangeNewRequest.setClearingCode("clearingCode"); - - ClearMemberRegisterChange predictableClearMemberRegisterChange = new ClearMemberRegisterChange(); - predictableClearMemberRegisterChange.setDate(clearMemberRegisterChangeNewRequest.getDate()); - predictableClearMemberRegisterChange.setComment(clearMemberRegisterChangeNewRequest.getComment()); - predictableClearMemberRegisterChange.setClearingCode(clearMemberRegisterChangeNewRequest.getClearingCode()); - //ACT - String jsonString = getJsonStringForNew(clearMemberRegisterChangeNewRequest, ID); - - addRecordToKafka((MockConsumer) clearMemberRegisterChangeService.getConsumer(), TOPIC_REGISTRY_CLEAR_MEMBER_REGISTER_CHANGE_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - ClearMemberRegisterChange resultNew = clearMemberRegisterChangeMap.getSingleObjectBySQL(String.format("comment = %s", comment)); - predictableClearMemberRegisterChange.setId(resultNew.getId()); - CLEAR_MEMBER_REGISTER_CHANGE_MATCHER.assertMatch(resultNew, predictableClearMemberRegisterChange); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterServiceTest.java deleted file mode 100644 index 0cbabb914..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ClearMemberRegisterServiceTest.java +++ /dev/null @@ -1,135 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.misc.ClearMemberRegister; -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.registry.ClearMemberRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.time.Instant; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - ClearMemberRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class ClearMemberRegisterServiceTest { - public static final MatcherFactory.Matcher CLEAR_MEMBER_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_CLEAR_MEMBER_REGISTER_NEW = Consts.REGISTRY_CLEAR_MEMBER_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - ClearMemberRegisterService clearMemberRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg clearMemberRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.clearMemberRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ClearMemberRegister, ClearMemberRegister.class); - } - - /** - * {@link ClearMemberRegisterService#clearMemberRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link ClearMemberRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link ClearMemberRegisterNewRequest}:
- */ - @Test - void clearMemberRegisterNew() { - //ARRANGE - Long bank = 1234L; - ClearMemberRegisterNewRequest clearMemberRegisterNewRequest = new ClearMemberRegisterNewRequest(); - clearMemberRegisterNewRequest.setTradingCode("tradingCode"); - clearMemberRegisterNewRequest.setClearingCode("clearingCode"); - clearMemberRegisterNewRequest.setFullName("fullName"); - clearMemberRegisterNewRequest.setShortName("shortName"); - clearMemberRegisterNewRequest.setCategoryList("categoryList"); - clearMemberRegisterNewRequest.setCorporationSole("corporationSole"); - clearMemberRegisterNewRequest.setAccount("1246984698"); - clearMemberRegisterNewRequest.setBank(bank); - clearMemberRegisterNewRequest.setBankName("bankName"); - clearMemberRegisterNewRequest.setInn("inn"); - clearMemberRegisterNewRequest.setBic("bic"); - clearMemberRegisterNewRequest.setOgrn("ogrn"); - clearMemberRegisterNewRequest.setCpp("cpp"); - clearMemberRegisterNewRequest.setOcpo("ocpo"); - clearMemberRegisterNewRequest.setContractNumber("contractNumber"); - clearMemberRegisterNewRequest.setContractDate(LocalDate.now()); - clearMemberRegisterNewRequest.setRegistrationDate(LocalDate.now()); - clearMemberRegisterNewRequest.setSystemDate(LocalDate.now()); - clearMemberRegisterNewRequest.setAccessDate(Instant.now()); - clearMemberRegisterNewRequest.setSuspentionDate(Instant.now()); - clearMemberRegisterNewRequest.setReopeningDate(Instant.now()); - clearMemberRegisterNewRequest.setCloseDate(Instant.now()); - clearMemberRegisterNewRequest.setExclusionDate(Instant.now()); - clearMemberRegisterNewRequest.setAddress("address"); - clearMemberRegisterNewRequest.setEmail("email"); - - ClearMemberRegister predictableClearMemberRegister = new ClearMemberRegister(); - predictableClearMemberRegister.setTradingCode(clearMemberRegisterNewRequest.getTradingCode()); - predictableClearMemberRegister.setClearingCode(clearMemberRegisterNewRequest.getClearingCode()); - predictableClearMemberRegister.setFullName(clearMemberRegisterNewRequest.getFullName()); - predictableClearMemberRegister.setShortName(clearMemberRegisterNewRequest.getShortName()); - predictableClearMemberRegister.setCategoryList(clearMemberRegisterNewRequest.getCategoryList()); - predictableClearMemberRegister.setCorporationSole(clearMemberRegisterNewRequest.getCorporationSole()); - predictableClearMemberRegister.setAccount(clearMemberRegisterNewRequest.getAccount()); - predictableClearMemberRegister.setBank(clearMemberRegisterNewRequest.getBank()); - predictableClearMemberRegister.setBankName(clearMemberRegisterNewRequest.getBankName()); - predictableClearMemberRegister.setInn(clearMemberRegisterNewRequest.getInn()); - predictableClearMemberRegister.setBic(clearMemberRegisterNewRequest.getBic()); - predictableClearMemberRegister.setOgrn(clearMemberRegisterNewRequest.getOgrn()); - predictableClearMemberRegister.setCpp(clearMemberRegisterNewRequest.getCpp()); - predictableClearMemberRegister.setOcpo(clearMemberRegisterNewRequest.getOcpo()); - predictableClearMemberRegister.setContractNumber(clearMemberRegisterNewRequest.getContractNumber()); - predictableClearMemberRegister.setContractDate(clearMemberRegisterNewRequest.getContractDate()); - predictableClearMemberRegister.setRegistrationDate(clearMemberRegisterNewRequest.getRegistrationDate()); - predictableClearMemberRegister.setSystemDate(clearMemberRegisterNewRequest.getSystemDate()); - predictableClearMemberRegister.setAccessDate(clearMemberRegisterNewRequest.getAccessDate()); - predictableClearMemberRegister.setSuspentionDate(clearMemberRegisterNewRequest.getSuspentionDate()); - predictableClearMemberRegister.setReopeningDate(clearMemberRegisterNewRequest.getReopeningDate()); - predictableClearMemberRegister.setCloseDate(clearMemberRegisterNewRequest.getCloseDate()); - predictableClearMemberRegister.setExclusionDate(clearMemberRegisterNewRequest.getExclusionDate()); - predictableClearMemberRegister.setAddress(clearMemberRegisterNewRequest.getAddress()); - predictableClearMemberRegister.setEmail(clearMemberRegisterNewRequest.getEmail()); - //ACT - String jsonString = getJsonStringForNew(clearMemberRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) clearMemberRegisterService.getConsumer(), TOPIC_REGISTRY_CLEAR_MEMBER_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - ClearMemberRegister resultNew = clearMemberRegisterMap.getSingleObjectBySQL(String.format("bank = %d", bank)); - predictableClearMemberRegister.setId(resultNew.getId()); - CLEAR_MEMBER_REGISTER_MATCHER.assertMatch(resultNew, predictableClearMemberRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java deleted file mode 100644 index 3609a92e0..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.ContractRegister; -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.registry.ContractRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - ContractRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class ContractRegisterServiceTest { - public static final MatcherFactory.Matcher CLEAR_MEMBER_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_CONTRACT_REGISTER_NEW = Consts.REGISTRY_CONTRACT_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - ContractRegisterService contractRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg contractRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.contractRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ContractRegister, ContractRegister.class); - } - - /** - * {@link ContractRegisterService#contractRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link ContractRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link ContractRegisterNewRequest}:
- */ - @Test - void contractRegisterNew() { - //ARRANGE - Long companyId = 1234L; - ContractRegisterNewRequest contractRegisterNewRequest = new ContractRegisterNewRequest(); - contractRegisterNewRequest.setName("name"); - contractRegisterNewRequest.setNumber("number"); - contractRegisterNewRequest.setIssueDate(LocalDate.now()); - contractRegisterNewRequest.setCompanyFullName(1651656L); - contractRegisterNewRequest.setCompanyId(companyId); - contractRegisterNewRequest.setDocumentType("documentType"); - contractRegisterNewRequest.setIssuePlace("issuePlace"); - contractRegisterNewRequest.setIssuer("issuer"); - contractRegisterNewRequest.setIssuerCode("issuerCode"); - contractRegisterNewRequest.setPlace("place"); - contractRegisterNewRequest.setValidFromDate(LocalDate.now()); - contractRegisterNewRequest.setValidToDate(LocalDate.now()); - contractRegisterNewRequest.setCloseDate(LocalDate.now()); - contractRegisterNewRequest.setComment("comment"); - - ContractRegister predictableContractRegister = new ContractRegister(); - predictableContractRegister.setName(contractRegisterNewRequest.getName()); - predictableContractRegister.setNumber(contractRegisterNewRequest.getNumber()); - predictableContractRegister.setIssueDate(contractRegisterNewRequest.getIssueDate()); - predictableContractRegister.setCompanyFullName(contractRegisterNewRequest.getCompanyFullName()); - predictableContractRegister.setCompanyId(contractRegisterNewRequest.getCompanyId()); - predictableContractRegister.setDocumentType(contractRegisterNewRequest.getDocumentType()); - predictableContractRegister.setIssuePlace(contractRegisterNewRequest.getIssuePlace()); - predictableContractRegister.setIssuer(contractRegisterNewRequest.getIssuer()); - predictableContractRegister.setIssuerCode(contractRegisterNewRequest.getIssuerCode()); - predictableContractRegister.setPlace(contractRegisterNewRequest.getPlace()); - predictableContractRegister.setValidFromDate(contractRegisterNewRequest.getValidFromDate()); - predictableContractRegister.setValidToDate(contractRegisterNewRequest.getValidToDate()); - predictableContractRegister.setCloseDate(contractRegisterNewRequest.getCloseDate()); - predictableContractRegister.setComment(contractRegisterNewRequest.getComment()); - //ACT - String jsonString = getJsonStringForNew(contractRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) contractRegisterService.getConsumer(), TOPIC_REGISTRY_CONTRACT_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - ContractRegister resultNew = contractRegisterMap.getSingleObjectBySQL(String.format("companyId = %d", companyId)); - predictableContractRegister.setId(resultNew.getId()); - CLEAR_MEMBER_REGISTER_MATCHER.assertMatch(resultNew, predictableContractRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/CoveredDealRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/CoveredDealRegisterServiceTest.java deleted file mode 100644 index 921dfe0a3..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/CoveredDealRegisterServiceTest.java +++ /dev/null @@ -1,116 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.CoveredDealRegister; -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.registry.CoveredDealRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - CoveredDealRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class CoveredDealRegisterServiceTest { - public static final MatcherFactory.Matcher COVERED_DEAL_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_COVERED_DEAL_REGISTER_NEW = Consts.REGISTRY_COVERED_DEAL_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - CoveredDealRegisterService coveredDealRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg coveredDealRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.coveredDealRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_CoveredDealRegister, CoveredDealRegister.class); - } - - /** - * {@link CoveredDealRegisterService#coveredDealRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link CoveredDealRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link CoveredDealRegisterNewRequest}:
- */ - @Test - void coveredDealRegisterNew() { - //ARRANGE - Long executionId = 1234L; - CoveredDealRegisterNewRequest coveredDealRegisterNewRequest = new CoveredDealRegisterNewRequest(); - coveredDealRegisterNewRequest.setExecutionId(executionId); - coveredDealRegisterNewRequest.setCompanyFullName("companyFullName"); - coveredDealRegisterNewRequest.setTradingDate(LocalDate.now()); - coveredDealRegisterNewRequest.setExchangeExecutionId(1212L); - coveredDealRegisterNewRequest.setExchangeExecutionTime(Instant.now()); - coveredDealRegisterNewRequest.setSecuritySymbol("securitySymbol"); - coveredDealRegisterNewRequest.setSecurityFullName("fullName"); - coveredDealRegisterNewRequest.setSellerFullName("sellerFullName"); - coveredDealRegisterNewRequest.setSellerClearingCode("sellerClearingCode"); - coveredDealRegisterNewRequest.setSellerAccount("sellerAccount"); - coveredDealRegisterNewRequest.setBuyerFullName("buyerFullName"); - coveredDealRegisterNewRequest.setBuyerClearingCode("buyerClearingCode"); - coveredDealRegisterNewRequest.setBuyerAccount("buyerAccount"); - coveredDealRegisterNewRequest.setAmount(new BigDecimal(412)); - coveredDealRegisterNewRequest.setClearingDate(LocalDate.now()); - - CoveredDealRegister predictableCoveredDealRegister = new CoveredDealRegister(); - predictableCoveredDealRegister.setExecutionId(coveredDealRegisterNewRequest.getExecutionId()); - predictableCoveredDealRegister.setCompanyFullName(coveredDealRegisterNewRequest.getCompanyFullName()); - predictableCoveredDealRegister.setTradingDate(coveredDealRegisterNewRequest.getTradingDate()); - predictableCoveredDealRegister.setExchangeExecutionId(coveredDealRegisterNewRequest.getExchangeExecutionId()); - predictableCoveredDealRegister.setExchangeExecutionTime(coveredDealRegisterNewRequest.getExchangeExecutionTime()); - predictableCoveredDealRegister.setSecuritySymbol(coveredDealRegisterNewRequest.getSecuritySymbol()); - predictableCoveredDealRegister.setSecurityFullName(coveredDealRegisterNewRequest.getSecurityFullName()); - predictableCoveredDealRegister.setSellerFullName(coveredDealRegisterNewRequest.getSellerFullName()); - predictableCoveredDealRegister.setSellerClearingCode(coveredDealRegisterNewRequest.getSellerClearingCode()); - predictableCoveredDealRegister.setSellerAccount(coveredDealRegisterNewRequest.getSellerAccount()); - predictableCoveredDealRegister.setBuyerFullName(coveredDealRegisterNewRequest.getBuyerFullName()); - predictableCoveredDealRegister.setBuyerClearingCode(coveredDealRegisterNewRequest.getBuyerClearingCode()); - predictableCoveredDealRegister.setBuyerAccount(coveredDealRegisterNewRequest.getBuyerAccount()); - predictableCoveredDealRegister.setAmount(coveredDealRegisterNewRequest.getAmount()); - predictableCoveredDealRegister.setClearingDate(coveredDealRegisterNewRequest.getClearingDate()); - //ACT - String jsonString = getJsonStringForNew(coveredDealRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) coveredDealRegisterService.getConsumer(), TOPIC_REGISTRY_COVERED_DEAL_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - CoveredDealRegister resultNew = coveredDealRegisterMap.getSingleObjectBySQL(String.format("executionId = %d", executionId)); - predictableCoveredDealRegister.setId(resultNew.getId()); - COVERED_DEAL_REGISTER_MATCHER.assertMatch(resultNew, predictableCoveredDealRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/OrderRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/OrderRegisterServiceTest.java deleted file mode 100644 index 6cd5a8472..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/OrderRegisterServiceTest.java +++ /dev/null @@ -1,105 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.OrderRegister; -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.registry.OrderRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - OrderRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class OrderRegisterServiceTest { - public static final MatcherFactory.Matcher ORDER_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_ORDER_REGISTER_NEW = Consts.REGISTRY_ORDER_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - OrderRegisterService orderRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg orderRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.orderRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_OrderRegister, OrderRegister.class); - } - - /** - * {@link OrderRegisterService#orderRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link OrderRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link OrderRegisterNewRequest}:
- */ - @Test - void orderRegisterNew() { - //ARRANGE - Long creditLegDirection = 1234L; - OrderRegisterNewRequest req = new OrderRegisterNewRequest(); - req.setCreditLegAccount("creditLegAccount"); - req.setCreditLegAmount(new BigDecimal(0)); - req.setCreditLegCurrencyCode("creditLegCurrencyCode"); - req.setCreditLegDirection(creditLegDirection); - req.setDebitLegAccount(req.getDebitLegAccount()); - req.setSender(req.getSender()); - req.setAddressee(req.getAddressee()); - req.setDocumentNumber(req.getDocumentNumber()); - req.setClearingDate(req.getClearingDate()); - req.setClearingDate(LocalDate.now()); - - OrderRegister predictableOrderRegister = new OrderRegister(); - predictableOrderRegister.setCreditLegAccount(req.getCreditLegAccount()); - predictableOrderRegister.setCreditLegAmount(req.getCreditLegAmount()); - predictableOrderRegister.setCreditLegCurrencyCode(req.getCreditLegCurrencyCode()); - predictableOrderRegister.setCreditLegDirection(req.getCreditLegDirection()); - predictableOrderRegister.setDebitLegAccount(req.getDebitLegAccount()); - predictableOrderRegister.setSender(req.getSender()); - predictableOrderRegister.setAddressee(req.getAddressee()); - predictableOrderRegister.setDocumentNumber(req.getDocumentNumber()); - predictableOrderRegister.setClearingDate(req.getClearingDate()); - predictableOrderRegister.setClearingDate(req.getClearingDate()); - //ACT - String jsonString = getJsonStringForNew(req, ID); - - addRecordToKafka((MockConsumer) orderRegisterService.getConsumer(), TOPIC_REGISTRY_ORDER_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - OrderRegister resultNew = orderRegisterMap.getSingleObjectBySQL(String.format("creditLegDirection = %d", creditLegDirection)); - predictableOrderRegister.setId(resultNew.getId()); - ORDER_REGISTER_MATCHER.assertMatch(resultNew, predictableOrderRegister); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterServiceTest.java deleted file mode 100644 index 26cc0f08d..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/UncoveredDealRegisterServiceTest.java +++ /dev/null @@ -1,118 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -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.register.UncoveredDealRegister; -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.registry.UncoveredDealRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - UncoveredDealRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class UncoveredDealRegisterServiceTest { - public static final MatcherFactory.Matcher UNCOVERED_DEAL_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_UNCOVERED_DEAL_REGISTER_NEW = Consts.REGISTRY_UNCOVERED_DEAL_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - UncoveredDealRegisterService uncoveredDealRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg uncoveredDealRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.uncoveredDealRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_UncoveredDealRegister, UncoveredDealRegister.class); - } - - /** - * {@link UncoveredDealRegisterService#uncoveredDealRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link UncoveredDealRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link UncoveredDealRegisterNewRequest}:
- */ - @Test - void uncoveredDealRegisterNew() { - //ARRANGE - Long executionId = 1234L; - UncoveredDealRegisterNewRequest req = new UncoveredDealRegisterNewRequest(); - req.setExecutionId(executionId); - req.setCompanyFullName("companyFullName"); - req.setTradingDate(LocalDate.now()); - req.setExchangeExecutionId(121L); - req.setExchangeExecutionTime(Instant.now()); - req.setSecuritySymbol("securitySymbol"); - req.setSecurityFullName("fullName"); - req.setSellerFullName("sellerFullName"); - req.setSellerClearingCode("sellerClearingCode"); - req.setSellerAccount("sellerAccount"); - req.setBuyerFullName("buyerFullName"); - req.setBuyerClearingCode("clearingCode"); - req.setBuyerAccount("buyerAccount"); - req.setAmount(new BigDecimal(21)); - req.setResultStatus("resultStatus"); - req.setClearingDate(LocalDate.now()); - - UncoveredDealRegister predictableUncoveredDealRegister = new UncoveredDealRegister(); - predictableUncoveredDealRegister.setExecutionId(req.getExecutionId()); - predictableUncoveredDealRegister.setCompanyFullName(req.getCompanyFullName()); - predictableUncoveredDealRegister.setTradingDate(req.getTradingDate()); - predictableUncoveredDealRegister.setExchangeExecutionId(req.getExchangeExecutionId()); - predictableUncoveredDealRegister.setExchangeExecutionTime(req.getExchangeExecutionTime()); - predictableUncoveredDealRegister.setSecuritySymbol(req.getSecuritySymbol()); - predictableUncoveredDealRegister.setSecurityFullName(req.getSecurityFullName()); - predictableUncoveredDealRegister.setSellerFullName(req.getSellerFullName()); - predictableUncoveredDealRegister.setSellerClearingCode(req.getSellerClearingCode()); - predictableUncoveredDealRegister.setSellerAccount(req.getSellerAccount()); - predictableUncoveredDealRegister.setBuyerFullName(req.getBuyerFullName()); - predictableUncoveredDealRegister.setBuyerClearingCode(req.getBuyerClearingCode()); - predictableUncoveredDealRegister.setBuyerAccount(req.getBuyerAccount()); - predictableUncoveredDealRegister.setAmount(req.getAmount()); - predictableUncoveredDealRegister.setResultStatus(req.getResultStatus()); - predictableUncoveredDealRegister.setClearingDate(req.getClearingDate()); - //ACT - String jsonString = getJsonStringForNew(req, ID); - - addRecordToKafka((MockConsumer) uncoveredDealRegisterService.getConsumer(), TOPIC_REGISTRY_UNCOVERED_DEAL_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - UncoveredDealRegister resultNew = uncoveredDealRegisterMap.getSingleObjectBySQL(String.format("executionId = %d", executionId)); - predictableUncoveredDealRegister.setId(resultNew.getId()); - UNCOVERED_DEAL_REGISTER_MATCHER.assertMatch(resultNew, predictableUncoveredDealRegister); - } -} \ No newline at end of file diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 3ec5f5b9f..4e132c480 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -115,7 +115,15 @@ public final class IMDGDistributedNames { public static final String Map_ExecutionDeposit = "Map_ExecutionDeposit"; public static final String Map_ExecutionDepositHistory = "Map_ExecutionDepositHistory"; public static final String Map_DealRegister = "Map_DealRegister"; - public static final String Map_AdmittedDealRegister = "Map_AdmittedDealRegister"; + public static final String Map_DepoBalanceRegister = "Map_DepoBalanceRegister"; + public static final String Map_MoneyBalanceRegister = "Map_MoneyBalanceRegister"; + public static final String Map_AdmittedLiabilitiesRegister = "Map_AdmittedLiabilitiesRegister"; + public static final String Map_CoveredLiabilitiesRegister = "Map_CoveredLiabilitiesRegister"; + public static final String Map_MoneyPaymentInstructionRegister = "Map_MoneyPaymentInstructionRegister"; + public static final String Map_DepoPaymentInstructionRegister = "Map_DepoPaymentInstructionRegister"; + public static final String Map_ExcludeLiabilitiesRegister = "Map_ExcludeLiabilitiesRegister"; + public static final String Map_LiabilitiesRegister = "Map_LiabilitiesRegister"; + public static final String Map_ExecutionRegister = "Map_ExecutionRegister"; public static final String Map_CoveredDealRegister = "Map_CoveredDealRegister"; public static final String Map_UncoveredDealRegister = "Map_UncoveredDealRegister"; public static final String Map_ReportRegister = "Map_ReportRegister"; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java index c00ea09a8..21f577f7f 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java @@ -110,11 +110,22 @@ public interface Consts { String REQUEST_INFO_UPDATE = "request-info-update"; - String REGISTRY_COVERED_DEAL_REGISTER_NEW = "registry-covered-deal-register-new"; + String REGISTRY_ADMITTED_DEAL_REGISTER_NEW = "registry-admitted-deal-register-new"; String REGISTRY_DEAL_REGISTER_NEW = "registry-deal-register-new"; - String REGISTRY_ORDER_REGISTER_NEW = "registry-order-register-new"; + String REGISTRY_DEPO_BALANCE_REGISTER_NEW = "registry-depo-balance-register-new"; + String REGISTRY_MONEY_BALANCE_REGISTER_NEW = "registry-money-balance-register-new"; + String REGISTRY_ADMITTED_LIABILITIES_REGISTER_NEW = "registry-admitted-liabilities-register-new"; + String REGISTRY_COVERED_LIABILITIES_REGISTER_NEW = "registry-covered-liabilities-register-new"; + String REGISTRY_MONEY_PAYMENT_INSTRUCTION_REGISTER_NEW = "registry-money-payment-instruction-register-new"; + String REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW = "registry-depo-payment-instruction-register-new"; + String REGISTRY_EXCLUDE_LIABILITIES_REGISTER_NEW = "registry-exclude-liabilities-register-new"; + String REGISTRY_LIABILITIES_REGISTER_NEW = "registry-liabilities-register-new"; + String REGISTRY_EXECUTION_REGISTER_NEW = "registry-execution-register-new"; + String REGISTRY_EXECUTION_REGISTER_UPDATE = "registry-execution-register-update"; + + //TODO IS IT NEEDED RIGHT HERE? String REGISTRY_CONTRACT_REGISTER_NEW = "registry-contract-register-new"; String REGISTRY_BALANCE_REGISTER_NEW = "registry-balance-register-new"; String REGISTRY_UNCOVERED_DEAL_REGISTER_NEW = "registry-uncovered-deal-register-new"; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..f76d06b88 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java @@ -0,0 +1,139 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class AdmittedLiabilitiesRegisterNewRequest { + @JsonProperty + private String companyFullName; + @JsonProperty + private Long sessionId; + @JsonProperty + private String securitySymbol; + @JsonProperty + private String securityFullName; + @JsonProperty + private Long companyId; + @JsonProperty + private String clearingCode; + @JsonProperty + private String account; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterChangeNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterChangeNewRequest.java deleted file mode 100644 index 9f9eee634..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterChangeNewRequest.java +++ /dev/null @@ -1,44 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; - -import java.time.Instant; - -public class ClearMemberRegisterChangeNewRequest { - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant date; - @JsonProperty - private String clearingCode; - @JsonProperty - private String comment; - - public Instant getDate() { - return date; - } - - public void setDate(Instant date) { - this.date = date; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String clearingCode) { - this.clearingCode = clearingCode; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterNewRequest.java deleted file mode 100644 index eed8c58bd..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ClearMemberRegisterNewRequest.java +++ /dev/null @@ -1,343 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.time.Instant; -import java.time.LocalDate; - -public class ClearMemberRegisterNewRequest { - - @JsonProperty - private String tradingCode; - - @JsonProperty - private String clearingCode; - - @JsonProperty - private String fullName; - - @JsonProperty - private String shortName; - - @JsonProperty - private String categoryList; - - @JsonProperty - private String corporationSole; - - @JsonProperty - private String account; - - @JsonProperty - private Long bank; - - @JsonProperty - private String bankName; - - @JsonProperty - private String inn; - - @JsonProperty - private String bic; - - @JsonProperty - private String ogrn; - - @JsonProperty - private String cpp; - - @JsonProperty - private String ocpo; - - @JsonProperty - private String contractNumber; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate contractDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate registrationDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate systemDate; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant accessDate; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant suspentionDate; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant reopeningDate; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant closeDate; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant exclusionDate; - - @JsonProperty - private String address; - - @JsonProperty - private String email; - - @JsonProperty - private Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant updatedAt; - - public String getTradingCode() { - return tradingCode; - } - - public void setTradingCode(String tradingCode) { - this.tradingCode = tradingCode; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String clearingCode) { - this.clearingCode = clearingCode; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName; - } - - public String getCategoryList() { - return categoryList; - } - - public void setCategoryList(String categoryList) { - this.categoryList = categoryList; - } - - public String getCorporationSole() { - return corporationSole; - } - - public void setCorporationSole(String corporationSole) { - this.corporationSole = corporationSole; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public Long getBank() { - return bank; - } - - public void setBank(Long bank) { - this.bank = bank; - } - - public String getBankName() { - return bankName; - } - - public void setBankName(String bankName) { - this.bankName = bankName; - } - - public String getInn() { - return inn; - } - - public void setInn(String inn) { - this.inn = inn; - } - - public String getBic() { - return bic; - } - - public void setBic(String bic) { - this.bic = bic; - } - - public String getOgrn() { - return ogrn; - } - - public void setOgrn(String ogrn) { - this.ogrn = ogrn; - } - - public String getCpp() { - return cpp; - } - - public void setCpp(String cpp) { - this.cpp = cpp; - } - - public String getOcpo() { - return ocpo; - } - - public void setOcpo(String ocpo) { - this.ocpo = ocpo; - } - - public String getContractNumber() { - return contractNumber; - } - - public void setContractNumber(String contractNumber) { - this.contractNumber = contractNumber; - } - - public LocalDate getContractDate() { - return contractDate; - } - - public void setContractDate(LocalDate contractDate) { - this.contractDate = contractDate; - } - - public LocalDate getRegistrationDate() { - return registrationDate; - } - - public void setRegistrationDate(LocalDate registrationDate) { - this.registrationDate = registrationDate; - } - - public LocalDate getSystemDate() { - return systemDate; - } - - public void setSystemDate(LocalDate systemDate) { - this.systemDate = systemDate; - } - - public Instant getAccessDate() { - return accessDate; - } - - public void setAccessDate(Instant accessDate) { - this.accessDate = accessDate; - } - - public Instant getSuspentionDate() { - return suspentionDate; - } - - public void setSuspentionDate(Instant suspentionDate) { - this.suspentionDate = suspentionDate; - } - - public Instant getReopeningDate() { - return reopeningDate; - } - - public void setReopeningDate(Instant reopeningDate) { - this.reopeningDate = reopeningDate; - } - - public Instant getCloseDate() { - return closeDate; - } - - public void setCloseDate(Instant closeDate) { - this.closeDate = closeDate; - } - - public Instant getExclusionDate() { - return exclusionDate; - } - - public void setExclusionDate(Instant exclusionDate) { - this.exclusionDate = exclusionDate; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java deleted file mode 100644 index 8d65681a7..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java +++ /dev/null @@ -1,214 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.time.Instant; -import java.time.LocalDate; - -public class ContractRegisterNewRequest { - - @JsonProperty - private String name; - - @JsonProperty - private String number; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate issueDate; - - @JsonProperty - private Long companyFullName; - - @JsonProperty - private Long companyId; - - @JsonProperty - private String documentType; - - @JsonProperty - private String issuePlace; - - @JsonProperty - private String issuer; - - @JsonProperty - private String issuerCode; - - @JsonProperty - private String place; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate validFromDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate validToDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate closeDate; - - @JsonProperty - private String comment; - - @JsonProperty - private Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant updatedAt; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public LocalDate getCloseDate() { - return closeDate; - } - - public void setCloseDate(LocalDate closeDate) { - this.closeDate = closeDate; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public String getNumber() { - return number; - } - - public void setNumber(String number) { - this.number = number; - } - - public LocalDate getIssueDate() { - return issueDate; - } - - public void setIssueDate(LocalDate issueDate) { - this.issueDate = issueDate; - } - - public Long getCompanyFullName() { - return companyFullName; - } - - public void setCompanyFullName(Long companyFullName) { - this.companyFullName = companyFullName; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getDocumentType() { - return documentType; - } - - public void setDocumentType(String documentType) { - this.documentType = documentType; - } - - public String getIssuePlace() { - return issuePlace; - } - - public void setIssuePlace(String issuePlace) { - this.issuePlace = issuePlace; - } - - public String getIssuer() { - return issuer; - } - - public void setIssuer(String issuer) { - this.issuer = issuer; - } - - public String getIssuerCode() { - return issuerCode; - } - - public void setIssuerCode(String issuerCode) { - this.issuerCode = issuerCode; - } - - public String getPlace() { - return place; - } - - public void setPlace(String place) { - this.place = place; - } - - public LocalDate getValidFromDate() { - return validFromDate; - } - - public void setValidFromDate(LocalDate validFromDate) { - this.validFromDate = validFromDate; - } - - public LocalDate getValidToDate() { - return validToDate; - } - - public void setValidToDate(LocalDate validToDate) { - this.validToDate = validToDate; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredDealRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredDealRegisterNewRequest.java deleted file mode 100644 index ec1d1908b..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredDealRegisterNewRequest.java +++ /dev/null @@ -1,225 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -public class CoveredDealRegisterNewRequest { - - @JsonProperty - public Long executionId; - - @JsonProperty - public String companyFullName; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - public LocalDate tradingDate; - - @JsonProperty - public Long exchangeExecutionId; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - public Instant exchangeExecutionTime; //todo clarify is timestamp suitable for this request or not - - @JsonProperty - public String securitySymbol; - - @JsonProperty - public String securityFullName; - - @JsonProperty - public String sellerFullName; - - @JsonProperty - public String sellerClearingCode; - - @JsonProperty - public String sellerAccount; - - @JsonProperty - public String buyerFullName; - - @JsonProperty - public String buyerClearingCode; - - @JsonProperty - public String buyerAccount; - - @JsonProperty - public BigDecimal amount; - - @JsonProperty - public Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - public Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - public Instant updatedAt; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - public LocalDate clearingDate; - - public Long getExecutionId() { - return executionId; - } - - public void setExecutionId(Long executionId) { - this.executionId = executionId; - } - - public String getCompanyFullName() { - return companyFullName; - } - - public void setCompanyFullName(String companyFullName) { - this.companyFullName = companyFullName; - } - - public LocalDate getTradingDate() { - return tradingDate; - } - - public void setTradingDate(LocalDate tradingDate) { - this.tradingDate = tradingDate; - } - - public Long getExchangeExecutionId() { - return exchangeExecutionId; - } - - public void setExchangeExecutionId(Long exchangeExecutionId) { - this.exchangeExecutionId = exchangeExecutionId; - } - - public Instant getExchangeExecutionTime() { - return exchangeExecutionTime; - } - - public void setExchangeExecutionTime(Instant exchangeExecutionTime) { - this.exchangeExecutionTime = exchangeExecutionTime; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - - public void setSecuritySymbol(String securitySymbol) { - this.securitySymbol = securitySymbol; - } - - public String getSecurityFullName() { - return securityFullName; - } - - public void setSecurityFullName(String securityFullName) { - this.securityFullName = securityFullName; - } - - public String getSellerFullName() { - return sellerFullName; - } - - public void setSellerFullName(String sellerFullName) { - this.sellerFullName = sellerFullName; - } - - public String getSellerClearingCode() { - return sellerClearingCode; - } - - public void setSellerClearingCode(String sellerClearingCode) { - this.sellerClearingCode = sellerClearingCode; - } - - public String getSellerAccount() { - return sellerAccount; - } - - public void setSellerAccount(String sellerAccount) { - this.sellerAccount = sellerAccount; - } - - public String getBuyerFullName() { - return buyerFullName; - } - - public void setBuyerFullName(String buyerFullName) { - this.buyerFullName = buyerFullName; - } - - public String getBuyerClearingCode() { - return buyerClearingCode; - } - - public void setBuyerClearingCode(String buyerClearingCode) { - this.buyerClearingCode = buyerClearingCode; - } - - public String getBuyerAccount() { - return buyerAccount; - } - - public void setBuyerAccount(String buyerAccount) { - this.buyerAccount = buyerAccount; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } -} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..1bcf03ef5 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java @@ -0,0 +1,139 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class CoveredLiabilitiesRegisterNewRequest { + @JsonProperty + private String companyFullName; + @JsonProperty + private Long sessionId; + @JsonProperty + private String securitySymbol; + @JsonProperty + private String securityFullName; + @JsonProperty + private Long companyId; + @JsonProperty + private String clearingCode; + @JsonProperty + private String account; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java new file mode 100644 index 000000000..227b7c042 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java @@ -0,0 +1,101 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.apache.kafka.common.serialization.Deserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigInteger; +import java.time.Instant; + +public class DepoBalanceRegisterNewRequest { + @JsonProperty + private Long id; + + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonProperty + private String companyId; + @JsonProperty + private Long sessionId; + @JsonProperty + private String depoCode; + @JsonProperty + private String quantity; + @JsonProperty + private String securityCode; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getDepoCode() { + return depoCode; + } + + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getSecurityCode() { + return securityCode; + } + + public void setSecurityCode(String securityCode) { + this.securityCode = securityCode; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java new file mode 100644 index 000000000..90f7a9a58 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java @@ -0,0 +1,117 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class DepoPaymentInstructionRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long companyId; + @JsonProperty + private String tradingClearingRegistryType; + @JsonProperty + private String tradingClearingRegistry; + @JsonProperty + private String cbCode; + @JsonProperty + private BigDecimal quantity; + @JsonProperty + private Long direction; + @JsonProperty + private Long sessionId; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getTradingClearingRegistryType() { + return tradingClearingRegistryType; + } + + public void setTradingClearingRegistryType(String tradingClearingRegistryType) { + this.tradingClearingRegistryType = tradingClearingRegistryType; + } + + public String getTradingClearingRegistry() { + return tradingClearingRegistry; + } + + public void setTradingClearingRegistry(String tradingClearingRegistry) { + this.tradingClearingRegistry = tradingClearingRegistry; + } + + public String getCbCode() { + return cbCode; + } + + public void setCbCode(String cbCode) { + this.cbCode = cbCode; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getDirection() { + return direction; + } + + public void setDirection(Long direction) { + this.direction = direction; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..73d977403 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java @@ -0,0 +1,184 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExcludeLiabilitiesRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long sessionId; + @JsonProperty + private Long companyId; + @JsonProperty + private String companyFullName; + @JsonProperty + private String inn; + @JsonProperty + private String segment; + @JsonProperty + private String registryCode; + @JsonProperty + private String account; + @JsonProperty + private String registryStatus; + @JsonProperty + private String currency; + @JsonProperty + private BigDecimal sumLiabilities; + + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant settlementDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant validFromDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant validToDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant settlementDate) { + this.settlementDate = settlementDate; + } + + public Instant getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(Instant validFromDate) { + this.validFromDate = validFromDate; + } + + public Instant getValidToDate() { + return validToDate; + } + + public void setValidToDate(Instant validToDate) { + this.validToDate = validToDate; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java new file mode 100644 index 000000000..09f9e2afa --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java @@ -0,0 +1,223 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExecutionRegisterNewRequest { + @JsonProperty + private Long exchangeExecutionId; + @JsonProperty + private Long securityId; + @JsonProperty + private Long seller; + @JsonProperty + private String sellerClearingCode; + @JsonProperty + private String sellerTradingClearingRegister; + @JsonProperty + private String sellerMoneyAccount; + @JsonProperty + private String sellerDepoAccount; + @JsonProperty + private Long buyer; + @JsonProperty + private String buyerClearingCode; + @JsonProperty + private String buyerTradingClearingRegister; + @JsonProperty + private String buyerMoneyAccount; + @JsonProperty + private String buyerDepoAccount; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private BigDecimal quantity; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant clearingDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant tradingDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant exchangeExecutionTime; + + public Long getExchangeExecutionId() { + return exchangeExecutionId; + } + + public void setExchangeExecutionId(Long exchangeExecutionId) { + this.exchangeExecutionId = exchangeExecutionId; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public Long getSeller() { + return seller; + } + + public void setSeller(Long seller) { + this.seller = seller; + } + + public String getSellerClearingCode() { + return sellerClearingCode; + } + + public void setSellerClearingCode(String sellerClearingCode) { + this.sellerClearingCode = sellerClearingCode; + } + + public String getSellerTradingClearingRegister() { + return sellerTradingClearingRegister; + } + + public void setSellerTradingClearingRegister(String sellerTradingClearingRegister) { + this.sellerTradingClearingRegister = sellerTradingClearingRegister; + } + + public String getSellerMoneyAccount() { + return sellerMoneyAccount; + } + + public void setSellerMoneyAccount(String sellerMoneyAccount) { + this.sellerMoneyAccount = sellerMoneyAccount; + } + + public String getSellerDepoAccount() { + return sellerDepoAccount; + } + + public void setSellerDepoAccount(String sellerDepoAccount) { + this.sellerDepoAccount = sellerDepoAccount; + } + + public Long getBuyer() { + return buyer; + } + + public void setBuyer(Long buyer) { + this.buyer = buyer; + } + + public String getBuyerClearingCode() { + return buyerClearingCode; + } + + public void setBuyerClearingCode(String buyerClearingCode) { + this.buyerClearingCode = buyerClearingCode; + } + + public String getBuyerTradingClearingRegister() { + return buyerTradingClearingRegister; + } + + public void setBuyerTradingClearingRegister(String buyerTradingClearingRegister) { + this.buyerTradingClearingRegister = buyerTradingClearingRegister; + } + + public String getBuyerMoneyAccount() { + return buyerMoneyAccount; + } + + public void setBuyerMoneyAccount(String buyerMoneyAccount) { + this.buyerMoneyAccount = buyerMoneyAccount; + } + + public String getBuyerDepoAccount() { + return buyerDepoAccount; + } + + public void setBuyerDepoAccount(String buyerDepoAccount) { + this.buyerDepoAccount = buyerDepoAccount; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getClearingDate() { + return clearingDate; + } + + public void setClearingDate(Instant clearingDate) { + this.clearingDate = clearingDate; + } + + public Instant getTradingDate() { + return tradingDate; + } + + public void setTradingDate(Instant tradingDate) { + this.tradingDate = tradingDate; + } + + public Instant getExchangeExecutionTime() { + return exchangeExecutionTime; + } + + public void setExchangeExecutionTime(Instant exchangeExecutionTime) { + this.exchangeExecutionTime = exchangeExecutionTime; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java new file mode 100644 index 000000000..144376602 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java @@ -0,0 +1,65 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExecutionRegisterUpdateRequest { + @JsonProperty + private Long securityId; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private BigDecimal quantity; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant exchangeExecutionTime; + @JsonProperty + private Long id; + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Instant getExchangeExecutionTime() { + return exchangeExecutionTime; + } + + public void setExchangeExecutionTime(Instant exchangeExecutionTime) { + this.exchangeExecutionTime = exchangeExecutionTime; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..feb139839 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java @@ -0,0 +1,183 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class LiabilitiesRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long sessionId; + @JsonProperty + private Long companyId; + @JsonProperty + private String companyFullName; + @JsonProperty + private String inn; + @JsonProperty + private String segment; + @JsonProperty + private String registryCode; + @JsonProperty + private String account; + @JsonProperty + private String registryStatus; + @JsonProperty + private String currency; + @JsonProperty + private BigDecimal sumLiabilities; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant settlementDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant validFromDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant validToDate; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant settlementDate) { + this.settlementDate = settlementDate; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(Instant validFromDate) { + this.validFromDate = validFromDate; + } + + public Instant getValidToDate() { + return validToDate; + } + + public void setValidToDate(Instant validToDate) { + this.validToDate = validToDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java similarity index 64% rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java index 171468da2..6e00189b5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java @@ -3,85 +3,44 @@ package ru.spcex.clearing.platform.messaging.domain.cud.registry; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import java.math.BigDecimal; import java.time.Instant; -public class BalanceRegisterNewRequest { - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant sDf01Date; - - @JsonProperty - private String currencyCode; - +public class MoneyBalanceRegisterNewRequest { @JsonProperty private String setHouseName; - @JsonProperty private String account; - @JsonProperty private String infoAccount; - @JsonProperty private BigDecimal remainderSum; - @JsonProperty private BigDecimal blockedSum; - @JsonProperty private BigDecimal unblockedSum; - @JsonProperty private String inn; - @JsonProperty - private Long market; - + private Long sessionId; @JsonProperty - private String fullName; - - @JsonProperty - private String typeRemains; - - @JsonProperty - private String docNumber; - + private String companyFullName; @JsonProperty private Long companyId; - @JsonProperty private Long id; - + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - public Instant getsDf01Date() { - return sDf01Date; - } - - public void setsDf01Date(Instant sDf01Date) { - this.sDf01Date = sDf01Date; - } - - public String getCurrencyCode() { - return currencyCode; - } - - public void setCurrencyCode(String currencyCode) { - this.currencyCode = currencyCode; - } - public String getSetHouseName() { return setHouseName; } @@ -138,36 +97,20 @@ public class BalanceRegisterNewRequest { this.inn = inn; } - public Long getMarket() { - return market; + public Long getSessionId() { + return sessionId; } - public void setMarket(Long market) { - this.market = market; + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; } - public String getFullName() { - return fullName; + public String getCompanyFullName() { + return companyFullName; } - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getTypeRemains() { - return typeRemains; - } - - public void setTypeRemains(String typeRemains) { - this.typeRemains = typeRemains; - } - - public String getDocNumber() { - return docNumber; - } - - public void setDocNumber(String docNumber) { - this.docNumber = docNumber; + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; } public Long getCompanyId() { diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/OrderRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java similarity index 66% rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/OrderRegisterNewRequest.java rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java index 7eae019d3..3b1dee7c8 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/OrderRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java @@ -1,61 +1,41 @@ package ru.spcex.clearing.platform.messaging.domain.cud.registry; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import java.math.BigDecimal; import java.time.Instant; -import java.time.LocalDate; - -public class OrderRegisterNewRequest { +public class MoneyPaymentInstructionRegisterNewRequest { @JsonProperty private String creditLegAccount; - @JsonProperty private BigDecimal creditLegAmount; - @JsonProperty private String creditLegCurrencyCode; - - @JsonProperty - private Long creditLegDirection; - @JsonProperty private String debitLegAccount; - @JsonProperty private String sender; - @JsonProperty private String addressee; - - @JsonProperty - private String documentNumber; - @JsonProperty private Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - private LocalDate clearingDate; + private Instant clearingDate; public String getCreditLegAccount() { return creditLegAccount; @@ -81,14 +61,6 @@ public class OrderRegisterNewRequest { this.creditLegCurrencyCode = creditLegCurrencyCode; } - public Long getCreditLegDirection() { - return creditLegDirection; - } - - public void setCreditLegDirection(Long creditLegDirection) { - this.creditLegDirection = creditLegDirection; - } - public String getDebitLegAccount() { return debitLegAccount; } @@ -113,14 +85,6 @@ public class OrderRegisterNewRequest { this.addressee = addressee; } - public String getDocumentNumber() { - return documentNumber; - } - - public void setDocumentNumber(String documentNumber) { - this.documentNumber = documentNumber; - } - public Long getId() { return id; } @@ -145,11 +109,11 @@ public class OrderRegisterNewRequest { this.updatedAt = updatedAt; } - public LocalDate getClearingDate() { + public Instant getClearingDate() { return clearingDate; } - public void setClearingDate(LocalDate clearingDate) { + public void setClearingDate(Instant clearingDate) { this.clearingDate = clearingDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/UncoveredDealRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/UncoveredDealRegisterNewRequest.java deleted file mode 100644 index bdd06a020..000000000 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/UncoveredDealRegisterNewRequest.java +++ /dev/null @@ -1,235 +0,0 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -public class UncoveredDealRegisterNewRequest { - - @JsonProperty - private Long executionId; - - @JsonProperty - private String companyFullName; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate tradingDate; - - @JsonProperty - private Long exchangeExecutionId; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant exchangeExecutionTime; - - @JsonProperty - private String securitySymbol; - - @JsonProperty - private String securityFullName; - - @JsonProperty - private String sellerFullName; - - @JsonProperty - private String sellerClearingCode; - - @JsonProperty - private String sellerAccount; - - @JsonProperty - private String buyerFullName; - - @JsonProperty - private String buyerClearingCode; - - @JsonProperty - private String buyerAccount; - - @JsonProperty - private BigDecimal amount; - - @JsonProperty - private String resultStatus; - - @JsonProperty - private Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant updatedAt; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate clearingDate; - - public Long getExecutionId() { - return executionId; - } - - public void setExecutionId(Long executionId) { - this.executionId = executionId; - } - - public String getCompanyFullName() { - return companyFullName; - } - - public void setCompanyFullName(String companyFullName) { - this.companyFullName = companyFullName; - } - - public LocalDate getTradingDate() { - return tradingDate; - } - - public void setTradingDate(LocalDate tradingDate) { - this.tradingDate = tradingDate; - } - - public Long getExchangeExecutionId() { - return exchangeExecutionId; - } - - public void setExchangeExecutionId(Long exchangeExecutionId) { - this.exchangeExecutionId = exchangeExecutionId; - } - - public Instant getExchangeExecutionTime() { - return exchangeExecutionTime; - } - - public void setExchangeExecutionTime(Instant exchangeExecutionTime) { - this.exchangeExecutionTime = exchangeExecutionTime; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - - public void setSecuritySymbol(String securitySymbol) { - this.securitySymbol = securitySymbol; - } - - public String getSecurityFullName() { - return securityFullName; - } - - public void setSecurityFullName(String securityFullName) { - this.securityFullName = securityFullName; - } - - public String getSellerFullName() { - return sellerFullName; - } - - public void setSellerFullName(String sellerFullName) { - this.sellerFullName = sellerFullName; - } - - public String getSellerClearingCode() { - return sellerClearingCode; - } - - public void setSellerClearingCode(String sellerClearingCode) { - this.sellerClearingCode = sellerClearingCode; - } - - public String getSellerAccount() { - return sellerAccount; - } - - public void setSellerAccount(String sellerAccount) { - this.sellerAccount = sellerAccount; - } - - public String getBuyerFullName() { - return buyerFullName; - } - - public void setBuyerFullName(String buyerFullName) { - this.buyerFullName = buyerFullName; - } - - public String getBuyerClearingCode() { - return buyerClearingCode; - } - - public void setBuyerClearingCode(String buyerClearingCode) { - this.buyerClearingCode = buyerClearingCode; - } - - public String getBuyerAccount() { - return buyerAccount; - } - - public void setBuyerAccount(String buyerAccount) { - this.buyerAccount = buyerAccount; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public String getResultStatus() { - return resultStatus; - } - - public void setResultStatus(String resultStatus) { - this.resultStatus = resultStatus; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } -} From 680d572385f1848af3ed9e470ec30d40f40bb223 Mon Sep 17 00:00:00 2001 From: aalehin Date: Thu, 11 May 2023 14:37:17 +0300 Subject: [PATCH 2/4] fix up with meta based classes --- .../AdmittedLiabilitiesRegisterService.java | 6 +- .../CoveredLiabilitiesRegisterService.java | 12 +-- .../service/DepoBalanceRegisterService.java | 8 +- ...DepoPaymentInstructionRegisterService.java | 4 +- .../ExcludeLiabilitiesRegisterService.java | 8 +- .../service/ExecutionRegisterService.java | 14 +-- .../service/LiabilitiesRegisterService.java | 9 +- .../service/MoneyBalanceRegisterService.java | 6 +- ...oneyPaymentInstructionRegisterService.java | 8 +- ...AdmittedLiabilitiesRegisterNewRequest.java | 13 +-- .../CoveredLiabilitiesRegisterNewRequest.java | 13 +-- .../DepoBalanceRegisterNewRequest.java | 27 +++--- .../ExcludeLiabilitiesRegisterNewRequest.java | 23 ++--- .../registry/ExecutionRegisterNewRequest.java | 89 ++++++++++--------- .../LiabilitiesRegisterNewRequest.java | 33 +++---- ...yPaymentInstructionRegisterNewRequest.java | 13 +-- 16 files changed, 147 insertions(+), 139 deletions(-) diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java index 3875ddc24..37a601135 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java @@ -7,12 +7,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; -import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; 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.registry.AdmittedLiabilitiesRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; @@ -50,8 +48,8 @@ public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements register.setCompanyId(req.getCompanyId()); register.setAmount(req.getAmount()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); register.setCompanyFullName(req.getCompanyFullName()); admittedLiabilitiesRegisterMap.insert(register); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java index f95c4080a..f658cbdb8 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java @@ -21,22 +21,22 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements private final Imdg coveredLiabilitiesRegisterMap; @Autowired - public CoveredLiabilitiesRegisterService(Consumer< String, Object > kafkaQueue, - Producer< String, Object > kafkaProducer, + public CoveredLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.coveredLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, CoveredLiabilitiesRegister.class); } @Override - public void afterPropertiesSet () { + public void afterPropertiesSet() { callback(CoveredLiabilitiesRegisterNewRequest.class) .setConsumer(this::coveredLiabilitiesRegisterNew) .forDestination(Consts.REGISTRY_COVERED_LIABILITIES_REGISTER_NEW, callbacks::put); init(); } - public void coveredLiabilitiesRegisterNew (BaseRequest userRequest) { + public void coveredLiabilitiesRegisterNew(BaseRequest userRequest) { CoveredLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); log.debug("CoveredLiabilitiesRegisterNewRequest received"); CoveredLiabilitiesRegister register = new CoveredLiabilitiesRegister(); @@ -49,8 +49,8 @@ public class CoveredLiabilitiesRegisterService extends QueueConsumer implements register.setAccount(req.getAccount()); register.setAmount(req.getAmount()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); coveredLiabilitiesRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java index 4bfbb3b64..9ca959a81 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java @@ -7,12 +7,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.AdmittedDealRegister; import ru.clearing.classes.statics.data.register.DepoBalanceRegister; 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.registry.AdmittedDealRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -45,13 +43,13 @@ public class DepoBalanceRegisterService extends QueueConsumer implements Initial log.debug("DepoBalanceRegisterNewRequest received"); DepoBalanceRegister register = new DepoBalanceRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setCompanyId(req.getCompanyId()); register.setSessionId(req.getSessionId()); register.setDepoCode(req.getDepoCode()); register.setQuantity(req.getQuantity()); - register.setSecurityCode(req.getSecurityCode()); + register.setSecuritySymbol(req.getSecuritySymbol()); depoBalanceRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java index 9a05dfdfa..263191948 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java @@ -41,8 +41,8 @@ public class DepoPaymentInstructionRegisterService extends QueueConsumer impleme log.debug("DepoPaymentInstructionRegisterNewRequest received"); DepoPaymentInstructionRegister register = new DepoPaymentInstructionRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setCompanyId(req.getCompanyId()); register.setTradingClearingRegistryType(req.getTradingClearingRegistryType()); register.setTradingClearingRegistry(req.getTradingClearingRegistry()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java index 778300dd1..f56dcd1b7 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -22,8 +22,8 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements @Autowired public ExcludeLiabilitiesRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.excludeLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, ExcludeLiabilitiesRegister.class); } @@ -41,8 +41,8 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements log.debug("ExcludeLiabilitiesRegisterNewRequest received"); ExcludeLiabilitiesRegister register = new ExcludeLiabilitiesRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setSessionId(req.getSessionId()); register.setValidFromDate(req.getValidFromDate()); register.setValidToDate(req.getValidToDate()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java index 5dfcde942..63caff003 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -7,16 +7,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.register.ExecutionRegister; -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.registry.ExecutionRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterUpdateRequest; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; +import static ru.spcex.clearing.imdg.IMDGDistributedNames.Map_ExecutionRegister; + public class ExecutionRegisterService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -27,7 +27,7 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ Producer kafkaProducer, ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); - this.executionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionRegister, ExecutionRegister.class); + this.executionRegisterMap = imdgProvider.getImdg(Map_ExecutionRegister, ExecutionRegister.class); } @Override @@ -49,12 +49,12 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ register.setExchangeExecutionId(req.getExchangeExecutionId()); register.setExchangeExecutionTime(req.getExchangeExecutionTime()); register.setSecurityId(req.getSecurityId()); - register.setSeller(req.getSeller()); + register.setSellerId(req.getSellerId()); register.setSellerClearingCode(req.getSellerClearingCode()); register.setSellerTradingClearingRegister(req.getSellerTradingClearingRegister()); register.setSellerMoneyAccount(req.getSellerMoneyAccount()); register.setSellerDepoAccount(req.getSellerDepoAccount()); - register.setBuyer(req.getBuyer()); + register.setBuyerId(req.getBuyerId()); register.setBuyerClearingCode(req.getBuyerClearingCode()); register.setBuyerTradingClearingRegister(req.getBuyerTradingClearingRegister()); register.setBuyerMoneyAccount(req.getBuyerMoneyAccount()); @@ -62,8 +62,8 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ register.setAmount(req.getAmount()); register.setQuantity(req.getQuantity()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); executionRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java index a99fe279f..f310b589a 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java @@ -10,7 +10,6 @@ import ru.clearing.classes.statics.data.register.LiabilitiesRegister; 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.registry.ExcludeLiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -23,8 +22,8 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial @Autowired public LiabilitiesRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.liabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesRegister, LiabilitiesRegister.class); } @@ -42,8 +41,8 @@ public class LiabilitiesRegisterService extends QueueConsumer implements Initial log.debug("LiabilitiesRegisterNewRequest received"); LiabilitiesRegister register = new LiabilitiesRegister(); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setSessionId(req.getSessionId()); register.setValidFromDate(req.getValidFromDate()); register.setValidToDate(req.getValidToDate()); diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index eb1ca12e6..d4b26a1ba 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -6,12 +6,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import ru.clearing.classes.statics.data.register.DepoBalanceRegister; import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; 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.registry.DepoBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.platform.imdg.api.Imdg; @@ -53,8 +51,8 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia register.setCompanyFullName(req.getCompanyFullName()); register.setCompanyId(req.getCompanyId()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); moneyBalanceRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); } diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java index 055e043ed..a342fac19 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java @@ -22,8 +22,8 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem @Autowired public MoneyPaymentInstructionRegisterService(Consumer kafkaQueue, - Producer kafkaProducer, - ImdgProvider imdgProvider) { + Producer kafkaProducer, + ImdgProvider imdgProvider) { super(kafkaQueue, kafkaProducer); this.moneyPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, MoneyPaymentInstructionRegister.class); } @@ -47,8 +47,8 @@ public class MoneyPaymentInstructionRegisterService extends QueueConsumer implem register.setSender(req.getSender()); register.setAddressee(req.getAddressee()); register.setId(req.getId()); - register.setCreatedAt(req.getCreatedAt()); - register.setUpdatedAt(req.getUpdatedAt()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); register.setClearingDate(req.getClearingDate()); moneyPaymentInstructionRegisterMap.insert(register); log.debug("successfully processed, id {}", register.getId()); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java index f76d06b88..7f03e7c0a 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class AdmittedLiabilitiesRegisterNewRequest { @JsonProperty @@ -36,10 +39,10 @@ public class AdmittedLiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCompanyFullName() { return companyFullName; @@ -129,11 +132,11 @@ public class AdmittedLiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java index 1bcf03ef5..2d4045f76 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class CoveredLiabilitiesRegisterNewRequest { @JsonProperty @@ -36,10 +39,10 @@ public class CoveredLiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCompanyFullName() { return companyFullName; @@ -129,11 +132,11 @@ public class CoveredLiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java index 227b7c042..e3bcaec58 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java @@ -3,13 +3,10 @@ package ru.spcex.clearing.platform.messaging.domain.cud.registry; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.apache.kafka.common.serialization.Deserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; -import java.math.BigInteger; +import java.math.BigDecimal; import java.time.Instant; public class DepoBalanceRegisterNewRequest { @@ -25,15 +22,15 @@ public class DepoBalanceRegisterNewRequest { @JsonProperty private Instant updatedAt; @JsonProperty - private String companyId; + private Long companyId; @JsonProperty private Long sessionId; @JsonProperty private String depoCode; @JsonProperty - private String quantity; + private BigDecimal quantity; @JsonProperty - private String securityCode; + private String securitySymbol; public Long getId() { return id; @@ -59,11 +56,11 @@ public class DepoBalanceRegisterNewRequest { this.updatedAt = updatedAt; } - public String getCompanyId() { + public Long getCompanyId() { return companyId; } - public void setCompanyId(String companyId) { + public void setCompanyId(Long companyId) { this.companyId = companyId; } @@ -83,19 +80,19 @@ public class DepoBalanceRegisterNewRequest { this.depoCode = depoCode; } - public String getQuantity() { + public BigDecimal getQuantity() { return quantity; } - public void setQuantity(String quantity) { + public void setQuantity(BigDecimal quantity) { this.quantity = quantity; } - public String getSecurityCode() { - return securityCode; + public String getSecuritySymbol() { + return securitySymbol; } - public void setSecurityCode(String securityCode) { - this.securityCode = securityCode; + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java index 73d977403..6a0f7ff09 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class ExcludeLiabilitiesRegisterNewRequest { @JsonProperty @@ -40,13 +43,13 @@ public class ExcludeLiabilitiesRegisterNewRequest { @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty - private Instant validFromDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validToDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validToDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty private Instant createdAt; @JsonSerialize(using = InstantSerializer.class) @@ -150,19 +153,19 @@ public class ExcludeLiabilitiesRegisterNewRequest { this.settlementDate = settlementDate; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java index 09f9e2afa..8d87d0b2f 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java @@ -4,41 +4,44 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class ExecutionRegisterNewRequest { - @JsonProperty + @JsonProperty private Long exchangeExecutionId; - @JsonProperty + @JsonProperty private Long securityId; - @JsonProperty - private Long seller; - @JsonProperty + @JsonProperty + private Long sellerId; + @JsonProperty private String sellerClearingCode; - @JsonProperty + @JsonProperty private String sellerTradingClearingRegister; - @JsonProperty + @JsonProperty private String sellerMoneyAccount; - @JsonProperty + @JsonProperty private String sellerDepoAccount; - @JsonProperty - private Long buyer; - @JsonProperty + @JsonProperty + private Long buyerId; + @JsonProperty private String buyerClearingCode; - @JsonProperty + @JsonProperty private String buyerTradingClearingRegister; - @JsonProperty + @JsonProperty private String buyerMoneyAccount; - @JsonProperty + @JsonProperty private String buyerDepoAccount; - @JsonProperty + @JsonProperty private BigDecimal amount; - @JsonProperty + @JsonProperty private BigDecimal quantity; - @JsonProperty + @JsonProperty private Long id; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @@ -48,14 +51,14 @@ public class ExecutionRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant tradingDate; + private LocalDate tradingDate; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty @@ -77,14 +80,6 @@ public class ExecutionRegisterNewRequest { this.securityId = securityId; } - public Long getSeller() { - return seller; - } - - public void setSeller(Long seller) { - this.seller = seller; - } - public String getSellerClearingCode() { return sellerClearingCode; } @@ -117,14 +112,6 @@ public class ExecutionRegisterNewRequest { this.sellerDepoAccount = sellerDepoAccount; } - public Long getBuyer() { - return buyer; - } - - public void setBuyer(Long buyer) { - this.buyer = buyer; - } - public String getBuyerClearingCode() { return buyerClearingCode; } @@ -197,19 +184,19 @@ public class ExecutionRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } - public Instant getTradingDate() { + public LocalDate getTradingDate() { return tradingDate; } - public void setTradingDate(Instant tradingDate) { + public void setTradingDate(LocalDate tradingDate) { this.tradingDate = tradingDate; } @@ -220,4 +207,20 @@ public class ExecutionRegisterNewRequest { public void setExchangeExecutionTime(Instant exchangeExecutionTime) { this.exchangeExecutionTime = exchangeExecutionTime; } + + public Long getSellerId() { + return sellerId; + } + + public void setSellerId(Long sellerId) { + this.sellerId = sellerId; + } + + public Long getBuyerId() { + return buyerId; + } + + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java index feb139839..da5827454 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class LiabilitiesRegisterNewRequest { @JsonProperty @@ -32,10 +35,10 @@ public class LiabilitiesRegisterNewRequest { private String currency; @JsonProperty private BigDecimal sumLiabilities; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant settlementDate; + private LocalDate settlementDate; @JsonSerialize(using = InstantSerializer.class) @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty @@ -44,14 +47,14 @@ public class LiabilitiesRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validFromDate; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant validToDate; + private LocalDate validToDate; public Long getId() { return id; @@ -141,11 +144,11 @@ public class LiabilitiesRegisterNewRequest { this.sumLiabilities = sumLiabilities; } - public Instant getSettlementDate() { + public LocalDate getSettlementDate() { return settlementDate; } - public void setSettlementDate(Instant settlementDate) { + public void setSettlementDate(LocalDate settlementDate) { this.settlementDate = settlementDate; } @@ -165,19 +168,19 @@ public class LiabilitiesRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getValidFromDate() { + public LocalDate getValidFromDate() { return validFromDate; } - public void setValidFromDate(Instant validFromDate) { + public void setValidFromDate(LocalDate validFromDate) { this.validFromDate = validFromDate; } - public Instant getValidToDate() { + public LocalDate getValidToDate() { return validToDate; } - public void setValidToDate(Instant validToDate) { + public void setValidToDate(LocalDate validToDate) { this.validToDate = validToDate; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java index 3b1dee7c8..c1e8c60ad 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java @@ -4,10 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; import java.math.BigDecimal; import java.time.Instant; +import java.time.LocalDate; public class MoneyPaymentInstructionRegisterNewRequest { @JsonProperty @@ -32,10 +35,10 @@ public class MoneyPaymentInstructionRegisterNewRequest { @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - @JsonSerialize(using = InstantSerializer.class) - @JsonDeserialize(using = InstantDeserializer.class) + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty - private Instant clearingDate; + private LocalDate clearingDate; public String getCreditLegAccount() { return creditLegAccount; @@ -109,11 +112,11 @@ public class MoneyPaymentInstructionRegisterNewRequest { this.updatedAt = updatedAt; } - public Instant getClearingDate() { + public LocalDate getClearingDate() { return clearingDate; } - public void setClearingDate(Instant clearingDate) { + public void setClearingDate(LocalDate clearingDate) { this.clearingDate = clearingDate; } } From c002f39111774d17882043931697b6d36f806cf4 Mon Sep 17 00:00:00 2001 From: aalehin Date: Tue, 16 May 2023 12:00:24 +0300 Subject: [PATCH 3/4] http://jira.mfd.msk:8088/browse/CLS-282 --- get requests done --- ...AdmittedLiabilitiesRegisterController.java | 44 ++++++++++++++++++ .../CoveredLiabilitiesRegisterController.java | 44 ++++++++++++++++++ .../DepoBalanceRegisterController.java | 44 ++++++++++++++++++ ...oPaymentInstructionRegisterController.java | 45 +++++++++++++++++++ .../ExcludeLiabilitiesRegisterController.java | 44 ++++++++++++++++++ .../register/ExecutionRegisterController.java | 44 ++++++++++++++++++ .../LiabilitiesRegisterController.java | 44 ++++++++++++++++++ .../MoneyBalanceRegisterController.java | 44 ++++++++++++++++++ ...yPaymentInstructionRegisterController.java | 44 ++++++++++++++++++ 9 files changed, 397 insertions(+) create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java create mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java new file mode 100644 index 000000000..6dcf40871 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/admitted-liabilities-registers") +public class AdmittedLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public AdmittedLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all admittedLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, + AdmittedLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java new file mode 100644 index 000000000..f9b99b600 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/covered-liabilities-registers") +public class CoveredLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public CoveredLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all coveredLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_CoveredLiabilitiesRegister, + CoveredLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java new file mode 100644 index 000000000..012dd7dab --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/depo-balance-registers") +public class DepoBalanceRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public DepoBalanceRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all depoBalanceRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_DepoBalanceRegister, + DepoBalanceRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java new file mode 100644 index 000000000..296b9816c --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java @@ -0,0 +1,45 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/depo-payment-instruction-register") +public class DepoPaymentInstructionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public DepoPaymentInstructionRegisterController(IOperator operator, + IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all depoPaymentInstructionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_DepoPaymentInstructionRegister, + DepoPaymentInstructionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java new file mode 100644 index 000000000..5b367cd44 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/exclude-liabilities-register") +public class ExcludeLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public ExcludeLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all excludeLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, + ExcludeLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java new file mode 100644 index 000000000..17387b6a6 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/execution-registers") +public class ExecutionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public ExecutionRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all executionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_ExecutionRegister, + ExecutionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java new file mode 100644 index 000000000..2f8b1de40 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/liabilities-registers") +public class LiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public LiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all liabilitiesRegister 's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_LiabilitiesRegister, + LiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java new file mode 100644 index 000000000..c079b4c98 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/money-balance-registers") +public class MoneyBalanceRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public MoneyBalanceRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all moneyBalanceRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_MoneyBalanceRegister, + MoneyBalanceRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java new file mode 100644 index 000000000..83fff564d --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +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.ResponseBody; +import ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +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 java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/money-payment-instruction-register") +public class MoneyPaymentInstructionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public MoneyPaymentInstructionRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all moneyPaymentInstructionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, + MoneyPaymentInstructionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} From f4573b3dc5c6a6311cc210596f5ac2542e46df98 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 16 May 2023 14:17:08 +0300 Subject: [PATCH 4/4] =?UTF-8?q?backend-api=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-282=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=8E=D0=BD=D0=B8=D1=82=20=D1=82=D0=B5=D1=81=D1=82,=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=83=20=D0=BF=D0=BE=D0=B4=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oPaymentInstructionRegisterController.java | 2 +- .../ExcludeLiabilitiesRegisterController.java | 2 +- .../src/main/resources/meta/meta.xml | 8 +- .../queue/AbstractControllerTest.java | 8 + ...ttedLiabilitiesRegisterControllerTest.java | 38 + ...eredLiabilitiesRegisterControllerTest.java | 38 + .../DepoBalanceRegisterControllerTest.java | 30 + ...mentInstructionRegisterControllerTest.java | 35 + ...ludeLiabilitiesRegisterControllerTest.java | 42 + .../ExecutionRegisterControllerTest.java | 48 + .../LiabilitiesRegisterControllerTest.java | 43 + .../MoneyBalanceRegisterControllerTest.java | 39 + .../backend-api/src/test/resources/meta.json | 4955 ++++++++--------- 13 files changed, 2579 insertions(+), 2709 deletions(-) create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java create mode 100644 clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java index 296b9816c..8f3517d34 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Map; @Controller -@RequestMapping("/depo-payment-instruction-register") +@RequestMapping("/depo-payment-instruction-registers") public class DepoPaymentInstructionRegisterController extends AbstractQueueController { private final IStateLoader stateLoader; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java index 5b367cd44..5bee23387 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Map; @Controller -@RequestMapping("/exclude-liabilities-register") +@RequestMapping("/exclude-liabilities-registers") public class ExcludeLiabilitiesRegisterController extends AbstractQueueController { private final IStateLoader stateLoader; diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index a8d7dc20a..007a33ae7 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1300,7 +1300,7 @@ - + @@ -1310,7 +1310,7 @@ - + @@ -1377,7 +1377,7 @@ - + @@ -1395,7 +1395,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java index 5e1163d1a..2bc041fdf 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java @@ -115,6 +115,14 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi //payment PaymentInstructionController.class, //register + AdmittedLiabilitiesRegisterController.class, + CoveredLiabilitiesRegisterController.class, + DepoBalanceRegisterController.class, + DepoPaymentInstructionRegisterController.class, + ExcludeLiabilitiesRegisterController.class, + ExecutionRegisterController.class, + LiabilitiesRegisterController.class, + MoneyBalanceRegisterController.class, ContractRegisterController.class, ReportRegisterController.class, //registry diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..62e5ab035 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java @@ -0,0 +1,38 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class AdmittedLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/admitted-liabilities-registers/"; + + /** + * {@link AdmittedLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /admitted-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + AdmittedLiabilitiesRegister admittedLiabilitiesRegister = new AdmittedLiabilitiesRegister(); + admittedLiabilitiesRegister.setId(currentId.get()); + admittedLiabilitiesRegister.setCompanyFullName("fuill nme"); + admittedLiabilitiesRegister.setSessionId(111L); + admittedLiabilitiesRegister.setSecuritySymbol("RUB"); + admittedLiabilitiesRegister.setSecurityFullName("SEC NAME"); + admittedLiabilitiesRegister.setCompanyId(222L); + admittedLiabilitiesRegister.setClearingCode("CCDE"); + admittedLiabilitiesRegister.setAccount("ACC1"); + admittedLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15)); + admittedLiabilitiesRegister.setClearingDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, admittedLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..42b5b7906 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java @@ -0,0 +1,38 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class CoveredLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/covered-liabilities-registers/"; + + /** + * {@link CoveredLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /covered-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + CoveredLiabilitiesRegister coveredLiabilitiesRegister = new CoveredLiabilitiesRegister(); + coveredLiabilitiesRegister.setId(currentId.get()); + coveredLiabilitiesRegister.setCompanyFullName("fuill nme"); + coveredLiabilitiesRegister.setSessionId(111L); + coveredLiabilitiesRegister.setSecuritySymbol("RUB"); + coveredLiabilitiesRegister.setSecurityFullName("SEC NAME"); + coveredLiabilitiesRegister.setCompanyId(222L); + coveredLiabilitiesRegister.setClearingCode("CCDE"); + coveredLiabilitiesRegister.setAccount("ACC1"); + coveredLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15)); + coveredLiabilitiesRegister.setClearingDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, coveredLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java new file mode 100644 index 000000000..e0991d5d1 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java @@ -0,0 +1,30 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +class DepoBalanceRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/depo-balance-registers/"; + + /** + * {@link DepoBalanceRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /depo-balance-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + DepoBalanceRegister depoBalanceRegister = new DepoBalanceRegister(); + depoBalanceRegister.setId(currentId.get()); + depoBalanceRegister.setSessionId(111L); + depoBalanceRegister.setSecuritySymbol("RUB"); + depoBalanceRegister.setCompanyId(222L); + depoBalanceRegister.setDepoCode("DCDE"); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoBalanceRegister, depoBalanceRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java new file mode 100644 index 000000000..e3d54a241 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java @@ -0,0 +1,35 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; + +class DepoPaymentInstructionRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/depo-payment-instruction-registers/"; + + /** + * {@link DepoPaymentInstructionRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /depo-payment-instruction-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + DepoPaymentInstructionRegister depoPaymentInstructionRegister = new DepoPaymentInstructionRegister(); + depoPaymentInstructionRegister.setId(currentId.get()); + depoPaymentInstructionRegister.setCompanyId(currentId.get()); + depoPaymentInstructionRegister.setTradingClearingRegistryType("TR"); + depoPaymentInstructionRegister.setTradingClearingRegistry("REG"); + depoPaymentInstructionRegister.setCbCode("CBCD"); + depoPaymentInstructionRegister.setQuantity(BigDecimal.valueOf(12.15)); + depoPaymentInstructionRegister.setDirection(currentId.get()); + depoPaymentInstructionRegister.setSessionId(currentId.get()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoPaymentInstructionRegister, depoPaymentInstructionRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..79b8a16a9 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java @@ -0,0 +1,42 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class ExcludeLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/exclude-liabilities-registers/"; + + /** + * {@link ExcludeLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /exclude-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + ExcludeLiabilitiesRegister excludeLiabilitiesRegister = new ExcludeLiabilitiesRegister(); + excludeLiabilitiesRegister.setId(currentId.get()); + excludeLiabilitiesRegister.setSessionId(222L); + excludeLiabilitiesRegister.setValidFromDate(LocalDate.now()); + excludeLiabilitiesRegister.setValidToDate(LocalDate.now()); + excludeLiabilitiesRegister.setCompanyId(333L); + excludeLiabilitiesRegister.setCompanyFullName("CompanyFullName"); + excludeLiabilitiesRegister.setInn("Inn"); + excludeLiabilitiesRegister.setSegment("Segment"); + excludeLiabilitiesRegister.setRegistryCode("RegistryCode"); + excludeLiabilitiesRegister.setAccount("Account"); + excludeLiabilitiesRegister.setRegistryStatus("RegistryStatus"); + excludeLiabilitiesRegister.setCurrency("Currency"); + excludeLiabilitiesRegister.setSumLiabilities(BigDecimal.valueOf(12.15)); + excludeLiabilitiesRegister.setSettlementDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, excludeLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java new file mode 100644 index 000000000..40623b6e4 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java @@ -0,0 +1,48 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +class ExecutionRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/execution-registers/"; + + /** + * {@link ExecutionRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /execution-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + ExecutionRegister executionRegister = new ExecutionRegister(); + executionRegister.setId(currentId.get()); + executionRegister.setTradingDate(LocalDate.now()); + executionRegister.setExchangeExecutionId(123L); + executionRegister.setExchangeExecutionTime(Instant.now()); + executionRegister.setSecurityId(123L); + executionRegister.setSellerId(123L); + executionRegister.setSellerClearingCode("CCDE"); + executionRegister.setSellerTradingClearingRegister("TCR"); + executionRegister.setSellerMoneyAccount("MACC-1"); + executionRegister.setSellerDepoAccount("DACC-1"); + executionRegister.setBuyerId(123L); + executionRegister.setBuyerClearingCode("BCCD"); + executionRegister.setBuyerTradingClearingRegister("REG2"); + executionRegister.setBuyerMoneyAccount("BMCCC-12"); + executionRegister.setBuyerDepoAccount("BCCC-12"); + executionRegister.setAmount(BigDecimal.valueOf(14.55)); + executionRegister.setQuantity(BigDecimal.valueOf(0.1)); + executionRegister.setClearingDate(LocalDate.now()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExecutionRegister, executionRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..7b0edaa3d --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java @@ -0,0 +1,43 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class LiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/liabilities-registers/"; + + /** + * {@link LiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + LiabilitiesRegister liabilitiesRegister = new LiabilitiesRegister(); + liabilitiesRegister.setId(currentId.get()); + liabilitiesRegister.setSessionId(111L); + liabilitiesRegister.setValidFromDate(LocalDate.now()); + liabilitiesRegister.setValidToDate(LocalDate.now()); + liabilitiesRegister.setCompanyId(111L); + liabilitiesRegister.setCompanyFullName("Name "); + liabilitiesRegister.setInn("INN"); + liabilitiesRegister.setSegment("SIGSGM-nt"); + liabilitiesRegister.setRegistryCode("REG"); + liabilitiesRegister.setAccount("ACC"); + liabilitiesRegister.setRegistryStatus("ACTV"); + liabilitiesRegister.setCurrency("RUB"); + liabilitiesRegister.setSumLiabilities(BigDecimal.TEN); + liabilitiesRegister.setSettlementDate(LocalDate.now()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_LiabilitiesRegister, liabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java new file mode 100644 index 000000000..680a08424 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java @@ -0,0 +1,39 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; + +class MoneyBalanceRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/money-balance-registers/"; + + /** + * {@link MoneyBalanceRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /money-balance-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister(); + moneyBalanceRegister.setId(currentId.get()); + moneyBalanceRegister.setSetHouseName("setHouseName"); + moneyBalanceRegister.setAccount("account"); + moneyBalanceRegister.setInfoAccount("infoAccount"); + moneyBalanceRegister.setRemainderSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setBlockedSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setUnblockedSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setInn("inn"); + moneyBalanceRegister.setSessionId(456L); + moneyBalanceRegister.setCompanyFullName("companyFullName"); + moneyBalanceRegister.setCompanyId(currentId.get()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_MoneyBalanceRegister, moneyBalanceRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index fc28c822d..36fed19df 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.5.0.19", + "version": "3.5.0.21", "enums": { @@ -978,7 +978,7 @@ , "moneyFlowSide": { - "name": "Справочник направлений", + "name": "Справочник направлений денежного рынка", "class": "ru.clearing.platform.dictionary.MoneyFlowSideDictionary", @@ -999,128 +999,13 @@ ] } , - "chargeDirection": { + "side": { - "name": "Направление начисления комиссии", + "name": "Справочник направлений", - "class": "ru.clearing.platform.dictionary.ChargeDirectionDictionary", + "class": "ru.clearing.platform.dictionary.SideDictionary", - "table": "charge_direction_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Направление комиссии","shortname": "Направление комиссии","type": 2,"length": 50 - } - ] - } - , - "chargeType": { - - "name": "Справочник типов комиссий", - - "class": "ru.clearing.platform.dictionary.ChargeTypeDictionary", - - "table": "charge_type_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Тип комиссии","shortname": "Тип комиссии","type": 2,"length": 50 - } - ] - } - , - "courierType": { - - "name": "Способ доставки документа", - - "class": "ru.clearing.platform.dictionary.CourierTypeDictionary", - - "table": "courier_type_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Способ доставки","shortname": "Способ доставки","type": 2,"length": 50 - } - ] - } - , - "transactionStatus": { - - "name": "Справочник статусов транзакций", - - "class": "com.spicex.dictionary.TransactionStatusDictionary", - - "table": "transaction_status_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор записи","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Статус транзакции","shortname": "Статус","type": 2,"length": 50 - } - ] - } - , - "clearingStatus": { - - "name": "Справочник результатов клиринга", - - "class": "com.spicex.dictionary.ClearingStatusDictionary", - - "table": "clearing_status_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор записи","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Наименование","shortname": "Тип","type": 2,"length": 255 - } - ] - } - , - "inOutDirection": { - - "name": "Справочник значений направления денежного потока", - - "class": "ru.clearing.platform.dictionary.InOutDirectionDictionary", - - "table": "in_out_direction_dictionary", + "table": "side_dictionary", "fields": [ {"code": "id", @@ -1136,6 +1021,52 @@ } ] } + , + "marketCode": { + + "name": "Справочник кодов рынков", + + "class": "ru.clearing.platform.dictionary.MarketCodeDictionary", + + "table": "market_code_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Значение","shortname": "Значение","type": 2,"length": 255 + } + ] + } + , + "marketType": { + + "name": "Справочник типов торгов", + + "class": "com.spicex.dictionary.MarketTypeDictionary", + + "table": "market_type_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор записи","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Наименование","shortname": "Тип","type": 2,"length": 255 + } + ] + } , "statementType": { @@ -1205,127 +1136,12 @@ } ] } - , - "balanceAccountType": { - - "name": "Справочник типов лимитов", - - "class": "com.spicex.platform.dictionary.balanceAccountTypeDictionary", - - "table": "balance_account_type_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Тип лимитов","shortname": "Тип","type": 2,"length": 50 - } - ] - } - , - "resultStatus": { - - "name": "Статус обработки", - - "class": "com.spicex.dictionary.ResultStatusDictionary", - - "table": "result_status_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор записи","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Статус обработки","shortname": "Статус","type": 2,"length": 255 - } - ] - } - , - "managementJournalStatus": { - - "name": "Справочник статусов журнала мониторинга и контроля", - - "class": "ru.clearing.platform.dictionary.managementJournalStatusDictionary", - - "table": "management_journal_status_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Статус сообщения","shortname": "Наименование","type": 2,"length": 50 - } - ] - } - , - "managementJournalType": { - - "name": "Справочник типов записей в журнале мониторинга и контроля", - - "class": "ru.clearing.platform.dictionary.managementJournalTypeDictionary", - - "table": "management_journal_type_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Тип записи","shortname": "Наименование","type": 2,"length": 50 - } - ] - } - , - "managementJournalPurpose": { - - "name": "Справочник целей записей в журнале мониторинга и контроля", - - "class": "ru.clearing.platform.dictionary.managementJournalPurposeDictionary", - - "table": "management_journal_purpose_dictionary", - - "fields": [ - {"code": "id", - "name": "Идентификатор","shortname": "ID","type": 1 - } - , - {"code": "code", - "name": "Код","shortname": "Код","type": 12 - } - , - {"code": "name", - "name": "Тип записи","shortname": "Наименование","type": 2,"length": 50 - } - ] - } , "inOutSDfType": { "name": "Справочник типов входящих и исходящих записей", - "class": "ru.clearing.platform.dictionary.inOutSDfTypeDictionary", + "class": "ru.clearing.platform.dictionary.InOutSDfTypeDictionary", "table": "in_out_s_df_type_dictionary", @@ -1343,6 +1159,52 @@ } ] } + , + "inOutDirection": { + + "name": "Справочник значений направлений денежного потока", + + "class": "ru.clearing.platform.dictionary.InOutDirectionDictionary", + + "table": "in_out_direction_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Значение","shortname": "Значение","type": 2,"length": 255 + } + ] + } + , + "transactionStatus": { + + "name": "Справочник статусов транзакций", + + "class": "com.spicex.dictionary.TransactionStatusDictionary", + + "table": "transaction_status_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор записи","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Статус транзакции","shortname": "Статус","type": 2,"length": 50 + } + ] + } , "objectType": { @@ -1389,10 +1251,125 @@ } ] } + , + "managementJournalType": { + + "name": "Справочник типов записей в журнале мониторинга и контроля", + + "class": "ru.clearing.platform.dictionary.ManagementJournalTypeDictionary", + + "table": "management_journal_type_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Тип записи","shortname": "Наименование","type": 2,"length": 50 + } + ] + } + , + "managementJournalPurpose": { + + "name": "Справочник целей записей в журнале мониторинга и контроля", + + "class": "ru.clearing.platform.dictionary.ManagementJournalPurposeDictionary", + + "table": "management_journal_purpose_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Тип записи","shortname": "Наименование","type": 2,"length": 50 + } + ] + } + , + "managementJournalStatus": { + + "name": "Справочник статусов журнала мониторинга и контроля", + + "class": "ru.clearing.platform.dictionary.ManagementJournalStatusDictionary", + + "table": "management_journal_status_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Статус сообщения","shortname": "Наименование","type": 2,"length": 50 + } + ] + } + , + "courierType": { + + "name": "Справочник способов доставки документа", + + "class": "ru.clearing.platform.dictionary.CourierTypeDictionary", + + "table": "courier_type_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Способ доставки","shortname": "Способ доставки","type": 2,"length": 50 + } + ] + } + , + "resultStatus": { + + "name": "Справочник статусов обработки", + + "class": "ru.clearing.platform.dictionary.ResultStatusDictionary", + + "table": "result_status_dictionary", + + "fields": [ + {"code": "id", + "name": "Идентификатор записи","shortname": "ID","type": 1 + } + , + {"code": "code", + "name": "Код","shortname": "Код","type": 12 + } + , + {"code": "name", + "name": "Статус обработки","shortname": "Статус","type": 2,"length": 255 + } + ] + } , "eventType": { - "name": "Типы изменений записей", + "name": "Справочник типов изменений записей", "class": "ru.clearing.platform.dictionary.EventTypeDictionary", @@ -1619,7 +1596,7 @@ } , {"code": "errorCodeId", - "type": 1,"name": "Код ошибки","shortname": "Код ошибки","searchable": true,"sortable": true,"link": "errorCode","linkCode": "code" + "type": 1,"dbname": "Идентификатор кода ошибки","name": "Код ошибки","shortname": "Код ошибки","searchable": true,"sortable": true,"link": "errorCode","linkCode": "code" } , {"code": "errorTextId", @@ -1691,7 +1668,7 @@ "name": "Добавление компании", - "confirmation": "shortName,tradingCode,companySymbol,companySymbolValue,workflowStatus", + "confirmation": "shortName,fullName,companySymbol,companySymbolValue,workflowStatus", "fields": [ {"code": "shortName", @@ -1703,7 +1680,7 @@ } , {"code": "companySymbol", - "type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","required": true,"link": "companySymbol" + "type": 12,"name": "Тип реквизита","shortname": "Тип реквизита","required": true,"link": "companySymbol","linkCode": "shortname" } , {"code": "companySymbolValue", @@ -1971,6 +1948,25 @@ } ] ,"actions":[ + {"method":"post", + + "name": "Добавление контакта компании", + + "fields": [ + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true + } + , + {"code": "contactType", + "type": 12,"name": "Наименование типа контакта","shortname": "Тип контакта","link": "contactType","required": true + } + , + {"code": "contactValue", + "type": 2,"length": 255,"name": "Значение контакта","shortname": "Значение","required": true + } + ] + } + , {"method":"put", "name": "Изменение контакта компании", @@ -1980,13 +1976,24 @@ "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "contact","linkCode": "id","required": true } , - {"code": "contactType", - "type": 12,"name": "Наименование типа контакта","shortname": "Тип контакта","link": "contactType" + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" } , {"code": "contactValue", "type": 2,"length": 255,"name": "Значение контакта","shortname": "Значение" } + ] + } + , + {"method":"delete", + + "name": "Удаление контакта компании", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "contact","linkCode": "id","required": true + } ] } ] @@ -2221,22 +2228,52 @@ } ] ,"actions":[ + {"method":"post", + + "name": "Добавление реквизита компании", + + "fields": [ + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","required": true + } + , + {"code": "companySymbol", + "type": 12,"name": "Наименование типа реквизита","shortname": "Тип реквизита","link": "companySymbol","required": true + } + , + {"code": "companySymbolValue", + "type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение","required": true + } + ] + } + , {"method":"put", - "name": "Изменение реквизитов компании", + "name": "Изменение реквизита компании", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "companySymbols","linkCode": "id","required": true } , - {"code": "companySymbol", - "type": 12,"name": "Наименование типа реквизита","shortname": "Тип реквизита","link": "companySymbol" + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" } , {"code": "companySymbolValue", "type": 2,"length": 255,"name": "Значение реквизита","shortname": "Значение" } + ] + } + , + {"method":"delete", + + "name": "Удаление реквизита компании", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "profileDocument","linkCode": "id","required": true + } ] } ] @@ -2456,7 +2493,7 @@ ,"actions":[ {"method":"post", - "name": "Добавление инструмента", + "name": "Добавление инструмента Денежного рынка", "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", @@ -2529,7 +2566,7 @@ , {"method":"put", - "name": "Изменение инструмента", + "name": "Изменение инструмента Денежного рынка", "confirmation": "securitySymbol,shortName,fullName,lotSize,nominalValue,nominalCurrency,startDate,endDate,termType", @@ -2606,7 +2643,7 @@ , {"method":"delete", - "name": "Блокировка инструмента", + "name": "Блокировка инструмента Денежного рынка", "confirmation": "securitySymbol,shortName", @@ -3223,7 +3260,7 @@ } , {"code": "code", - "type": 12,"name": "Код рынка","shortname": "Код","searchable": true,"sortable": true + "type": 12,"name": "Код рынка","shortname": "Код","searchable": true,"sortable": true,"link": "marketCode" } , {"code": "settlementCurrency", @@ -3233,6 +3270,10 @@ {"code": "section", "type": 12,"dbname": "Код секции","name": "Наименование секции","shortname": "Секция","searchable": true,"sortable": true,"visible": true,"link": "section" } + , + {"code": "marketType", + "type": 12,"dbname": "Тип торгов на рынке","name": "Тип торгов на рынке","shortname": "Тип торгов на рынке","searchable": true,"sortable": true,"visible": true,"link": "marketType" + } , {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true @@ -3455,7 +3496,7 @@ "type": 1,"dbname": "Идентификатор денежного счета","name": "Номер денежного счета","shortname": "Денежный счет","searchable": true,"sortable": true,"link": "account" } , - {"code": "depoAaccountId", + {"code": "depoAccountId", "type": 1,"dbname": "Идентификатор депозитарного счета","name": "Номер депозитарного счета","shortname": "Депозитарный счет","searchable": true,"sortable": true,"link": "account" } , @@ -3718,12 +3759,12 @@ "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } , - {"code": "paymentId", - "type": 1,"dbname": "Идентификатор платежа","name": "Платеж","shortname": "Платеж","searchable": true,"sortable": true + {"code": "sessionType", + "type": 12,"dbname": "Код типа клиринговой сессии","name": "Тип клиринговой сессии","shortname": "Тип","searchable": true,"sortable": true,"visible": true,"link": "sessionType" } , - {"code": "refundPaymentId", - "type": 1,"dbname": "Идентификатор обратного платежа","name": "Обратный платежа","shortname": "Обратный платеж","searchable": true,"sortable": true + {"code": "paymentId", + "type": 1,"dbname": "Идентификатор платежа","name": "Платеж","shortname": "Платеж","searchable": true,"sortable": true } , {"code": "id", @@ -3828,11 +3869,11 @@ } , {"code": "companyId", - "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName" + "type": 1,"name": "Наименование компании","shortname": "Компания","link": "company","linkCode": "shortName","enabled": false } , {"code": "account", - "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет" + "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет","enabled": false } , {"code": "status", @@ -3971,19 +4012,19 @@ } , {"code": "destination", - "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "iban", - "type": 2,"length": 255,"name": "Международный номер банковского счета","shortname": "Международный номер банковского счета","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Международный номер банковского счета","shortname": "Международный номер банковского счета","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "internationalTransferSign", - "type": 12,"dbname": "Код доступности международных переводов","name": "Доступность международных переводов","shortname": "Международные переводы","searchable": true,"sortable": true,"visible": true,"link": "allowed" + "type": 12,"dbname": "Код доступности международных переводов","name": "Доступность международных переводов","shortname": "Международные переводы","searchable": true,"sortable": true,"visible": true,"link": "allowed","ignore": true } , {"code": "swiftCode", - "type": 2,"length": 255,"name": "Код SWIFT","shortname": "SWIFT","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Код SWIFT","shortname": "SWIFT","searchable": true,"sortable": true,"visible": true,"ignore": true } , {"code": "taxpayerIdentificationNumber", @@ -4047,7 +4088,7 @@ } , {"code": "destination", - "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","required": true + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": false } , {"code": "companyId", @@ -4066,6 +4107,10 @@ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "bankAccount","linkCode": "id","required": true } + , + {"code": "currency", + "type": 12,"name": "Код валюты","shortname": "Валюта","link": "currencyCode","linkCode": "code" + } , {"code": "bankIdentificationCode", "type": 2,"length": 255,"name": "Банковский идентификационный код (БИК)","shortname": "БИК" @@ -4082,14 +4127,6 @@ {"code": "correspondentAccountName", "type": 2,"length": 255,"name": "Наименование корреспондентского счета","shortname": "Наименование корр. счета" } - , - {"code": "currency", - "type": 12,"name": "Код валюты","shortname": "Валюта","link": "currencyCode","linkCode": "code" - } - , - {"code": "destination", - "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа" - } , {"code": "taxpayerIdentificationNumber", "type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН" @@ -4102,6 +4139,10 @@ {"code": "account", "type": 2,"length": 50,"name": "Номер счета","shortname": "Счет" } + , + {"code": "destination", + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": false + } ] } , @@ -4214,130 +4255,6 @@ } ] - } - , - "sDf51": { - - "name": "ДФ-51 Запрос остатков по всем счетам", - - "class": "ru.clearing.classes.statics.data.sdf.SDf51", - - "table": "s_df_51", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "number", - "type": 2,"length": 10,"name": "Номер запроса остатков по счетам","shortname": "Номер запроса","searchable": true,"sortable": true,"visible": true - } - , - {"code": "datetime", - "type": 2,"length": 13,"name": "Дата и время сообщения","shortname": "Дата и время сообщения","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf52": { - - "name": "ДФ-52 Из ПРЦ в КС Информация о состоянии счета (блокировка/разблокировка/закрытие/открытие)", - - "class": "ru.clearing.classes.statics.data.sdf.SDf52", - - "table": "s_df_52", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "account", - "type": 2,"length": 25,"name": "Код счета участника клиринга","shortname": "Код счета УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "acc_name", - "type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "deal", - "type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "date", - "type": 2,"lenght": "8","name": "Дата изменения состояния счета","shortname": "Дата изменения состояния счета","searchable": true,"sortable": true - } - , - {"code": "status", - "type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true - } - , - {"code": "fileName", - "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время обработки файла","shortname": "Дата и время обработки","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf53": { - - "name": "ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие)", - - "class": "ru.clearing.classes.statics.data.sdf.SDf53", - - "table": "s_df_53", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "account", - "type": 2,"length": 25,"name": "Код счета участника клиринга","shortname": "Код счета УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "deal", - "type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "status", - "type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true - } - , - {"code": "result", - "type": 10,"name": "Код завершения операции","shortname": "Код завершения операции","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - , - {"code": "inSDfId", - "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true - } - ] - } , "plannerTemplate": { @@ -5125,6 +5042,17 @@ "name": "Сформировать реестр на текущий день", + "fields": [] + } + , + {"method":"post", + + "destination": "GORD", + + "group": "Клиринг", + + "name": "Формирование реестра распоряжений, направленных расчетному депозитарию", + "fields": [] } ] @@ -5492,7 +5420,7 @@ } , {"code": "sessionId", - "type": 1,"name": "Сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } , {"code": "id", @@ -5644,282 +5572,69 @@ } , {"code": "sessionId", - "type": 1,"dbname": "Идентификатор сессии","name": "Сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } ] } , - "clearmemberRegister": { + "depoBalanceRegister": { - "name": "Реестр участников клиринга", + "name": "Реестр остатков ценных бумаг", - "destination": "clearmember-registers", + "destination": "depo-balance-registers", - "serviceProduct": "MKR", + "class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister", - "class": "ru.clearing.classes.statics.data.misc.ClearMemberRegister", - - "table": "clearmember_register", + "table": "balance_depo_register", "fields": [ - {"code": "tradingCode", - "type": 2,"length": 255,"name": "Код участника торгов","shortname": "Торговый код","searchable": true,"sortable": true,"visible": true - } - , - {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код","searchable": true,"sortable": true,"visible": true - } - , - {"code": "fullName", - "type": 2,"length": 255,"name": "Полное наименование участника клиринга","shortname": "Полное наименование","searchable": true,"sortable": true,"visible": true - } - , - {"code": "shortName", - "type": 2,"length": 255,"name": "Краткое наименование участника клиринга","shortname": "Краткое наименование","searchable": true,"sortable": true,"visible": true - } - , - {"code": "categoryList", - "type": 12,"name": "Категория участника клиринга","shortname": "Категория","searchable": true,"sortable": true,"visible": true,"link": "clearingCategory" - } - , - {"code": "corporationSole", - "type": 12,"name": "Единоличный исполнительный орган","shortname": "Исполнительный орган","searchable": true,"sortable": true,"visible": true,"link": "corporationSoleType" - } - , - {"code": "account", - "type": 2,"length": 50,"name": "Счета","shortname": "Счет","searchable": true,"sortable": true,"visible": true - } - , - {"code": "bank", - "type": 1,"name": "Наименование банка","shortname": "Банк","searchable": true,"sortable": true,"visible": true,"link": "bankAccount" - } - , - {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Банк","searchable": true,"sortable": true,"visible": true - } - , - {"code": "inn", - "type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true - } - , - {"code": "bic", - "type": 2,"length": 255,"name": "Банковский идентификационный код (БИК)","shortname": "БИК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "ogrn", - "type": 2,"length": 255,"name": "Основной государственный регистрационный номер","shortname": "ОГРН","searchable": true,"sortable": true,"visible": true - } - , - {"code": "cpp", - "type": 2,"length": 255,"name": "Код причины постановки (КПП)","shortname": "КПП","searchable": true,"sortable": true,"visible": true - } - , - {"code": "ocpo", - "type": 2,"length": 255,"name": "Код в Общероссийском классификаторе предприятий","shortname": "ОКПО","searchable": true,"sortable": true,"visible": true - } - , - {"code": "contractNumber", - "type": 2,"name": "Номер договора","shortname": "Договор","searchable": true,"sortable": true,"visible": true,"length": 255 - } - , - {"code": "contractDate", - "type": 6,"name": "Дата выдачи","shortname": "Выдача","searchable": true,"sortable": true - } - , - {"code": "registrationDate", - "type": 6,"name": "Дата регистрации","shortname": "Регистрация","searchable": true,"sortable": true,"visible": true - } - , - {"code": "systemDate", - "type": 6,"name": "Системная дата","shortname": "Системная дата","searchable": true,"sortable": true - } - , - {"code": "accessDate", - "type": 4,"name": "Дата допуска к КО","shortname": "Допуска к КО","searchable": true,"sortable": true - } - , - {"code": "suspentionDate", - "type": 4,"name": "Дата приостановления","shortname": "Приостановлено","searchable": true,"sortable": true - } - , - {"code": "reopeningDate", - "type": 4,"name": "Дата возобновления","shortname": "Возобновлено","searchable": true,"sortable": true - } - , - {"code": "closeDate", - "type": 4,"name": "Дата прекращения","shortname": "Прекращено","searchable": true,"sortable": true - } - , - {"code": "exclusionDate", - "type": 4,"name": "Дата исключения из реестра","shortname": "Исключено из реестра","searchable": true,"sortable": true - } - , - {"code": "address", - "type": 2,"length": 255,"name": "Адрес местонахождения","shortname": "Адрес","searchable": true,"sortable": true,"visible": true - } - , - {"code": "email", - "type": 2,"length": 255,"name": "Электронная почта","shortname": "Почта","searchable": true,"sortable": true,"visible": true - } - , {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } , {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "companyId", + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" + } + , + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + } + , + {"code": "depoCode", + "type": 2,"length": 50,"name": "Код раздела субсчета/счета депо","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 11,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securitySymbol", + "type": 2,"length": 255,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true } ] } , - "clearmemberRegisterChange": { - - "name": "Журнал изменений информации участников клиринга", - - "table": "clearmember_register_change", - - "fields": [ - {"code": "date", - "type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код","searchable": true,"sortable": true,"visible": true - } - , - {"code": "comment", - "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"visible": true - } - ] - - } - , - "keyRate": { - - "name": "Ключевая ставка ЦБ", - - "destination": "utilities/key-rates", - - "class": "ru.clearing.classes.statics.data.misc.KeyRate", - - "table": "key_rate", - - "fields": [ - {"code": "rate", - "type": 10,"name": "Ключевая ставка ЦБ","shortname": "Ставка","searchable": true,"sortable": true,"visible": true - } - , - {"code": "startDate", - "type": 6,"name": "Дата начала действия ключевой ставки","shortname": "Начальная дата","searchable": true,"sortable": true,"visible": true - } - , - {"code": "endDate", - "type": 6,"name": "Дата окончания действия ключевой ставки","shortname": "Конечная дата","searchable": true,"sortable": true,"visible": true - } - , - {"code": "document", - "type": 2,"length": 255,"name": "Документ ЦБ, регламентирующий установку величины ключевой ставки","shortname": "Документ ЦБ","searchable": true,"sortable": true,"visible": true - } - , - {"code": "workflowStatus", - "type": 12,"name": "Статус","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "workflowStatus" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - ] - ,"actions":[ - {"method":"post", - - "name": "Добавление ключевой ставки ЦБ", - - "fields": [ - {"code": "rate", - "type": 10,"name": "Ключевая ставка ЦБ","shortname": "Ставка","required": true - } - , - {"code": "startDate", - "type": 6,"name": "Дата начала действия ключевой ставки","shortname": "Начальная дата","required": true - } - , - {"code": "endDate", - "type": 6,"name": "Дата окончания действия ключевой ставки","shortname": "Конечная дата","required": true - } - , - {"code": "document", - "type": 2,"length": 255,"name": "Документ ЦБ","shortname": "Документ ЦБ","required": true - } - ] - } - , - {"method":"put", - - "name": "Изменение ключевой ставки ЦБ", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "keyRate","linkCode": "id","required": true - } - , - {"code": "rate", - "type": 10,"name": "Ключевая ставка ЦБ","shortname": "Ставка" - } - , - {"code": "startDate", - "type": 6,"name": "Дата начала действия ключевой ставки","shortname": "Начальная дата" - } - , - {"code": "endDate", - "type": 6,"name": "Дата окончания действия ключевой ставки","shortname": "Конечная дата" - } - , - {"code": "document", - "type": 2,"length": 255,"name": "Документ ЦБ","shortname": "Документ ЦБ" - } - ] - } - , - {"method":"delete", - - "name": "Удаление ключевой ставки ЦБ", - - "confirmation": "rate,document", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "keyRate","linkCode": "id","required": true - } - ] - } - ] - } - , - "balanceRegister": { + "moneyBalanceRegister": { "name": "Реестр остатков денежных средств", - "destination": "balance-registers", + "destination": "money-balance-registers", - "class": "ru.clearing.classes.statics.data.misc.BalanceRegister", + "class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister", - "table": "balance_register", + "table": "money_balance_register", "fields": [ - {"code": "sDf01Date", - "type": 4,"name": "Дата создания записи в S_DF01","shortname": "Дата создания записи в S_DF01","searchable": true,"sortable": true - } - , - {"code": "currencyCode", - "type": 12,"name": "Код валюты","shortname": "Валюта","link": "currencyCode" - } - , {"code": "setHouseName", "type": 2,"length": 255,"name": "Наименование РО","shortname": "Наименование РО","searchable": true,"sortable": true,"visible": true } @@ -5933,7 +5648,7 @@ } , {"code": "remainderSum", - "type": 10,"name": "Остаток денежных средст","shortname": "Остаток","searchable": true,"sortable": true + "type": 10,"name": "Остаток денежных средств","shortname": "Остаток","searchable": true,"sortable": true } , {"code": "blockedSum", @@ -5948,24 +5663,16 @@ "type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true } , - {"code": "market", - "type": 1,"name": "Сегмент рынка","shortname": "Сегмент рынка","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "name" + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } , - {"code": "fullName", - "type": 2,"length": 255,"name": "Наименование Участника Клиринга","shortname": "Участник Клиринга","searchable": true,"sortable": true,"visible": true - } - , - {"code": "typeRemains", - "type": 12,"name": "Тип остатка","shortname": "Тип остатка","searchable": true,"sortable": true,"visible": true - } - , - {"code": "docNumber", - "type": 2,"length": 255,"name": "Номер документа","shortname": "Номер","searchable": true,"sortable": true,"visible": true + {"code": "companyFullName", + "type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true } , {"code": "companyId", - "type": 1,"name": "Компания","shortname": "Компания","searchable": false,"sortable": false,"visible": true,"link": "company","linkCode": "shortName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "id", @@ -5973,623 +5680,119 @@ } , {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true } ] } , - "managementJournal": { + "admittedLiabilitiesRegister": { - "name": "Журнал мониторинга и контроля", + "name": "Реестр обязательств, допущенных к клирингу", - "destination": "management-journals", + "destination": "admitted-liabilities-registers", - "class": "ru.clearing.classes.statics.data.journal.ManagementJournal", + "class": "ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister", - "table": "management_journal", + "table": "admitted_liabilities_register", "fields": [ + {"code": "companyFullName", + "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" + } + , + {"code": "securitySymbol", + "type": 2,"length": 255,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","searchable": true,"sortable": true,"visible": true + } + , + {"code": "securityFullName", + "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Полное наименование инструмента","searchable": true,"sortable": true,"visible": false + } + , {"code": "companyId", - "type": 1,"name": "Участник","shortname": "Участник","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" - } - , - {"code": "userId", - "type": 1,"name": "Автор сообщения","shortname": "Сотрудник","searchable": true,"sortable": true,"visible": true,"link": "userCls" - } - , - {"code": "managementJournalType", - "type": 12,"name": "Тип мониторинга","shortname": "Тип","searchable": true,"sortable": true,"visible": true,"link": "managementJournalType" - } - , - {"code": "managementJournalPurpose", - "type": 12,"name": "Цель мониторинга","shortname": "Цель","searchable": true,"sortable": true,"visible": true,"link": "managementJournalPurpose" - } - , - {"code": "managementJournalStatus", - "type": 12,"name": "Статус","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "managementJournalStatus" - } - , - {"code": "text", - "type": 2,"name": "Сообщение","shortname": "Сообщение","searchable": true,"visible": true,"sortable": true,"length": 4096 - } - , - {"code": "changeAccessSign", - "type": 12,"name": "Признак изменения доступа","shortname": "Изменение доступа","searchable": true,"sortable": true,"visible": true,"link": "allowed" - } - , - {"code": "changeDataSign", - "type": 12,"name": "Признак изменения данных","shortname": "Изменение данных","searchable": true,"sortable": true,"visible": true,"link": "allowed" - } - , - {"code": "eventDate", - "type": 4,"name": "Дата события ЕГРЮЛ","shortname": "Дата события","searchable": true,"sortable": true - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 4,"name": "Создано","shortname": "Создано","searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Изменено","shortname": "Изменено","searchable": true,"sortable": true - } - ] - - } - , - "inDocumentJournal": { - - "name": "Журнал входящих документов", - - "destination": "in-document-journals", - - "class": "ru.clearing.classes.statics.data.journal.InDocumentJournal", - - "table": "in_document_journal", - - "fields": [ - {"code": "registrationDate", - "type": 6,"name": "Дата регистрации","shortname": "Дата","searchable": true,"sortable": true,"visible": true - } - , - {"code": "registrationTime", - "type": 5,"name": "Время регистрации","shortname": "Время","searchable": true,"sortable": true,"visible": true - } - , - {"code": "registrationNumber", - "type": 1,"name": "Регистационный номер","shortname": "Регистационный номер","searchable": true,"sortable": true,"visible": true - } - , - {"code": "documentName", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sender", - "type": 2,"length": 255,"name": "Полное наименование отправителя","shortname": "Отправителя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "quantity", - "type": 1,"name": "Количествово экземпляров","shortname": "Кол-во экз.","searchable": true,"sortable": true,"visible": true + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код Участника Клиринга","shortname": "Код УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "courierType", - "type": 12,"name": "Способ отправки","shortname": "Способ отправки","searchable": true,"sortable": true,"visible": true,"link": "courierType" - } - , - {"code": "emailDate", - "type": 6,"name": "Дата отправки электронной почтой","shortname": "Дата отправки эл. почтой","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Сумма","shortname": "Сумма","searchable": true,"sortable": true,"visible": true - } - , - {"code": "dossierNumber", - "type": 2,"length": 50,"name": "Номер дела","shortname": "Дело №","searchable": true,"sortable": true,"visible": true - } - , - {"code": "comment", - "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"visible": true - } - , - {"code": "receiptDate", - "type": 6,"name": "Дата получения оригинала","shortname": "Дата получения","searchable": true,"sortable": true,"visible": true - } - , - {"code": "resultStatus", - "type": 12,"name": "Статус загрузки документа","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "№п/п","searchable": true,"sortable": true - } - ] - - } - , - "outDocumentJournal": { - - "name": "Журнал исходящих документов", - - "destination": "out-document-journals", - - "class": "ru.clearing.classes.statics.data.journal.OutDocumentJournal", - - "table": "out_document_journal", - - "fields": [ - {"code": "registrationDate", - "type": 6,"name": "Дата регистрации","shortname": "Дата","searchable": true,"sortable": true,"visible": true - } - , - {"code": "registrationTime", - "type": 5,"name": "Время регистрации","shortname": "Время","searchable": true,"sortable": true,"visible": true - } - , - {"code": "registrationNumber", - "type": 1,"name": "Регистационный номер","shortname": "Регистационный номер","searchable": true,"sortable": true,"visible": true - } - , - {"code": "documentName", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true - } - , - {"code": "addressee", - "type": 2,"length": 255,"name": "Полное наименование получателя","shortname": "Получатель","searchable": true,"sortable": true,"visible": true - } - , - {"code": "quantity", - "type": 1,"name": "Количествово экземпляров","shortname": "Кол-во экз.","searchable": true,"sortable": true,"visible": true - } - , - {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код Участника Клиринга","shortname": "Код УК","searchable": true,"sortable": true,"visible": true - } - , - {"code": "courierType", - "type": 12,"name": "Способ отправки","shortname": "Способ отправки","searchable": true,"sortable": true,"visible": true,"link": "courierType" - } - , - {"code": "emailDate", - "type": 6,"name": "Дата отправки электронной почтой","shortname": "Дата отправки эл. почтой","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Сумма","shortname": "Сумма","searchable": true,"sortable": true,"visible": true - } - , - {"code": "dossierNumber", - "type": 2,"length": 50,"name": "Номер дела","shortname": "Дело №","searchable": true,"sortable": true,"visible": true - } - , - {"code": "postDate", - "type": 6,"name": "Дата почтового отправления","shortname": "Дата отправления","searchable": true,"sortable": true,"visible": true - } - , - {"code": "resultStatus", - "type": 12,"name": "Статус выгрузки документа","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "№п/п","searchable": true,"sortable": true - } - ] - - } - , - "dealRegister": { - - "name": "Реестр сделок", - - "destination": "deal-registers", - - "class": "ru.clearing.classes.statics.data.register.DealRegister", - - "table": "deal_register", - - "fields": [ - {"code": "executionId", - "type": 1,"name": "Идентификационный номер сделки в Клиринговой системе","shortname": "Номер сделки КС","visible": false,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionId", - "type": 1,"name": "Идентификационный номер сделки в Торговой системе","shortname": "Номер сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionTime", - "type": 4,"name": "Время заключения сделки в Торговой системе","shortname": "Время заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "tradingDate", - "type": 6,"name": "Дата заключения сделки","shortname": "Дата заключения сделки","visible": true,"searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код компании","searchable": true,"sortable": true,"visible": true } , {"code": "account", - "type": 2,"length": 50,"name": "Торговый счет","shortname": "Счет","visible": true,"searchable": true,"sortable": true - } - , - {"code": "market", - "type": 12,"name": "Секция финансового инструмента","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkCode": "name" - } - , - {"code": "price", - "type": 10,"name": "Ставка по депозиту","shortname": "Ставка, %","visible": true,"searchable": true,"sortable": true + "type": 2,"length": 50,"name": "Счет компании","shortname": "Счет компании","searchable": true,"sortable": true,"visible": true } , {"code": "amount", - "type": 11,"name": "Сумма сделки","shortname": "Сумма сделки","visible": true,"searchable": true,"sortable": true + "type": 10,"name": "Сумма обязательств","shortname": "Сумма обязательств","searchable": true,"sortable": true,"visible": true } , - {"code": "side", - "type": 12,"name": "Направление сделки","shortname": "Направление","visible": true,"searchable": true,"sortable": true,"link": "moneyFlowSide" + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false } , - {"code": "settlementCurrency", - "type": 12,"name": "Валюта расчетов по инструменту","shortname": "Валюта","visible": true,"searchable": true,"sortable": true,"link": "currencyCode","linkCode": "code" + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"visible": false } , - {"code": "companyId", - "type": 1,"name": "Название компании","shortname": "Компания","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"visible": false } , - {"code": "firstLegSettlementDate", - "type": 6,"name": "Дата размещения","shortname": "Дата размещения","visible": true,"searchable": true,"sortable": true + {"code": "clearingDate", + "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","searchable": true,"sortable": true,"visible": false + } + ] + } , - {"code": "secondLegSettlementDate", - "type": 6,"name": "Дата возврата","shortname": "Дата возврата","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securityFullName", - "type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securitySymbol", - "type": 2,"length": 255,"name": "Код инструмента в Торговой Системе","shortname": "Код инструмента","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securityId", - "type": 1,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","searchable": true,"sortable": true,"link": "moneyMarketSecurity","linkCode": "securitySymbol","ignore": true - } - , - {"code": "counterPartyId", - "type": 1,"name": "Имя компании-партнера, с которым заключена сделка","shortname": "Партнер","visible": false,"searchable": true,"sortable": true,"link": "company" - } - , - {"code": "coverageStatus", - "type": 12,"name": "Cтатус достаточности обеспечения","shortname": "Обеспеченность","searchable": true,"sortable": true,"link": "allowed" + "coveredLiabilitiesRegister": { + + "name": "Реестр обязательств, прошедших процедуру контроля обеспечения", + + "destination": "covered-liabilities-registers", + + "class": "ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister", + + "table": "covered_Liabilities_register", + + "fields": [ + {"code": "companyFullName", + "type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true } , {"code": "sessionId", - "type": 1,"name": "Наименование сессии","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "moneyMarketSession" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "createdAt", - "type": 5,"name": "Время регистрации","shortname": "Время регистрации","visible": false,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "type": 5,"name": "Время изменения","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true - } - ] - - } - , - "admittedDealRegister": { - - "name": "Реестр сделок, допущенных к клирингу", - - "destination": "admitted-deal-registers", - - "class": "ru.clearing.classes.statics.data.register.AdmittedDealRegister", - - "table": "admitted_deal_register", - - "fields": [ - {"code": "executionId", - "type": 1,"name": "Идентификационный номер сделки в Клиринговой системе","shortname": "Номер сделки КС","visible": false,"searchable": true,"sortable": true - } - , - {"code": "companyFullName", - "type": 2,"length": 255,"name": "Наименование биржи","shortname": "Наименование биржи","searchable": true,"sortable": true,"visible": true - } - , - {"code": "tradingDate", - "type": 6,"name": "Дата заключения сделки","shortname": "Дата заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionId", - "type": 1,"name": "Идентификационный номер сделки в Торговой системе","shortname": "Номер сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionTime", - "type": 4,"name": "Время заключения сделки в Торговой системе","shortname": "Время заключения сделки","visible": true,"searchable": true,"sortable": true + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } , {"code": "securitySymbol", - "type": 2,"length": 255,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","visible": true,"searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","searchable": true,"sortable": true,"visible": true } , {"code": "securityFullName", - "type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": false,"searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Полное наименование инструмента","shortname": "Полное наименование инструмента","searchable": true,"sortable": true,"visible": false } , - {"code": "sellerFullName", - "type": 2,"length": 255,"name": "Наименование продавца","shortname": "Наименование продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerClearingCode", - "type": 2,"length": 255,"name": "Код продавца","shortname": "Код продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerAccount", - "type": 2,"length": 50,"name": "Счет продавца","shortname": "Счет продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerFullName", - "type": 2,"length": 255,"name": "Наименование покупателя","shortname": "Наименование покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerClearingCode", - "type": 2,"length": 255,"name": "Код покупателя","shortname": "Код покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerAccount", - "type": 2,"length": 50,"name": "Счет покупателя","shortname": "Счет покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Сумма сделки","shortname": "Сумма сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 5,"name": "Время регистрации","shortname": "Время регистрации","visible": false,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "field": "updated","type": 5,"name": "Время изменения","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true - } - ] - - } - , - "coveredDealRegister": { - - "name": "Реестр сделок, прошедших процедуру контроля обеспечения", - - "destination": "covered-deal-registers", - - "class": "ru.clearing.classes.statics.data.register.CoveredDealRegister", - - "table": "covered_deal_register", - - "fields": [ - {"code": "executionId", - "type": 1,"name": "Идентификационный номер сделки в Клиринговой системе","shortname": "Номер сделки КС","visible": false,"searchable": true,"sortable": true - } - , - {"code": "companyFullName", - "type": 2,"length": 255,"name": "Наименование биржи","shortname": "Наименование биржи","searchable": true,"sortable": true,"visible": true - } - , - {"code": "tradingDate", - "type": 6,"name": "Дата заключения сделки","shortname": "Дата заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionId", - "type": 1,"name": "Идентификационный номер сделки в Торговой системе","shortname": "Номер сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionTime", - "type": 4,"name": "Время заключения сделки в Торговой системе","shortname": "Время заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securitySymbol", - "type": 2,"length": 255,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securityFullName", - "type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": false,"searchable": true,"sortable": true - } - , - {"code": "sellerFullName", - "type": 2,"length": 255,"name": "Наименование продавца","shortname": "Наименование продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerClearingCode", - "type": 2,"length": 255,"name": "Код продавца","shortname": "Код продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerAccount", - "type": 2,"length": 50,"name": "Счет продавца","shortname": "Счет продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerFullName", - "type": 2,"length": 255,"name": "Наименование покупателя","shortname": "Наименование покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerClearingCode", - "type": 2,"length": 255,"name": "Код покупателя","shortname": "Код покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerAccount", - "type": 2,"length": 50,"name": "Счет покупателя","shortname": "Счет покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Сумма сделки","shortname": "Сумма сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 5,"name": "Время регистрации","shortname": "Время регистрации","visible": false,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "field": "updated","type": 5,"name": "Время изменения","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true - } - ] - - } - , - "uncoveredDealRegister": { - - "name": "Реестр сделок, не прошедших процедуру контроля обеспечения", - - "destination": "uncovered-deal-registers", - - "class": "ru.clearing.classes.statics.data.register.UncoveredDealRegister", - - "table": "uncovered_deal_register", - - "fields": [ - {"code": "executionId", - "type": 1,"name": "Идентификационный номер сделки в Клиринговой системе","shortname": "Номер сделки КС","visible": false,"searchable": true,"sortable": true - } - , - {"code": "companyFullName", - "type": 2,"length": 255,"name": "Наименование биржи","shortname": "Наименование биржи","searchable": true,"sortable": true,"visible": true - } - , - {"code": "tradingDate", - "type": 6,"name": "Дата заключения сделки","shortname": "Дата заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionId", - "type": 1,"name": "Идентификационный номер сделки в Торговой системе","shortname": "Номер сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "exchangeExecutionTime", - "type": 4,"name": "Время заключения сделки в Торговой системе","shortname": "Время заключения сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securitySymbol", - "type": 2,"length": 255,"name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","visible": true,"searchable": true,"sortable": true - } - , - {"code": "securityFullName", - "type": 2,"length": 255,"name": "Наименование инструмента","shortname": "Инструмент","visible": false,"searchable": true,"sortable": true - } - , - {"code": "sellerFullName", - "type": 2,"length": 255,"name": "Наименование продавца","shortname": "Наименование продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerClearingCode", - "type": 2,"length": 255,"name": "Код продавца","shortname": "Код продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "sellerAccount", - "type": 2,"length": 50,"name": "Счет продавца","shortname": "Счет продавца","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerFullName", - "type": 2,"length": 255,"name": "Наименование покупателя","shortname": "Наименование покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerClearingCode", - "type": 2,"length": 255,"name": "Код покупателя","shortname": "Код покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "buyerAccount", - "type": 2,"length": 50,"name": "Счет покупателя","shortname": "Счет покупателя","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Сумма сделки","shortname": "Сумма сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "resultStatus", - "type": 12,"name": "Результат клиринга","shortname": "Результат клиринга","visible": true,"searchable": true,"sortable": true,"link": "resultStatus" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 5,"name": "Время регистрации","shortname": "Время регистрации","visible": false,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "field": "updated","type": 5,"name": "Время изменения","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true - } - ] - - } - , - "reportRegister": { - - "name": "Реестр отправленных отчетов", - - "destination": "report-registers", - - "class": "ru.clearing.classes.statics.data.register.ReportRegister", - - "table": "report_register", - - "fields": [ - {"code": "companyFullName", - "type": 2,"length": 255,"name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true + {"code": "companyId", + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код клиринга","shortname": "Код участника","searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код компании","searchable": true,"sortable": true,"visible": true } , - {"code": "sessionId", - "type": 1,"name": "Сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "moneyMarketSession" + {"code": "account", + "type": 2,"length": 50,"name": "Счет компании","shortname": "Счет компании","searchable": true,"sortable": true,"visible": true } , - {"code": "comment", - "type": 2,"name": "Комментарий","shortname": "Основание","searchable": true,"sortable": true,"length": 255 - } - , - {"code": "name", - "type": 2,"length": 255,"name": "Наименование","shortname": "Наименование","visible": false,"searchable": true,"sortable": true - } - , - {"code": "quantity", - "type": 1,"name": "Количество записей","shortname": "Количество","visible": false,"searchable": true,"sortable": true + {"code": "amount", + "type": 10,"name": "Сумма обязательств","shortname": "Сумма обязательств","searchable": true,"sortable": true,"visible": true } , {"code": "id", @@ -6597,111 +5800,29 @@ } , {"code": "createdAt", - "field": "created","type": 5,"name": "Время регистрации","shortname": "Время","visible": true,"searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"visible": false } , {"code": "updatedAt", - "field": "updated","type": 5,"name": "Время изменения","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"visible": false } , {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true + "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","searchable": true,"sortable": true,"visible": false } ] } , - "contractRegister": { - - "name": "Журнал регистрации договоров", - - "destination": "contract-registers", - - "class": "ru.clearing.classes.statics.data.register.ContractRegister", - - "table": "contract_register", - - "fields": [ - {"code": "name", - "type": 2,"length": 255,"name": "Наименование документа","shortname": "Наименование","searchable": true,"sortable": true,"visible": true - } - , - {"code": "number", - "type": 2,"length": 255,"name": "Номер документа","shortname": "Номер","searchable": true,"sortable": true,"visible": true - } - , - {"code": "issueDate", - "type": 6,"name": "Дата составления","shortname": "Дата выдачи","searchable": true,"sortable": true - } - , - {"code": "companyFullName", - "type": 1,"name": "Наименование лица","shortname": "Компания","searchable": true,"sortable": true,"visible": true - } - , - {"code": "companyId", - "type": 1,"name": "Наименование Компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" - } - , - {"code": "documentType", - "type": 12,"name": "Наименование типа документа","shortname": "Тип документа","searchable": true,"sortable": true,"visible": true,"link": "documentType" - } - , - {"code": "issuePlace", - "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true - } - , - {"code": "issuer", - "type": 2,"length": 255,"name": "Кем выдан","shortname": "Кем выдан","searchable": true,"sortable": true,"visible": true - } - , - {"code": "issuerCode", - "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Код выдавшего органа","searchable": true,"sortable": true,"visible": true - } - , - {"code": "place", - "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true - } - , - {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Дата начала срока действия","searchable": true,"sortable": true - } - , - {"code": "validToDate", - "type": 6,"name": "Дата окончания срока действия","shortname": "Дата окончания срока действия","searchable": true,"sortable": true - } - , - {"code": "closeDate", - "type": 6,"name": "Дата расторжения","shortname": "Дата расторжения","searchable": true,"sortable": true - } - , - {"code": "comment", - "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "createdAt", - "type": 5,"name": "Дата и время регистрации документа","shortname": "Время сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "type": 5,"name": "Время изменения сделки","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - ] - - } - , - "orderRegister": { + "moneyPaymentInstructionRegister": { "name": "Реестр распоряжений, направленных расчетной организации", - "destination": "order-registers", + "destination": "money-payment-instruction-registers", - "class": "ru.clearing.classes.statics.data.register.OrderRegister", + "class": "ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister", - "table": "order_register", + "table": "money_payment_instruction_register", "fields": [ {"code": "creditLegAccount", @@ -6713,11 +5834,7 @@ } , {"code": "creditLegCurrencyCode", - "type": 12,"name": "Код валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"visible": true,"link": "currency" - } - , - {"code": "creditLegDirection", - "type": 1,"name": "Направление отправителя","shortname": "Направление","searchable": true,"sortable": true,"visible": true,"link": "inOutDirection" + "type": 12,"dbname": "Код валюты отправителя","name": "Наименование валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"visible": true,"link": "currency" } , {"code": "debitLegAccount", @@ -6731,21 +5848,17 @@ {"code": "addressee", "type": 2,"length": 255,"name": "Получатель","shortname": "Получатель","searchable": true,"sortable": true,"visible": true } - , - {"code": "documentNumber", - "type": 2,"length": 255,"name": "Номер документа в сторонней системе","shortname": "Номер РО","searchable": true,"sortable": true - } , {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } , {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true } , {"code": "clearingDate", @@ -6755,201 +5868,305 @@ } , - "liabilitiesClaimsMoney": { + "depoPaymentInstructionRegister": { - "name": "Требования и обязательства денежных средств", + "name": "Реестр распоряжений, направленных расчетному депозитарию", - "destination": "liabilities-claims-money", + "destination": "depo-payment-instruction-registers", - "class": "ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney", + "class": "ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister", - "table": "liabilities_claims_money", + "table": "depo_payment_instruction_register", "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , {"code": "companyId", - "type": 1,"name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","ignore": true + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , - {"code": "shortName", - "type": 2,"name": "Короткое наименование Участника","shortname": "Участник","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "tradingClearingRegistryType", + "type": 2,"length": 255,"name": "Тип торгово-клирингового регистра","shortname": "Тип ТКР","searchable": true,"sortable": true,"visible": true } , - {"code": "accountId", - "type": 1,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"link": "account","ignore": true + {"code": "tradingClearingRegistry", + "type": 2,"length": 50,"name": "Торгово-клиринговый регистр","shortname": "ТКР","searchable": true,"sortable": true + } + , + {"code": "cbCode", + "type": 2,"length": 50,"name": "Код ЦБ","shortname": "Код ЦБ","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 11,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true,"visible": true + } + , + {"code": "direction", + "type": 1,"name": "Направление","shortname": "Направление","searchable": true,"sortable": true,"link": "inOutDirection","ignore": true + } + , + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + } + ] + + } + , + "excludeLiabilitiesRegister": { + + "name": "Реестр обязательств, исключенных из клирингового пула", + + "destination": "exclude-liabilities-registers", + + "class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister", + + "table": "exclude_liabilities_register", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + } + , + {"code": "validFromDate", + "type": 6,"name": "Дата начала cессии","shortname": "Дата начала cессии","searchable": true,"sortable": true + } + , + {"code": "validToDate", + "type": 6,"name": "Дата окончания cессии","shortname": "Дата окончания cессии","searchable": true,"sortable": true + } + , + {"code": "companyId", + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" + } + , + {"code": "companyFullName", + "type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true + } + , + {"code": "inn", + "type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true + } + , + {"code": "segment", + "type": 2,"length": 10,"name": "Сегмент","shortname": "Сегмент","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registryCode", + "type": 12,"dbname": "Код регистра","name": "Описание регистра","shortname": "Код регистра","searchable": true,"sortable": true,"link": "tradingClearingRegistryType" } , {"code": "account", "type": 2,"length": 50,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"visible": true } , - {"code": "accountType", - "type": 12,"name": "Тип счета","shortname": "Тип счета","searchable": true,"sortable": true,"link": "accountType" + {"code": "registryStatus", + "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true } , {"code": "currency", - "type": 12,"name": "Код валюты","shortname": "Валюта","searchable": true,"sortable": true,"visible": true,"link": "currencyCode","linkCode": "code" + "type": 12,"dbname": "Код валюты отправителя","name": "Наименование валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"visible": true,"link": "currency" } , - {"code": "liabilitiesAmount", - "type": 11,"name": "Регистр «Обязательства по денежным средствам, сформированные по результатам собственных сделок Участника клиринга», исключая проценты","shortname": "Сумма обязательств","searchable": true,"sortable": true,"visible": true - } - , - {"code": "claimsAmount", - "type": 11,"name": "Сумма требований, исключая проценты","shortname": "Сумма требований","searchable": true,"sortable": true,"visible": true + {"code": "sumLiabilities", + "type": 10,"name": "Сумма обязательств","shortname": "Обязательства","searchable": true,"sortable": true,"visible": true } , {"code": "settlementDate", - "type": 6,"name": "Дата расчета","shortname": "Дата расчета","searchable": true,"sortable": true,"visible": true + "type": 6,"name": "Дата расчета","shortname": "Расчет","searchable": true,"sortable": true + } + ] + } , + "liabilitiesRegister": { + + "name": "Реестр учета обязательств", + + "destination": "liabilities-registers", + + "class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister", + + "table": "liabilities_register", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + } + , + {"code": "validFromDate", + "type": 6,"name": "Дата начала cессии","shortname": "Дата начала cессии","searchable": true,"sortable": true + } + , + {"code": "validToDate", + "type": 6,"name": "Дата окончания cессии","shortname": "Дата окончания cессии","searchable": true,"sortable": true + } + , + {"code": "companyId", + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" + } + , + {"code": "companyFullName", + "type": 2,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"length": 255,"visible": true + } + , + {"code": "inn", + "type": 2,"length": 255,"name": "Идентификационный номер налогоплательщика (ИНН)","shortname": "ИНН","searchable": true,"sortable": true,"visible": true + } + , + {"code": "segment", + "type": 2,"length": 10,"name": "Сегмент","shortname": "Сегмент","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registryCode", + "type": 12,"dbname": "Код регистра","name": "Описание регистра","shortname": "Код регистра","searchable": true,"sortable": true,"link": "tradingClearingRegistryType" + } + , + {"code": "account", + "type": 2,"length": 50,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registryStatus", + "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true + } + , + {"code": "currency", + "type": 12,"dbname": "Код валюты отправителя","name": "Наименование валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"visible": true,"link": "currency" + } + , + {"code": "sumLiabilities", + "type": 10,"name": "Сумма обязательств","shortname": "Обязательства","searchable": true,"sortable": true,"visible": true + } + , + {"code": "settlementDate", + "type": 6,"name": "Дата расчета","shortname": "Расчет","searchable": true,"sortable": true + } + ] + + } + , + "executionRegister": { + + "name": "Реестр сделок", + + "destination": "execution-registers", + + "class": "ru.clearing.classes.statics.data.register.ExecutionRegister", + + "table": "execution_register", + + "fields": [ {"code": "tradingDate", - "type": 6,"name": "Дата торгов","shortname": "Дата торгов","searchable": true,"sortable": true + "type": 6,"name": "Дата заключения сделки","shortname": "Дата заключения сделки","visible": true,"searchable": true,"sortable": true } , - {"code": "tradingCode", - "type": 2,"name": "Торговый код Участника","shortname": "Торговый код","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "exchangeExecutionId", + "type": 1,"name": "Идентификационный номер сделки в Торговой системе","shortname": "Номер сделки","visible": true,"searchable": true,"sortable": true } , - {"code": "fullName", - "type": 2,"name": "Полное наименование Участника","shortname": "Наименование участника","searchable": true,"sortable": true,"length": 255,"visible": true - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","searchable": true,"sortable": true - } - ] - - } - , - "liabilitiesClaimsAssets": { - - "name": "Требования и обязательства финансовых активов", - - "destination": "liabilities-claims-assets", - - "class": "ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets", - - "table": "liabilities_claims_assets", - - "fields": [ - {"code": "companyId", - "type": 1,"name": "Наименование участника","shortname": "Участник","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","ignore": true - } - , - {"code": "shortName", - "type": 2,"name": "Короткое наименование Участника","shortname": "Участник","searchable": true,"sortable": true,"length": 255,"visible": true - } - , - {"code": "accountId", - "type": 1,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"link": "account","ignore": true - } - , - {"code": "account", - "type": 2,"length": 50,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"visible": true - } - , - {"code": "accountType", - "type": 12,"name": "Тип счета","shortname": "Тип счета","searchable": true,"sortable": true,"link": "accountType" - } - , - {"code": "currency", - "type": 12,"name": "Код валюты","shortname": "Валюта","searchable": true,"sortable": true,"visible": true,"link": "currencyCode","linkCode": "code" - } - , - {"code": "settlementDate", - "type": 6,"name": "Дата расчета","shortname": "Дата расчета","searchable": true,"sortable": true,"visible": true - } - , - {"code": "liabilitiesQuantity", - "type": 10,"name": "Сумма обязательств","shortname": "Сумма обязательств","searchable": true,"sortable": true,"visible": true - } - , - {"code": "claimsQuantity", - "type": 10,"name": "Сумма требований","shortname": "Сумма требований","searchable": true,"sortable": true,"visible": true - } - , - {"code": "contract", - "type": 2,"name": "Номер договора","shortname": "Номер договора","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "exchangeExecutionTime", + "type": 4,"name": "Время заключения сделки в Торговой системе","shortname": "Время заключения сделки","visible": true,"searchable": true,"sortable": true } , {"code": "securityId", - "type": 1,"name": "Инструмент","shortname": "Инструмент","searchable": true,"sortable": true,"visible": true,"link": "moneyMarketSecurity","linkCode": "fullName" + "type": 1,"dbname": "Идентификатор финансового инструмента","name": "Финансовый инструмент","shortname": "Код биржевого инструмента / товара","searchable": true,"sortable": true,"link": "security","linkCode": "securitySymbol" } , - {"code": "tradingDate", - "type": 6,"name": "Дата торгов","shortname": "Дата торгов","searchable": true,"sortable": true + {"code": "sellerId", + "type": 1,"dbname": "Идентификатор компании-продавца","name": "Наименование компании-продавца","shortname": "Продавец","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , - {"code": "refundDate", - "type": 6,"name": "Дата возврата","shortname": "Дата возврата","searchable": true,"sortable": true,"visible": true + {"code": "sellerClearingCode", + "type": 2,"length": 255,"name": "Клиринговый код продавца","shortname": "Код продавца","searchable": true,"sortable": true,"visible": true } , - {"code": "price", - "type": 10,"name": "Ставка по депозиту","shortname": "Ставка,%","searchable": true,"sortable": true,"visible": true + {"code": "sellerTradingClearingRegister", + "type": 2,"length": 255,"name": "Торгово-клиринговый регистр продавца","shortname": "ТКР продавца","searchable": true,"sortable": true,"visible": true } , - {"code": "tradingCode", - "type": 2,"name": "Торговый код Участника","shortname": "Торговый код","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "sellerMoneyAccount", + "type": 2,"length": 50,"name": "Денежный счет продавца","shortname": "Денежный счет продавца","searchable": true,"sortable": true,"visible": true } , - {"code": "clearingCode", - "type": 2,"name": "Клиринговый код Участника","shortname": "Клиринговый код","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "sellerDepoAccount", + "type": 2,"length": 50,"name": "Депо счет продавца","shortname": "Депо счет продавца","searchable": true,"sortable": true,"visible": true } , - {"code": "comment", - "type": 2,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"length": 255 + {"code": "buyerId", + "type": 1,"dbname": "Идентификатор компании-покупателя","name": "Наименование компании-покупателя","shortname": "Покупатель","visible": true,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , - {"code": "fullName", - "type": 2,"name": "Полное наименование Участника","shortname": "Наименование участника","searchable": true,"sortable": true,"length": 255,"visible": true + {"code": "buyerClearingCode", + "type": 2,"length": 255,"name": "Клиринговый код покупателя","shortname": "Код покупателя","searchable": true,"sortable": true,"visible": true } , - {"code": "parentId", - "type": 1,"name": "Запись основного договора без разделения","shortname": "Родительский договор","searchable": true,"sortable": true + {"code": "buyerTradingClearingRegister", + "type": 2,"length": 255,"name": "Торгово-клиринговый регистр покупателя","shortname": "ТКР покупателя","searchable": true,"sortable": true,"visible": true } , - {"code": "liabilitiesClaimsMoneyId", - "type": 1,"name": "Регистры денежных средств","shortname": "Регистры денег","searchable": true,"sortable": true,"link": "liabilitiesClaimsMoney" + {"code": "buyerMoneyAccount", + "type": 2,"length": 50,"name": "Денежный счет покупателя","shortname": "Денежный счет покупателя","searchable": true,"sortable": true,"visible": true } , - {"code": "clearingStatus", - "type": 1,"name": "Статус клиринга","shortname": "Статус клиринга","searchable": true,"sortable": true,"link": "clearingStatus","ignore": true + {"code": "buyerDepoAccount", + "type": 2,"length": 50,"name": "Депо счет покупателя","shortname": "Депо счет покупателя","searchable": true,"sortable": true,"visible": true } , - {"code": "paymentId", - "type": 1,"name": "Платеж","shortname": "Платеж","searchable": true,"sortable": true + {"code": "amount", + "type": 11,"name": "Сумма сделки","shortname": "Сумма сделки","visible": true,"searchable": true,"sortable": true } , - {"code": "refundPaymentId", - "type": 1,"name": "Обратный платежа","shortname": "Обратный платеж","searchable": true,"sortable": true + {"code": "quantity", + "type": 11,"name": "Количество ценных бумаг","shortname": "Количество ценных бумаг","visible": false,"searchable": true,"sortable": true } , {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true } , {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","visible": false,"searchable": true,"sortable": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","visible": false,"searchable": true,"sortable": true } , {"code": "clearingDate", - "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","searchable": true,"sortable": true + "type": 6,"name": "Дата клиринга","shortname": "Дата клиринга","visible": false,"searchable": true,"sortable": true } ] @@ -6967,15 +6184,23 @@ "fields": [ {"code": "addresseeId", - "type": 1,"name": "Наименование участника получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company" + "type": 1,"dbname": "Идентификатор компании-получателя","name": "Наименование компании-получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , {"code": "senderId", - "type": 1,"name": "Наименование участника отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company" + "type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" } , {"code": "statementType", - "type": 12,"name": "Тип поступления средств","shortname": "Тип поступления средств","searchable": true,"sortable": true,"link": "statementType" + "type": 12,"dbname": "Код типа поступления средств","name": "Наименование типа поступления средств","shortname": "Тип поступления средств","searchable": true,"sortable": true,"link": "statementType" + } + , + {"code": "securityId", + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "security","linkCode": "shortName" + } + , + {"code": "contract", + "type": 2,"length": 255,"name": "Продукт","shortname": "Продукт","searchable": true,"sortable": true,"visible": true } , {"code": "comment", @@ -6983,7 +6208,7 @@ } , {"code": "accountId", - "type": 1,"name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"link": "account" + "type": 1,"dbname": "Идентификатор счета","name": "Наименование счета","shortname": "Счет","searchable": true,"sortable": true,"link": "account","ignore": true } , {"code": "account", @@ -6991,7 +6216,7 @@ } , {"code": "inOutDirection", - "type": 12,"name": "Направление","shortname": "Направление","searchable": true,"sortable": true,"link": "inOutDirection" + "type": 12,"dbname": "Код направления","name": "Наименование направления","shortname": "Направление","searchable": true,"sortable": true,"link": "inOutDirection" } , {"code": "settlementDate", @@ -7001,33 +6226,29 @@ {"code": "amount", "type": 11,"name": "Объем","shortname": "Объем","searchable": true,"sortable": true } - , - {"code": "cashMovementCurrencyCode", - "type": 12,"name": "Код валюты","shortname": "Валюта","searchable": true,"sortable": true,"visible": true,"link": "currency" - } , {"code": "operationStatus", - "type": 12,"name": "Cтатус обработки","shortname": "Статус","searchable": true,"sortable": true,"link": "operationStatus" + "type": 12,"dbname": "Код статуса обработки","name": "Наименование статуса обработки","shortname": "Статус","searchable": true,"sortable": true,"link": "operationStatus" } , - {"code": "errorCode", - "type": 12,"name": "Код ошибки","shortname": "Код ошибки","searchable": true,"sortable": true,"link": "errorCode","linkCode": "code" + {"code": "errorCodeId", + "type": 1,"dbname": "Идентификатор кода ошибки","name": "Код ошибки","shortname": "Код ошибки","searchable": true,"sortable": true,"link": "errorCode","linkCode": "code" } , - {"code": "errorText", - "type": 12,"name": "Полный текст ошибки","shortname": "Ошибка","searchable": true,"sortable": true,"link": "errorText","linkCode": "text" + {"code": "errorTextId", + "type": 1,"dbname": "Идентификатор полного текста ошибки","name": "Полный текст ошибки","shortname": "Ошибка","searchable": true,"sortable": true,"link": "errorText","linkCode": "text" } , {"code": "inSDfId", - "type": 1,"name": "Запись, инициировавшая изменения этой таблицы","shortname": "Входящая запись","searchable": true,"sortable": true,"ignore": true + "type": 1,"name": "Идентификатор записи, инициировавшая изменения этой таблицы","shortname": "Входящая запись","searchable": true,"sortable": true,"ignore": true } , {"code": "outSDfId", - "type": 1,"name": "Запись, сформированная в результате изменения этой таблицы","shortname": "Исходящая запись","searchable": true,"sortable": true,"ignore": true + "type": 1,"name": "Идентификатор записи, сформированная в результате изменения этой таблицы","shortname": "Исходящая запись","searchable": true,"sortable": true,"ignore": true } , {"code": "inOutSDfType", - "type": 12,"name": "Типы входящей и исходящей записей","shortname": "Типы входящей и исходящей записей","searchable": true,"sortable": true,"ignore": true,"link": "inOutSDfType" + "type": 12,"dbname": "Код типа входящей и исходящей записей","name": "Типы входящей и исходящей записей","shortname": "Типы входящей и исходящей записей","searchable": true,"sortable": true,"ignore": true,"link": "inOutSDfType" } , {"code": "id", @@ -7035,11 +6256,11 @@ } , {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true } , {"code": "clearingDate", @@ -7047,110 +6268,6 @@ } ] - } - , - "tradeSettlement": { - - "name": "Проводки на базе сделок торговой системы", - - "class": "", - - "table": "trade_settlement", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "addresseeId", - "type": 1,"name": "Идентификатор участника получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company" - } - , - {"code": "senderId", - "type": 1,"name": "Идентификатор участника отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company" - } - , - {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата расчета","shortname": "Дата расчета","searchable": true,"sortable": true,"visible": true - } - , - {"code": "amount", - "type": 11,"name": "Объем","shortname": "Объем","searchable": true,"sortable": true - } - , - {"code": "currencyCode", - "type": 12,"name": "Код валюты","shortname": "Валюта","searchable": true,"sortable": true,"visible": true,"link": "currency" - } - , - {"code": "inOutDirection", - "type": 1,"name": "Направление","shortname": "Направление","searchable": true,"sortable": true,"link": "inOutDirection" - } - , - {"code": "accountId", - "type": 1,"name": "Идентификатор счета","shortname": "Идентификатор счета","searchable": true,"sortable": true,"link": "account" - } - , - {"code": "account", - "type": 2,"length": 50,"name": "Счет","shortname": "Счет","searchable": true,"sortable": true - } - , - {"code": "operationStatus", - "type": 12,"name": "Cтатус обработки","shortname": "Статус","searchable": true,"sortable": true,"link": "operationStatus" - } - ] - - } - , - "operation": { - - "name": "Проводки", - - "class": "", - - "table": "operation", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "addresseeId", - "type": 1,"name": "Идентификатор участника получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company" - } - , - {"code": "senderId", - "type": 1,"name": "Идентификатор участника отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company" - } - , - {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "clearingDate", - "type": 6,"name": "Дата расчета","shortname": "Дата расчета","searchable": true,"sortable": true,"visible": true - } - , - {"code": "operationTypeId", - "type": 1,"name": "Тип проводки","shortname": "Тип","searchable": true,"sortable": true,"link": "operationType" - } - , - {"code": "operationStatus", - "type": 12,"name": "Cтатус обработки","shortname": "Статус","searchable": true,"sortable": true,"link": "operationStatus" - } - ] - } , "paymentInstruction": { @@ -7165,11 +6282,15 @@ "fields": [ {"code": "senderId", - "type": 1,"name": "Наименование участника отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","visible": true + "type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","visible": true } , {"code": "addresseeId", - "type": 1,"name": "Наименование участника получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","visible": true + "type": 1,"dbname": "Идентификатор компании-получателя","name": "Наименование компании-получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName","visible": true + } + , + {"code": "payeeBic", + "type": 2,"length": 255,"name": "Банковский идентификационный код (БИК) отправителя","shortname": "БИК отправителя","searchable": true,"sortable": true } , {"code": "adresseeBic", @@ -7179,10 +6300,6 @@ {"code": "payeeBankName", "type": 2,"length": 255,"name": "Наименование банка отправителя","shortname": "Банк отправителя","searchable": true,"sortable": true } - , - {"code": "payeeBic", - "type": 2,"length": 255,"name": "Банковский идентификационный код (БИК) отправителя","shortname": "БИК отправителя","searchable": true,"sortable": true - } , {"code": "addresseeBankName", "type": 2,"length": 255,"name": "Наименование банка получателя","shortname": "Банк получателя","searchable": true,"sortable": true @@ -7201,55 +6318,63 @@ } , {"code": "creditLeg_amount", - "field": "creditLegAmount","type": 10,"name": "Сумма отправителя","shortname": "Сумма отправителя","searchable": true,"sortable": true,"visible": true + "type": 10,"name": "Сумма отправителя","shortname": "Сумма отправителя","searchable": true,"sortable": true,"visible": true } , {"code": "debitLeg_amount", - "field": "debitLegAmount","type": 10,"name": "Сумма получателя","shortname": "Сумма получателя","searchable": true,"sortable": true,"visible": true + "type": 10,"name": "Сумма получателя","shortname": "Сумма получателя","searchable": true,"sortable": true,"visible": true } , {"code": "creditLeg_accountId", - "field": "creditLegAccountId","type": 1,"name": "Наименование счета отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"link": "account","ignore": true + "type": 1,"dbname": "Идентификатор счета отправителя","name": "Cчет отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"link": "account","ignore": true } , {"code": "credit_csAccount", - "field": "creditCsAccount","type": 2,"length": 255,"name": "Корреспондентский счет отправителя","shortname": "Корр. счет отправителя","searchable": true,"sortable": true,"ignore": true + "type": 2,"length": 255,"name": "Корреспондентский счет отправителя","shortname": "Корр. счет отправителя","searchable": true,"sortable": true,"ignore": true } , {"code": "creditLeg_account", - "field": "creditLegAccount","type": 2,"length": 50,"name": "Счет отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 50,"name": "Счет отправителя","shortname": "Счет отправителя","searchable": true,"sortable": true,"visible": true } , {"code": "debitLeg_accountId", - "field": "debitLegAccountId","type": 1,"name": "Наименование счета получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"link": "account","ignore": true + "type": 1,"dbname": "Идентификатор счета получателя","name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"link": "account","ignore": true } , {"code": "debit_csAccount", - "field": "debitCsAccount","type": 2,"length": 255,"name": "Корреспондентский счет получателя","shortname": "Корр. счет получателя","searchable": true,"sortable": true,"ignore": true + "type": 2,"length": 255,"name": "Корреспондентский счет получателя","shortname": "Корр. счет получателя","searchable": true,"sortable": true,"ignore": true } , {"code": "debitLeg_account", - "field": "debitLegAccount","type": 2,"length": 50,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 50,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true } , {"code": "creditLeg_direction", - "field": "creditLegDirection","type": 1,"name": "Направление отправителя","shortname": "Направление отправителя","searchable": true,"sortable": true,"link": "inOutDirection","ignore": true + "type": 12,"dbname": "Код направления отправителя","name": "Наименование направления отправителя","shortname": "Направление отправителя","searchable": true,"sortable": true,"link": "inOutDirection","ignore": true } , {"code": "debitLeg_direction", - "field": "debitLegDirection","type": 1,"name": "Направление получателя","shortname": "Направление получателя","searchable": true,"sortable": true,"link": "inOutDirection","ignore": true + "type": 12,"dbname": "Код направления получателя","name": "Наименование направления получателя","shortname": "Направление получателя","searchable": true,"sortable": true,"link": "inOutDirection","ignore": true } , {"code": "creditLeg_currencyCode", - "field": "creditLegCurrencyCode","type": 12,"name": "Код валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"link": "currency" + "type": 12,"dbname": "Код валюты отправителя","name": "Наименование валюты отправителя","shortname": "Валюта отправителя","searchable": true,"sortable": true,"link": "currency" } , {"code": "debitLeg_currencyCode", - "field": "debitLegCurrencyCode","type": 12,"name": "Код валюты получателя","shortname": "Валюта получателя","searchable": true,"sortable": true,"link": "currency" + "type": 12,"dbname": "Код валюты получателя","name": "Наименование валюты получателя","shortname": "Валюта получателя","searchable": true,"sortable": true,"link": "currency" + } + , + {"code": "creditLeg_securityId", + "type": 1,"dbname": "Идентификатор инструмента отправителя","name": "Наименование инструмента отправителя","shortname": "Инструмент отправителя","searchable": false,"sortable": true,"visible": true,"link": "security" + } + , + {"code": "debitLeg_securityId", + "type": 1,"dbname": "Идентификатор инструмента получателя","name": "Наименование инструмента получателя","shortname": "Инструмент получателя","searchable": false,"sortable": true,"visible": true,"link": "security" } , {"code": "transactionStatus", - "type": 12,"name": "Cтатус транзакции","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "transactionStatus","ignore": true + "type": 12,"dbname": "Код статуса транзакции","name": "Наименование статуса транзакции","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "transactionStatus","ignore": true } , {"code": "documentNumber", @@ -7260,264 +6385,149 @@ "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , - {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true } , {"code": "clearingDate", "type": 6,"name": "Дата расчета","shortname": "Дата расчета","searchable": true,"sortable": true,"ignore": true } - ] - - } , - "marketData": { - - "name": "Итоги торгов", - - "class": "ru.clearing.classes.TransactionData.Execution.MarketData", - - "table": "market_data", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","visible": false,"searchable": true,"sortable": true - } - , - {"code": "securitiesDepositId", - "type": 1,"name": "Биржевой код инструмента","shortname": "Инструмент","visible": true,"searchable": true,"sortable": true,"link": "moneyMarketSecurity","linkCode": "fullName" - } - , - {"code": "companyName", - "type": 2,"length": 255,"name": "Инициатор торгов","shortname": "Инициатор","visible": false,"searchable": true,"sortable": true - } - , - {"code": "market", - "type": 12,"name": "Секция","shortname": "Секция","visible": true,"searchable": true,"sortable": true,"link": "market","linkCode": "name" - } - , - {"code": "counterPartyNum", - "type": 1,"name": "Количество участников, заключивших сделки","shortname": "Участников","visible": true,"searchable": true,"sortable": true - } - , - {"code": "tradesNum", - "type": 1,"name": "Количество сделок","shortname": "Сделок","visible": true,"searchable": true,"sortable": true - } - , - {"code": "amount", - "type": 11,"name": "Объем сделок, руб","shortname": "Объем сделок","visible": true,"searchable": true,"sortable": true - } - , - {"code": "openPrice", - "type": 10,"name": "Откр.","shortname": "Откр.,%","visible": true,"searchable": true,"sortable": true - } - , - {"code": "maxPrice", - "type": 10,"name": "Макс.","shortname": "Макс.,%","visible": true,"searchable": true,"sortable": true - } - , - {"code": "minPrice", - "type": 10,"name": "Мин.","shortname": "Мин.,%","visible": true,"searchable": true,"sortable": true - } - , - {"code": "closePrice", - "type": 10,"name": "Закр.","shortname": "Закр.,%","visible": true,"searchable": true,"sortable": true - } - , - {"code": "avgPrice", - "type": 10,"name": "Ср.взв.","shortname": "Ср.взв.,%","visible": true,"searchable": true,"sortable": true - } - , - {"code": "duration", - "type": 3,"name": "Срок, дней","shortname": "Срок","searchable": true,"sortable": true - } - , - {"code": "createdAt", - "type": 5,"name": "Время регистрации сделки","shortname": "Время сделки","visible": true,"searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "type": 5,"name": "Время изменения сделки","shortname": "Время изменения","visible": false,"searchable": true,"sortable": true - } - , - {"code": "tradingDate", - "type": 6,"name": "Дата торгов","shortname": "Дата торгов","visible": false,"searchable": true,"sortable": true + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" } ] } , - "chargeTariff": { + "notification": { - "name": "Тарифы комиссий", + "name": "Сообщения", + + "destination": "notifications", + + "class": "ru.clearing.classes.statics.data.misc.Notification", "logUpdates": "true", - "table": "charge_tariff", + "table": "notification", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } - , - {"code": "market", - "type": 12,"name": "Секция","shortname": "Секция","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "name" - } - , - {"code": "clearingMemberCategory", - "type": 12,"name": "Категория участника клиринга","shortname": "Категория","searchable": true,"sortable": true,"visible": true,"link": "clearingCategory" - } - , - {"code": "chargeTypeId", - "type": 1,"name": "Тип комиссии","shortname": "Тип комиссии","searchable": true,"sortable": true,"link": "chargeType","visible": true - } - , - {"code": "chargeRate", - "type": 10,"name": "Ставка комиссионного сбора","shortname": "Ставка комиссионного сбора","searchable": true,"sortable": true,"visible": true - } - , - {"code": "currency", - "type": 1,"name": "Валюта начисления комиссии","shortname": "Валюта комиссии","searchable": true,"sortable": true,"visible": true,"link": "currencyCode","linkCode": "code" - } - , - {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Дата начала срока действия","searchable": true,"sortable": true - } - , - {"code": "validToDate", - "type": 6,"name": "Дата окончания срока действия","shortname": "Дата окончания срока действия","searchable": true,"sortable": true - } , {"code": "createdAt", - "field": "created","type": 4,"name": "Создано","shortname": "Создано","searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Изменено","shortname": "Изменено","searchable": true,"sortable": true + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "clearingDate", + "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"visible": true + } + , + {"code": "senderId", + "type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company" + } + , + {"code": "addresseeId", + "type": 1,"dbname": "Идентификатор компании-получателя","name": "Наименование компании-получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company" + } + , + {"code": "objectType", + "type": 12,"dbname": "Код типа объекта","name": "Наименование типа объекта","shortname": "Объект","searchable": true,"sortable": true,"link": "objectType" + } + , + {"code": "objectId", + "type": 1,"name": "Идентификатор объекта","shortname": "ID объекта","searchable": true,"sortable": true + } + , + {"code": "notificationStatus", + "type": 12,"dbname": "Код статуса сообщения","name": "Наименование статуса сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus" } ] - - } - , - "individualChargeTariff": { - - "name": "Индивидуальные тарифы комиссий для Участника", - - "logUpdates": "true", - - "table": "individual_charge_tariff", - - "fields": [ + ,"actions":[ + {"method":"put", + + "name": "Изменение статуса сообщения", + + "fields": [ {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "notification","linkCode": "id","required": true } , - {"code": "companyId", - "type": 1,"name": "Участник","shortname": "Участник","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" - } - , - {"code": "market", - "type": 12,"name": "Секция","shortname": "Секция","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "name" - } - , - {"code": "clearingMemberCategory", - "type": 12,"name": "Категория участника клиринга","shortname": "Категория","searchable": true,"sortable": true,"visible": true,"link": "clearingCategory" - } - , - {"code": "chargeTypeId", - "type": 1,"name": "Тип комиссии","shortname": "Тип комиссии","searchable": true,"sortable": true,"link": "chargeType","visible": true - } - , - {"code": "chargeRate", - "type": 10,"name": "Ставка комиссионного сбора","shortname": "Ставка комиссионного сбора","searchable": true,"sortable": true,"visible": true - } - , - {"code": "currency", - "type": 1,"name": "Валюта начисления комиссии","shortname": "Валюта комиссии","searchable": true,"sortable": true,"visible": true,"link": "currencyCode","linkCode": "code" - } - , - {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Дата начала срока действия","searchable": true,"sortable": true - } - , - {"code": "validToDate", - "type": 6,"name": "Дата окончания срока действия","shortname": "Дата окончания срока действия","searchable": true,"sortable": true - } - , - {"code": "createdAt", - "field": "created","type": 4,"name": "Создано","shortname": "Создано","searchable": true,"sortable": true - } - , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Изменено","shortname": "Изменено","searchable": true,"sortable": true + {"code": "notificationStatus", + "type": 12,"name": "Наименование статуса сообщения","shortname": "Статус","link": "notificationStatus","required": true } ] - + } + ] } , - "companyTariff": { + "verificationResult": { - "name": "Тарифы комиссий в разрезе Участника", + "name": "Результаты сверки", - "class": "", + "destination": "verification-results", - "table": "company_tariff", + "class": "ru.clearing.classes.statics.data.clearing.VerificationResult", + + "table": "verification_result", "fields": [ + {"code": "clearingCode", + "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код","searchable": true,"sortable": true,"visible": true + } + , + {"code": "accountId", + "type": 1,"dbname": "Идентификатор счета УК, по которому проводится сверка","name": "Счет УК, по которому проводится сверка","shortname": "Счет УК","searchable": true,"sortable": true + } + , + {"code": "inSum", + "type": 11,"name": "Входящая сумма остатков","shortname": "Остатки","visible": true,"searchable": true,"sortable": true + } + , + {"code": "outIntSum", + "type": 11,"name": "Исходящая сумма остатков, полученная в КС","shortname": "Остатки, полученные в КС","visible": true,"searchable": true,"sortable": true + } + , + {"code": "outExtSum", + "type": 11,"name": "Исходящая сумма остатков из отчета ПРЦ","shortname": "Остатки, полученные из ПРЦ","visible": true,"searchable": true,"sortable": true + } + , + {"code": "diffSum", + "type": 11,"name": "Сумма расхождений","shortname": "Сумма расхождений","visible": true,"searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + , + {"code": "generationStatus", + "type": 12,"dbname": "Код общего статуса сверки","name": "Наименование общего статуса сверки","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" + } + , + {"code": "resultStatus", + "type": 12,"dbname": "Код статуса сверки","name": "Наименование статуса сверки","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" + } + , {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } - , - {"code": "market", - "type": 12,"name": "Секция","shortname": "Секция","searchable": true,"sortable": true,"visible": true,"link": "market","linkCode": "name" - } - , - {"code": "clearingMemberCategory", - "type": 12,"name": "Категория участника клиринга","shortname": "Категория","searchable": true,"sortable": true,"visible": true,"link": "clearingCategory" - } - , - {"code": "fullName", - "type": 2,"name": "Полное наименование Участника","shortname": "Наименование участника","searchable": true,"sortable": true,"visible": true,"length": 255,"link": "company","linkCode": "fullName" - } - , - {"code": "contract", - "type": 2,"name": "Номер договора","shortname": "Номер договора","searchable": true,"sortable": true,"visible": true,"length": 255 - } - , - {"code": "chargeTypeId", - "type": 1,"name": "Тип комиссии","shortname": "Тип комиссии","searchable": true,"sortable": true,"link": "chargeType","visible": true - } - , - {"code": "chargeRate", - "type": 10,"name": "Ставка комиссионного сбора","shortname": "Ставка комиссионного сбора","searchable": true,"sortable": true,"visible": true - } - , - {"code": "currency", - "type": 1,"name": "Валюта начисления комиссии","shortname": "Валюта комиссии","searchable": true,"sortable": true,"visible": true,"link": "currencyCode","linkCode": "code" - } - , - {"code": "validFromDate", - "type": 6,"name": "Дата начала срока действия","shortname": "Дата начала срока действия","searchable": true,"sortable": true - } - , - {"code": "validToDate", - "type": 6,"name": "Дата окончания срока действия","shortname": "Дата окончания срока действия","searchable": true,"sortable": true - } , {"code": "createdAt", - "field": "created","type": 4,"name": "Создано","shortname": "Создано","searchable": true,"sortable": true + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true } , {"code": "updatedAt", - "field": "updated","type": 4,"name": "Изменено","shortname": "Изменено","searchable": true,"sortable": true - } - , - {"code": "companyId", - "type": 1,"name": "Участник","shortname": "Участник","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true } ] @@ -7525,7 +6535,7 @@ , "sDf01": { - "name": "ДФ-01 Информация о денежных средствах, находящихся на торговых банковских счетах Участников клиринга", + "name": "ДФ-01 Информации о денежных средствах, находящихся на торговых банковских счетах участников клиринга", "class": "ru.clearing.classes.statics.data.sdf.SDf01", @@ -7672,7 +6682,7 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true } , - {"code": "inSDf01Id", + {"code": "inSDfId", "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true } ] @@ -7681,7 +6691,7 @@ , "sDf03": { - "name": "ДФ-03 Сводное платежное поручение", + "name": "ДФ-03 Реестр платежных поручений", "class": "ru.clearing.classes.statics.data.sdf.SDf03", @@ -7705,15 +6715,7 @@ } , {"code": "docnmprev", - "type": 2,"length": 16,"name": "Ссылка на предшестввующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true - } - , - {"code": "priority", - "type": 2,"length": 1,"name": "Приоритет скорости отправления сообщения","shortname": "Приоритет отправки","searchable": true,"sortable": true - } - , - {"code": "sbankcode", - "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true + "type": 2,"length": 16,"name": "Ссылка на предшествующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true } , {"code": "c_acc_deb", @@ -7739,10 +6741,6 @@ {"code": "sbanknam5", "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } - , - {"code": "rbankcode", - "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true - } , {"code": "c_acc_cred", "type": 2,"length": 35,"name": "Счет по кредиту","shortname": "","searchable": true,"sortable": true @@ -7771,10 +6769,6 @@ {"code": "pay_date", "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true } - , - {"code": "ext_date", - "type": 2,"lenght": "8","name": "Дата по выписке","shortname": "Дата по выписке","searchable": true,"sortable": true - } , {"code": "pay_val", "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true @@ -7783,93 +6777,9 @@ {"code": "sum_deb", "type": 2,"lenght": "22","name": "Сумма дебет ","shortname": "Сумма дебет","searchable": true,"sortable": true } - , - {"code": "sclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "sclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sc_code", - "type": 2,"length": 12,"name": "Код клиента-плательщика","shortname": "Код клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "acc_deb", - "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true - } - , - {"code": "rclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "rclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "acc_kr_1", - "type": 2,"length": 35,"name": "Счет кредит","shortname": "Счет кредит","searchable": true,"sortable": true - } - , - {"code": "acc_kr_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sp_code", - "type": 2,"length": 2,"name": "Код назначения платежа","shortname": "Код назначения платежа","searchable": true,"sortable": true - } , {"code": "specif_1", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_6", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "send_type", - "type": 2,"length": 10,"name": "Тип отправления плат. поручения","shortname": "Тип отправления плат. поручения","searchable": true,"sortable": true - } - , - {"code": "servdate", - "type": 2,"length": 8,"name": "Дата получения товара, оказания услуг в плат. поручении","shortname": "Дата получения товара","searchable": true,"sortable": true - } - , - {"code": "doc_result", - "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true } , {"code": "imp_result", @@ -7893,7 +6803,7 @@ , "sDf04": { - "name": "ДФ-04 Подтверждение переводов из Расчетной организации для СПВБ", + "name": "ДФ-04 Подтверждение проведения расчетов", "class": "ru.clearing.classes.statics.data.sdf.SDf04", @@ -7917,15 +6827,7 @@ } , {"code": "docnmprev", - "type": 2,"length": 16,"name": "Ссылка на предшестввующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true - } - , - {"code": "priority", - "type": 2,"length": 1,"name": "Приоритет скорости отправления сообщения","shortname": "Приоритет отправки","searchable": true,"sortable": true - } - , - {"code": "sbankcode", - "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true + "type": 2,"length": 16,"name": "Ссылка на предшествующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true } , {"code": "c_acc_deb", @@ -7951,10 +6853,6 @@ {"code": "sbanknam5", "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } - , - {"code": "rbankcode", - "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true - } , {"code": "c_acc_cred", "type": 2,"length": 35,"name": "Счет по кредиту","shortname": "","searchable": true,"sortable": true @@ -7983,10 +6881,6 @@ {"code": "pay_date", "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true } - , - {"code": "ext_date", - "type": 2,"lenght": "8","name": "Дата по выписке","shortname": "Дата по выписке","searchable": true,"sortable": true - } , {"code": "pay_val", "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true @@ -7995,93 +6889,9 @@ {"code": "sum_deb", "type": 2,"lenght": "22","name": "Сумма дебет ","shortname": "Сумма дебет","searchable": true,"sortable": true } - , - {"code": "sclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "sclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sc_code", - "type": 2,"length": 12,"name": "Код клиента-плательщика","shortname": "Код клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "acc_deb", - "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true - } - , - {"code": "rclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "rclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "acc_kr_1", - "type": 2,"length": 35,"name": "Счет кредит","shortname": "Счет кредит","searchable": true,"sortable": true - } - , - {"code": "acc_kr_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sp_code", - "type": 2,"length": 2,"name": "Код назначения платежа","shortname": "Код назначения платежа","searchable": true,"sortable": true - } , {"code": "specif_1", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_6", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "send_type", - "type": 2,"length": 10,"name": "Тип отправления плат. поручения","shortname": "Тип отправления плат. поручения","searchable": true,"sortable": true - } - , - {"code": "servdate", - "type": 2,"length": 8,"name": "Дата получения товара, оказания услуг в плат. поручении","shortname": "Дата получения товара","searchable": true,"sortable": true - } - , - {"code": "doc_result", - "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true } , {"code": "imp_result", @@ -8105,7 +6915,7 @@ , "sDf05": { - "name": "ДФ-05 Уведомление о завершении расчетов в ПРЦ", + "name": "ДФ-05 Уведомление о завершении расчетов", "class": "ru.clearing.classes.statics.data.sdf.SDf05", @@ -8143,45 +6953,13 @@ } , - "sDf08": { + "sDf06": { - "name": "ДФ-08 Запрос остатков по всем счетам", + "name": "ДФ-06 Запрос на зачисление/списание денежных средств", - "class": "ru.clearing.classes.statics.data.sdf.SDf08", + "class": "ru.clearing.classes.statics.data.sdf.SDf06", - "table": "s_df_08", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "number", - "type": 2,"length": 10,"name": "Номер запроса остатков по счетам","shortname": "Номер запроса","searchable": true,"sortable": true,"visible": true - } - , - {"code": "datetime", - "type": 2,"length": 13,"name": "Дата и время сообщения","shortname": "Дата и время сообщения","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf09": { - - "name": "ДФ-09 Уведомление о поступлении средств на клиринговый счет", - - "class": "ru.clearing.classes.statics.data.sdf.SDf09", - - "table": "s_df_09", + "table": "s_df_06", "fields": [ {"code": "id", @@ -8203,565 +6981,13 @@ {"code": "type", "type": 2,"length": 1,"name": "Код типа платежного документа (операции)","shortname": "Код типа платежного документа","searchable": true,"sortable": true } - , - {"code": "number", - "type": 10,"name": "Номер платежного документа (операции)","shortname": "Номер запроса","searchable": true,"sortable": true - } - , - {"code": "inn", - "field": "inn","type": 10,"name": "ИНН","shortname": "ИНН","searchable": true,"sortable": true,"visible": true - } - , - {"code": "fileName", - "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время обработки файла","shortname": "Дата и время обработки","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf10": { - - "name": "ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет", - - "class": "ru.clearing.classes.statics.data.sdf.SDf10", - - "table": "s_df_10", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "account", - "type": 2,"length": 20,"name": "Номер счета участника торгов","shortname": "Номер счета участника торгов","searchable": true,"sortable": true - } - , - {"code": "sum", - "type": 10,"name": "Сумма платежного документа (операции)","shortname": "Сумма платежного документа","searchable": true,"sortable": true - } - , - {"code": "market", - "type": 2,"length": 1,"name": "Код сегмента рынка","shortname": "Код сегмента рынка","searchable": true,"sortable": true - } - , - {"code": "type", - "type": 2,"length": 1,"name": "Код типа платежного документа (операции)","shortname": "Код типа платежного документа","searchable": true,"sortable": true - } - , - {"code": "number", - "type": 10,"name": "Номер платежного документа (операции)","shortname": "Номер запроса","searchable": true,"sortable": true - } - , - {"code": "inn", - "type": 10,"name": "ИНН","shortname": "ИНН","searchable": true,"sortable": true,"visible": true - } - , - {"code": "result", - "type": 2,"length": 3,"name": "Результат приема","shortname": "Результат приема","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - , - {"code": "inSDf09Id", - "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true - } - ] - - } - , - "sDf11": { - - "name": "ДФ-11 Из КС в ПРЦ Платежное распоряжение на перевод средств с ТБС Участника на КС Инициатора", - - "class": "ru.clearing.classes.statics.data.sdf.SDf11", - - "table": "s_df_11", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "seg_type", - "type": 2,"length": 1,"name": "Код инициатора в КС","shortname": "Инициатор в КС","searchable": true,"sortable": true - } - , - {"code": "doc_type", - "type": 2,"lenght": "4","name": "Тип документа","shortname": "Тип документа","searchable": true,"sortable": true - } - , - {"code": "docnm_ref", - "type": 2,"length": 16,"name": "Ссылочный номер документа у отправителя","shortname": "Номер документа у отправителя","searchable": true,"sortable": true - } - , - {"code": "docnmprev", - "type": 2,"length": 16,"name": "Ссылка на предшестввующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true - } - , - {"code": "priority", - "type": 2,"length": 1,"name": "Приоритет скорости отправления сообщения","shortname": "Приоритет отправки","searchable": true,"sortable": true - } - , - {"code": "sbankcode", - "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true - } - , - {"code": "c_acc_deb", - "type": 2,"length": 35,"name": "Счет по дебету","shortname": "Счет по дебету","searchable": true,"sortable": true - } - , - {"code": "sbanknam1", - "type": 2,"length": 35,"name": "Наименование банка-плательщика","shortname": "Наименование банка-плательщика","searchable": true,"sortable": true - } - , - {"code": "sbanknam2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbankcode", - "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true - } - , - {"code": "c_acc_cred", - "type": 2,"length": 35,"name": "Счет по кредиту","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbanknam1", - "type": 2,"length": 35,"name": "Наименование банка-получателя","shortname": "Наименование банка-получателя","searchable": true,"sortable": true - } - , - {"code": "rbanknam2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbanknam3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbanknam4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbanknam5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "pay_date", - "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true - } - , - {"code": "ext_date", - "type": 2,"lenght": "8","name": "Дата по выписке","shortname": "Дата по выписке","searchable": true,"sortable": true - } - , - {"code": "pay_val", - "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true - } - , - {"code": "sum_deb", - "type": 2,"lenght": "22","name": "Сумма дебет ","shortname": "Сумма дебет","searchable": true,"sortable": true - } - , - {"code": "sclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "sclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sc_code", - "type": 2,"length": 12,"name": "Код клиента-плательщика","shortname": "Код клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "acc_deb", - "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true - } - , - {"code": "rclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "rclientn2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "acc_kr_1", - "type": 2,"length": 35,"name": "Счет кредит","shortname": "Счет кредит","searchable": true,"sortable": true - } - , - {"code": "acc_kr_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sp_code", - "type": 2,"length": 2,"name": "Код назначения платежа","shortname": "Код назначения платежа","searchable": true,"sortable": true - } - , - {"code": "specif_1", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "specif_6", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "send_type", - "type": 2,"length": 10,"name": "Тип отправления плат. поручения","shortname": "Тип отправления плат. поручения","searchable": true,"sortable": true - } - , - {"code": "servdate", - "type": 2,"length": 8,"name": "Дата получения товара, оказания услуг в плат. поручении","shortname": "Дата получения товара","searchable": true,"sortable": true - } - , - {"code": "doc_result", - "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - , - {"code": "paymentInstructionId", - "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true,"link": "paymentInstruction" - } - ] - - } - , - "sDf12": { - - "name": "ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК", - - "class": "ru.clearing.classes.statics.data.sdf.SDf12", - - "table": "s_df_12", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "account", - "type": 2,"length": 25,"name": "Код счета участника клиринга","shortname": "Код счета УК","searchable": true,"sortable": true,"visible": true - } , {"code": "deal", - "type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 10,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true } , - {"code": "status", - "type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true - } - , - {"code": "fileName", - "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время обработки файла","shortname": "Дата и время обработки","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf13": { - - "name": "ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО", - - "class": "ru.clearing.classes.statics.data.sdf.SDf13", - - "table": "s_df_13", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "seg_type", - "type": 2,"length": 1,"name": "Код инициатора в КС","shortname": "Инициатор в КС","searchable": true,"sortable": true - } - , - {"code": "doc_type", - "type": 2,"lenght": "4","name": "Тип документа","shortname": "Тип документа","searchable": true,"sortable": true - } - , - {"code": "docnm_ref", - "type": 2,"length": 16,"name": "Ссылочный номер документа у отправителя","shortname": "Номер документа у отправителя","searchable": true,"sortable": true - } - , - {"code": "docnmprev", - "type": 2,"length": 16,"name": "Ссылка на предшестввующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true - } - , - {"code": "priority", - "type": 2,"length": 1,"name": "Приоритет скорости отправления сообщения","shortname": "Приоритет отправки","searchable": true,"sortable": true - } - , - {"code": "sbankcode", - "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true - } - , - {"code": "c_acc_deb", - "type": 2,"length": 35,"name": "Кор счет банка - плательщика в системе - акт.","shortname": "Кор счет банка - плательщика","searchable": true,"sortable": true - } - , - {"code": "sbanknam1", - "type": 2,"length": 35,"name": "Наименование банка-плательщика","shortname": "Наименование банка-плательщика","searchable": true,"sortable": true - } - , - {"code": "sbanknam2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam3", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sbanknam5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbankcode", - "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true - } - , - {"code": "c_acc_cred", - "type": 2,"length": 35,"name": "Кор счет банка - получателя в системе - акт. ","shortname": "Кор счет банка - получателя","searchable": true,"sortable": true - } - , - {"code": "rbanknam1", - "type": 2,"length": 35,"name": "Наименование банка-получателя","shortname": "Наименование банка-получателя","searchable": true,"sortable": true - } - , - {"code": "op_type", - "type": 2,"length": 2,"name": "Вид операции","shortname": "Вид операции","searchable": true,"sortable": true - } - , - {"code": "op_order", - "type": 2,"length": 1,"name": "Очередность платежа","shortname": "Очередность платежа","searchable": true,"sortable": true - } - , - {"code": "rbanknam4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "rbanknam5", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "pay_date", - "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true - } - , - {"code": "ext_date", - "type": 2,"lenght": "8","name": "Дата по выписке","shortname": "Дата по выписке","searchable": true,"sortable": true - } - , - {"code": "pay_val", - "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true - } - , - {"code": "sum_deb", - "type": 2,"lenght": "22","name": "Сумма дебет ","shortname": "Сумма дебет","searchable": true,"sortable": true - } - , - {"code": "sclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "inn_deb", - "type": 2,"length": 12,"name": "ИНН клиента-плательщика","shortname": "ИНН клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "kpp_deb", - "type": 2,"length": 9,"name": "КПП клиента-плательщика","shortname": "КПП клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "sclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sc_code", - "type": 2,"length": 12,"name": "Код клиента-плательщика","shortname": "Код клиента-плательщика","searchable": true,"sortable": true - } - , - {"code": "acc_deb", - "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true - } - , - {"code": "rclientn1", - "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "inn_cred", - "type": 2,"length": 12,"name": "ИНН клиента-получателя","shortname": "ИНН клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "kpp_cred", - "type": 2,"length": 9,"name": "КПП клиента-получателя","shortname": "КПП клиента-получателя","searchable": true,"sortable": true - } - , - {"code": "rclientn4", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "acc_kr_1", - "type": 2,"length": 35,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true - } - , - {"code": "acc_kr_2", - "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "sp_code", - "type": 2,"length": 2,"name": "Код назначения платежа","shortname": "Код назначения платежа","searchable": true,"sortable": true - } - , - {"code": "specif_1", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_2", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_3", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_4", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_5", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "specif_6", - "type": 2,"length": 35,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true - } - , - {"code": "send_type", - "type": 2,"length": 10,"name": "Вид платежа","shortname": "Вид платежа","searchable": true,"sortable": true - } - , - {"code": "servdate", - "type": 2,"length": 8,"name": "Дата получения товара, оказания услуг в плат. поручении","shortname": "Дата получения товара","searchable": true,"sortable": true - } - , - {"code": "doc_result", - "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true - } - , - {"code": "generationTime", - "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true - } - , - {"code": "generationId", - "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true - } - ] - - } - , - "sDf16": { - - "name": "ДФ-16 Формат запроса по возврату депозита или дозачисление/списание денежных средств", - - "class": "ru.clearing.classes.statics.data.sdf.SDf16", - - "table": "s_df_16", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "account", - "type": 2,"length": 20,"name": "Номер счета участника торгов","shortname": "Номер счета участника торгов","searchable": true,"sortable": true - } - , - {"code": "sum", - "type": 10,"name": "Сумма платежного документа (операции)","shortname": "Сумма платежного документа","searchable": true,"sortable": true - } - , - {"code": "market", - "type": 2,"length": 1,"name": "Код сегмента рынка","shortname": "Код сегмента рынка","searchable": true,"sortable": true - } - , - {"code": "type", - "type": 2,"length": 1,"name": "Код типа платежного документа (операции)","shortname": "Код типа платежного документа","searchable": true,"sortable": true + {"code": "clientN", + "type": 2,"length": 35,"name": "Наименование клиента - плательщика","shortname": "Плательщик","searchable": true,"sortable": true } , {"code": "inn", @@ -8795,13 +7021,13 @@ } , - "sDf17": { + "sDf07": { - "name": "ДФ-17 Формат ответа на запрос по возврату депозита или дозачисление/списание денежных средств", + "name": "ДФ-07 Ответ на запрос по зачислению/списанию денежных средств", - "class": "ru.clearing.classes.statics.data.sdf.SDf17", + "class": "ru.clearing.classes.statics.data.sdf.SDf07", - "table": "s_df_17", + "table": "s_df_07", "fields": [ {"code": "id", @@ -8823,6 +7049,14 @@ {"code": "type", "type": 2,"length": 1,"name": "Код типа платежного документа (операции)","shortname": "Код типа платежного документа","searchable": true,"sortable": true } + , + {"code": "deal", + "type": 2,"length": 10,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "clientN", + "type": 2,"length": 35,"name": "Наименование клиента - плательщика","shortname": "Плательщик","searchable": true,"sortable": true + } , {"code": "inn", "type": 10,"name": "ИНН","shortname": "ИНН","searchable": true,"sortable": true,"visible": true @@ -8852,20 +7086,492 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true } , - {"code": "inSDf16Id", + {"code": "inSDfId", "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true } ] } , - "sDf18": { + "sDf08": { - "name": "ДФ-18 Из КС в ПРЦ Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие)", + "name": "ДФ-08 Загрузка счетов с остатками", - "class": "ru.clearing.classes.statics.data.sdf.SDf18", + "class": "ru.clearing.classes.statics.data.sdf.SDf08", - "table": "s_df_18", + "table": "s_df_08", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "depoCode", + "type": 2,"name": "Код раздела субсчета/счета депо","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securityCode", + "type": 2,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "clientName", + "type": 2,"name": "Наименование клиента","shortname": "Клиент","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf09": { + + "name": "ДФ-09 Ответ на загрузку счетов с остатками", + + "class": "ru.clearing.classes.statics.data.sdf.SDf09", + + "table": "s_df_09", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "inDocument", + "type": 2,"name": "Исходящий номер входящего сообщения","shortname": "Исходящий номер","searchable": true,"sortable": true + } + , + {"code": "depoCode", + "type": 2,"name": "Код раздела субсчета/счета депо","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securityCode", + "type": 2,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "clientName", + "type": 2,"name": "Наименование клиента","shortname": "Клиент","searchable": true,"sortable": true + } + , + {"code": "result", + "type": 10,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf10": { + + "name": "ДФ-10 Запрос на зачисление/списание ценных бумаг", + + "class": "ru.clearing.classes.statics.data.sdf.SDf10", + + "table": "s_df_10", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "depoCode", + "type": 2,"name": "Код раздела субсчета/счета депо","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securityCode", + "type": 2,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "clientName", + "type": 2,"name": "Наименование клиента","shortname": "Клиент","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf11": { + + "name": "ДФ-11 Ответ на Запрос на зачисление/списание ценных бумаг", + + "class": "ru.clearing.classes.statics.data.sdf.SDf11", + + "table": "s_df_11", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "inDocument", + "type": 2,"name": "Исходящий номер входящего сообщения","shortname": "Сформировано","searchable": true,"sortable": true + } + , + {"code": "depoCode", + "type": 2,"name": "Код раздела субсчета/счета депо","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securityCode", + "type": 2,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "clientName", + "type": 2,"name": "Наименование клиента","shortname": "Клиент","searchable": true,"sortable": true + } + , + {"code": "result", + "type": 10,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf12": { + + "name": "ДФ-12 Распоряжение на проведение операций по итогам клиринга", + + "class": "ru.clearing.classes.statics.data.sdf.SDf12", + + "table": "s_df_12", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество ценных бумаг","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "securityCode", + "type": 2,"name": "Код ценной бумаги","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "depoCodeSender", + "type": 2,"name": "Депо счет списания","shortname": "Счет списания","searchable": true,"sortable": true + } + , + {"code": "depoCodeAdressee", + "type": 2,"name": "Депо счет зачисления","shortname": "Счет зачисления","searchable": true,"sortable": true + } + , + {"code": "result", + "type": 10,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf13": { + + "name": "ДФ-13 Уведомление о статусе исполнения или мотивированный отказ", + + "class": "ru.clearing.classes.statics.data.sdf.SDf13", + + "table": "s_df_13", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "inDocument", + "type": 2,"name": "Исходящий номер входящего сообщения","shortname": "Сформировано","searchable": true,"sortable": true + } + , + {"code": "result", + "type": 10,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true + } + , + {"code": "textError", + "type": 2,"name": "Описание ошибки","shortname": "Ошибка","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf14": { + + "name": "ДФ-14 Уведомление о завершении расчетов", + + "class": "ru.clearing.classes.statics.data.sdf.SDf14", + + "table": "s_df_14", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "result", + "type": 10,"name": "Результат операции","shortname": "Результат операции","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf20": { + + "name": "ДФ-20 Отчет об исполнении поручения на зачисление/списание ценных бумаг", + + "class": "ru.clearing.classes.statics.data.sdf.SDf20", + + "table": "s_df_20", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "outDocument", + "type": 2,"name": "Уникальный исходящий номер сообщения","shortname": "Исходящий номер сообщения","searchable": true,"sortable": true + } + , + {"code": "inDocument", + "type": 2,"name": "Исходящий номер входящего сообщения","shortname": "Сформировано","searchable": true,"sortable": true + } + , + {"code": "security", + "type": 2,"name": "Ценная бумага","shortname": "Ценная бумага","searchable": true,"sortable": true + } + , + {"code": "openBalance", + "type": 2,"name": "Входящий остаток","shortname": "Входящий остаток","searchable": true,"sortable": true + } + , + {"code": "depoCodeCl", + "type": 2,"name": "Код раздела тех.счета/счета депо/ и наименование клиента","shortname": "Код раздела тех.счета/счета депо/ и наименование клиента","searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 2,"name": "Количество ценных бумаг","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "operationCode", + "type": 2,"name": "Код операции","shortname": "Количество","searchable": true,"sortable": true + } + , + {"code": "depoCodeCorr", + "type": 2,"name": "Код раздела субсчета/счета депо корреспондента","shortname": "Код счета депо","searchable": true,"sortable": true + } + , + {"code": "operationDate", + "type": 2,"name": "Дата операции","shortname": "Дата операции","searchable": true,"sortable": true + } + , + {"code": "closeBalance", + "type": 2,"name": "Исходящий остаток","shortname": "Исходящий остаток","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf51": { + + "name": "ДФ-51 Запрос остатков по всем счетам", + + "class": "ru.clearing.classes.statics.data.sdf.SDf51", + + "table": "s_df_51", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "number", + "type": 2,"length": 10,"name": "Номер запроса остатков по счетам","shortname": "Номер запроса","searchable": true,"sortable": true,"visible": true + } + , + {"code": "datetime", + "type": 2,"length": 13,"name": "Дата и время сообщения","shortname": "Дата и время сообщения","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf52": { + + "name": "ДФ-52 Из ПРЦ в КС Информация о состоянии счета (блокировка/разблокировка/закрытие/открытие)", + + "class": "ru.clearing.classes.statics.data.sdf.SDf52", + + "table": "s_df_52", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "account", + "type": 2,"length": 25,"name": "Код счета участника клиринга","shortname": "Код счета УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "acc_name", + "type": 2,"length": 30,"name": "Наименование участника клиринга","shortname": "Наименование УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "deal", + "type": 2,"length": 4,"name": "Биржевой код участника клиринга","shortname": "Биржевой код УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "date", + "type": 2,"lenght": "8","name": "Дата изменения состояния счета","shortname": "Дата изменения состояния счета","searchable": true,"sortable": true + } + , + {"code": "status", + "type": 3,"name": "Статус счета","shortname": "Статус","searchable": true,"sortable": true,"visible": true + } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время обработки файла","shortname": "Дата и время обработки","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf53": { + + "name": "ДФ-53 Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие/открытие)", + + "class": "ru.clearing.classes.statics.data.sdf.SDf53", + + "table": "s_df_53", "fields": [ {"code": "id", @@ -8896,175 +7602,1018 @@ "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true } , - {"code": "inSDf12Id", + {"code": "inSDfId", "type": 1,"name": "Идентификатор соответствующей записи из таблицы-источника","shortname": "Входящая запись","searchable": true,"sortable": true } ] } , - "notification": { + "sDf54": { - "name": "Сообщения", + "name": "ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414", - "destination": "notifications", + "class": "ru.clearing.classes.statics.data.sdf.SDf54", - "class": "ru.clearing.classes.statics.data.misc.Notification", - - "logUpdates": "true", - - "table": "notification", + "table": "s_df_54", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } , - {"code": "createdAt", - "field": "created","type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + {"code": "seg_type", + "type": 2,"length": 1,"name": "Код инициатора в КС","shortname": "Инициатор в КС","searchable": true,"sortable": true } , - {"code": "updatedAt", - "field": "updated","type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + {"code": "doc_type", + "type": 2,"lenght": "4","name": "Тип документа","shortname": "Тип документа","searchable": true,"sortable": true } , - {"code": "clearingDate", - "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"visible": true + {"code": "docnm_ref", + "type": 2,"length": 16,"name": "Ссылочный номер документа у отправителя","shortname": "Номер документа у отправителя","searchable": true,"sortable": true } , - {"code": "senderId", - "type": 1,"name": "Идентификатор участника отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company" + {"code": "docnmprev", + "type": 2,"length": 16,"name": "Ссылка на предшествующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true } , - {"code": "addresseeId", - "type": 1,"name": "Идентификатор участника получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company" + {"code": "sbankcode", + "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true } , - {"code": "objectType", - "type": 12,"name": "Тип объекта","shortname": "Объект","searchable": true,"sortable": true,"link": "objectType" + {"code": "c_acc_deb", + "type": 2,"length": 35,"name": "Кор счет банка-плательщика в системе - акт.","shortname": "Кор счет банка-плательщика","searchable": true,"sortable": true } , - {"code": "objectId", - "type": 4,"name": "Идентификатор объекта","shortname": "ID объекта","searchable": true,"sortable": true + {"code": "sbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-плательщика","shortname": "Наименование банка-плательщика","searchable": true,"sortable": true } , - {"code": "notificationStatus", - "type": 12,"name": "Статус сообщения","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "notificationStatus" - } - ] - ,"actions":[ - {"method":"put", - - "name": "Изменение статуса сообщения", - - "fields": [ - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","link": "notification","linkCode": "id","required": true + {"code": "sbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } , - {"code": "notificationStatus", - "type": 12,"name": "Статус сообщения","shortname": "Статус","link": "notificationStatus","required": true - } - ] - } - ] + {"code": "sbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } , - "verificationResult": { - - "name": "Результаты сверки", - - "destination": "verification-results", - - "class": "ru.clearing.classes.statics.data.clearing.VerificationResult", - - "table": "verification_result", - - "fields": [ - {"code": "clearingCode", - "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Клиринговый код","searchable": true,"sortable": true,"visible": true + {"code": "sbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } , - {"code": "accountId", - "type": 1,"name": "Счет УК, по которому проводится сверка","shortname": "Счет УК","searchable": true,"sortable": true + {"code": "sbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true } , - {"code": "inSum", - "type": 11,"name": "Входящая сумма остатков","shortname": "Остатки","visible": true,"searchable": true,"sortable": true + {"code": "rbankcode", + "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true } , - {"code": "outIntSum", - "type": 11,"name": "Исходящая сумма остатков, полученная в КС","shortname": "Остатки, полученные в КС","visible": true,"searchable": true,"sortable": true + {"code": "c_acc_cred", + "type": 2,"length": 35,"name": "Кор счет банка-получателя в системе - акт. ","shortname": "Кор счет банка-получателя","searchable": true,"sortable": true } , - {"code": "outExtSum", - "type": 11,"name": "Исходящая сумма остатков из отчета ПРЦ","shortname": "Остатки, полученные из ПРЦ","visible": true,"searchable": true,"sortable": true + {"code": "rbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-получателя","shortname": "Наименование банка-получателя","searchable": true,"sortable": true } , - {"code": "diffSum", - "type": 11,"name": "Сумма расхождений","shortname": "Сумма расхождений","visible": true,"searchable": true,"sortable": true + {"code": "rbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "op_type", + "type": 2,"length": 2,"name": "Вид операции","shortname": "Вид операции","searchable": true,"sortable": true + } + , + {"code": "op_order", + "type": 2,"length": 1,"name": "Очередность платежа","shortname": "Очередность платежа","searchable": true,"sortable": true + } + , + {"code": "pay_date", + "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true + } + , + {"code": "pay_val", + "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true + } + , + {"code": "sum_deb", + "type": 2,"lenght": "22","name": "Сумма дебет","shortname": "Сумма дебет","searchable": true,"sortable": true + } + , + {"code": "sclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "sclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_deb", + "type": 2,"length": 12,"name": "ИНН клиента-плательщика","shortname": "ИНН клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "kpp_deb", + "type": 2,"length": 9,"name": "КПП клиента-плательщика","shortname": "КПП клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "acc_deb", + "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true + } + , + {"code": "rclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "rclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_cred", + "type": 2,"length": 12,"name": "ИНН клиента-получателя","shortname": "ИНН клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "kpp_cred", + "type": 2,"length": 9,"name": "КПП клиента-получателя","shortname": "КПП клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "acc_kr_1", + "type": 2,"length": 35,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true + } + , + {"code": "specif_1", + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true + } + , + {"code": "send_type", + "type": 2,"length": 10,"name": "Вид платежа","shortname": "Вид платежа","searchable": true,"sortable": true + } + , + {"code": "doc_result", + "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true } , {"code": "generationId", "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true } - , - {"code": "generationStatus", - "type": 12,"name": "Общий статус сверки","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" - } - , - {"code": "resultStatus", - "type": 12,"name": "Статус сверки","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" - } - , - {"code": "id", - "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true - } - , - {"code": "createdAt", - "type": 4,"name": "Дата и время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true - } - , - {"code": "updatedAt", - "type": 4,"name": "Дата и время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true - } ] } , - "moneyMarketSession": { + "sDf55": { - "name": "Сессия денежного рынка", + "name": "ДФ-55 Квитанция об обработке ДФ-54", - "class": "com.spicex.TransactionData.Session", + "class": "ru.clearing.classes.statics.data.sdf.SDf54", - "logUpdates": "true", - - "table": "money_market_session", + "table": "s_df_55", "fields": [ {"code": "id", "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true } , - {"code": "clearingDate", - "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"visible": true,"extends": "session" + {"code": "seg_type", + "type": 2,"length": 1,"name": "Код инициатора в КС","shortname": "Инициатор в КС","searchable": true,"sortable": true } , - {"code": "sessionStatus", - "type": 12,"name": "Статус клиринговой сессии","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "sessionStatus","extends": "session" + {"code": "doc_type", + "type": 2,"lenght": "4","name": "Тип документа","shortname": "Тип документа","searchable": true,"sortable": true } , + {"code": "docnm_ref", + "type": 2,"length": 16,"name": "Ссылочный номер документа у отправителя","shortname": "Номер документа у отправителя","searchable": true,"sortable": true + } + , + {"code": "docnmprev", + "type": 2,"length": 16,"name": "Ссылка на предшествующий документ","shortname": "Предшествующий документ","searchable": true,"sortable": true + } + , + {"code": "sbankcode", + "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true + } + , + {"code": "c_acc_deb", + "type": 2,"length": 35,"name": "Кор счет банка-плательщика в системе - акт.","shortname": "Кор счет банка-плательщика","searchable": true,"sortable": true + } + , + {"code": "sbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-плательщика","shortname": "Наименование банка-плательщика","searchable": true,"sortable": true + } + , + {"code": "sbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbankcode", + "type": 2,"length": 12,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true + } + , + {"code": "c_acc_cred", + "type": 2,"length": 35,"name": "Кор счет банка-получателя в системе - акт. ","shortname": "Кор счет банка-получателя","searchable": true,"sortable": true + } + , + {"code": "rbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-получателя","shortname": "Наименование банка-получателя","searchable": true,"sortable": true + } + , + {"code": "rbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "op_type", + "type": 2,"length": 2,"name": "Вид операции","shortname": "Вид операции","searchable": true,"sortable": true + } + , + {"code": "op_order", + "type": 2,"length": 1,"name": "Очередность платежа","shortname": "Очередность платежа","searchable": true,"sortable": true + } + , + {"code": "pay_date", + "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true + } + , + {"code": "pay_val", + "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true + } + , + {"code": "sum_deb", + "type": 2,"lenght": "22","name": "Сумма дебет","shortname": "Сумма дебет","searchable": true,"sortable": true + } + , + {"code": "sclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Наименование клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "sclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_deb", + "type": 2,"length": 12,"name": "ИНН клиента-плательщика","shortname": "ИНН клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "kpp_deb", + "type": 2,"length": 9,"name": "КПП клиента-плательщика","shortname": "КПП клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "acc_deb", + "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true + } + , + {"code": "rclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Наименование клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "rclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_cred", + "type": 2,"length": 12,"name": "ИНН клиента-получателя","shortname": "ИНН клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "kpp_cred", + "type": 2,"length": 9,"name": "КПП клиента-получателя","shortname": "КПП клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "acc_kr_1", + "type": 2,"length": 35,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true + } + , + {"code": "specif_1", + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true + } + , + {"code": "send_type", + "type": 2,"length": 10,"name": "Вид платежа","shortname": "Вид платежа","searchable": true,"sortable": true + } + , + {"code": "doc_result", + "type": 2,"length": 2,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время обработки файла","shortname": "Дата и время обработки","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf56": { + + "name": "ДФ-56 Запрос транзакций за период", + + "class": "ru.clearing.classes.statics.data.sdf.SDf55", + + "table": "s_df_56", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "number", + "type": 2,"length": 10,"name": "Номер запроса","shortname": "Номер запроса","searchable": true,"sortable": true + } + , + {"code": "start_datetime", + "type": 2,"length": 13,"name": "Дата и время для фильтрации транзакций с большим или равным указанным параметром","shortname": "Дата и время начала","searchable": true,"sortable": true + } + , + {"code": "end_datetime", + "type": 2,"length": 13,"name": "Дата и время для фильтрации транзакций с меньшим указанным параметром","shortname": "Дата и время окончания","searchable": true,"sortable": true + } + , + {"code": "account", + "type": 2,"length": 25,"name": "Код счета участника клиринга для фильтрации транзакций по значению","shortname": "Счет участника клиринга","searchable": true,"sortable": true + } + , + {"code": "deal", + "type": 2,"length": 4,"name": "Биржевой код участника клиринга для фильтрации транзакций по значению","shortname": "Биржевой код участника клиринга","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "sDf57": { + + "name": "ДФ-57 Список транзакций о списании/зачислении за период по всем счетам (ТБС и КС)", + + "class": "ru.clearing.classes.statics.data.sdf.SDf56", + + "table": "s_df_57", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true + } + , + {"code": "dbfId", + "type": 1,"name": "Уникальный идентификатор платежного документа (транзакции)","shortname": "ID платежного поручения","searchable": true,"sortable": true + } + , + {"code": "deal_deb", + "type": 2,"length": 4,"name": "Биржевой код участника клиринга (плательщик)","shortname": "Инициатор в КС","searchable": true,"sortable": true + } + , + {"code": "deal_cred", + "type": 2,"lenght": "4","name": "Биржевой код участника клиринга (получатель)","shortname": "Тип документа","searchable": true,"sortable": true + } + , + {"code": "sbankcode", + "type": 2,"length": 12,"name": "Код банка-плательщика","shortname": "Код банка-плательщика","searchable": true,"sortable": true + } + , + {"code": "c_acc_deb", + "type": 2,"length": 35,"name": "Кор счет банка-плательщика в системе - акт.","shortname": "Кор счет банка-плательщика","searchable": true,"sortable": true + } + , + {"code": "sbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-плательщика","shortname": "Банк-плательщик","searchable": true,"sortable": true + } + , + {"code": "sbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbankcode", + "type": 2,"length": 35,"name": "Код банка-получателя","shortname": "Код банка-получателя","searchable": true,"sortable": true + } + , + {"code": "c_acc_cred", + "type": 2,"length": 35,"name": "Кор счет банка-получателя в системе - акт.","shortname": "Кор счет банка-получателя","searchable": true,"sortable": true + } + , + {"code": "rbanknam1", + "type": 2,"length": 35,"name": "Наименование банка-получателя","shortname": "Банк-получатель","searchable": true,"sortable": true + } + , + {"code": "rbanknam2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rbanknam5", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "op_type", + "type": 2,"length": 2,"name": "Вид операции","shortname": "Вид операции","searchable": true,"sortable": true + } + , + {"code": "pay_date", + "type": 2,"lenght": "8","name": "Платеж-дата","shortname": "Платеж-дата","searchable": true,"sortable": true + } + , + {"code": "ext_date", + "type": 2,"lenght": "8","name": "Дата по выписке","shortname": "Дата по выписке","searchable": true,"sortable": true + } + , + {"code": "pay_val", + "type": 2,"length": 12,"name": "Валюта платежа","shortname": "Валюта","searchable": true,"sortable": true + } + , + {"code": "sum_deb", + "type": 2,"lenght": "22","name": "Сумма дебет","shortname": "Сумма дебет","searchable": true,"sortable": true + } + , + {"code": "sclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-плательщика","shortname": "Клиент-плательщик","searchable": true,"sortable": true + } + , + {"code": "sclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "sclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_deb", + "type": 2,"length": 12,"name": "ИНН клиента-плательщика","shortname": "ИНН клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "kpp_deb", + "type": 2,"length": 9,"name": "КПП клиента-плательщика","shortname": "КПП клиента-плательщика","searchable": true,"sortable": true + } + , + {"code": "acc_deb", + "type": 2,"length": 35,"name": "Счет клиента-плательщика(дебет)","shortname": "Счет клиента-плательщика(дебет)","searchable": true,"sortable": true + } + , + {"code": "rclientn1", + "type": 2,"length": 35,"name": "Наименование клиента-получателя","shortname": "Клиент-получатель","searchable": true,"sortable": true + } + , + {"code": "rclientn2", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn3", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "rclientn4", + "type": 2,"length": 35,"name": "","shortname": "","searchable": true,"sortable": true + } + , + {"code": "inn_cred", + "type": 2,"length": 12,"name": "ИНН клиента-получателя","shortname": "ИНН клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "kpp_cred", + "type": 2,"length": 9,"name": "КПП клиента-получателя","shortname": "КПП клиента-получателя","searchable": true,"sortable": true + } + , + {"code": "acc_kr", + "type": 2,"length": 35,"name": "Счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true + } + , + {"code": "specif", + "type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","searchable": true,"sortable": true + } + , + {"code": "fileName", + "type": 2,"length": 255,"name": "Наименование входящего файла","shortname": "Наименование файла","searchable": true,"sortable": true + } + , + {"code": "generationTime", + "type": 4,"name": "Дата и время создания записи","shortname": "Дата и время создания","searchable": true,"sortable": true + } + , + {"code": "generationId", + "type": 1,"name": "Идентификатор взаимодействия","shortname": "ID взаимодействия","searchable": true,"sortable": true + } + ] + + } + , + "managementJournal": { + + "name": "Журнал мониторинга и контроля", + + "destination": "management-journals", + + "class": "ru.clearing.classes.statics.data.journal.ManagementJournal", + + "table": "management_journal", + + "fields": [ {"code": "companyId", - "type": 1,"name": "Наименование инициатора торгов","shortname": "Инициатор","visible": false,"searchable": true,"sortable": true,"link": "company","linkCode": "shortName" - } - , - {"code": "securityId", - "type": 1,"name": "Наименование инструмента","shortname": "Инструмент","searchable": false,"sortable": true,"visible": true,"link": "moneyMarketSecurity","linkCode": "fullName" + "type": 1,"dbname": "Идентификатор компании","name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" } , {"code": "userId", - "type": 1,"name": "Наименование пользователя","shortname": "Пользователь","searchable": true,"sortable": true,"visible": true,"link": "userCls" + "type": 1,"dbname": "Идентификатор пользователя","name": "Автор сообщения","shortname": "Сотрудник","searchable": true,"sortable": true,"visible": true,"link": "userCls" + } + , + {"code": "managementJournalType", + "type": 12,"dbname": "Код типа мониторинга","name": "Наименование типа мониторинга","shortname": "Тип","searchable": true,"sortable": true,"visible": true,"link": "managementJournalType" + } + , + {"code": "managementJournalPurpose", + "type": 12,"dbname": "Код цели мониторинга","name": "Цель мониторинга","shortname": "Цель","searchable": true,"sortable": true,"visible": true,"link": "managementJournalPurpose" + } + , + {"code": "managementJournalStatus", + "type": 12,"dbname": "Код статуса","name": "Наименование статуса","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "managementJournalStatus" + } + , + {"code": "text", + "type": 2,"name": "Текст сообщения","shortname": "Сообщение","searchable": true,"visible": true,"sortable": true,"length": 4096 + } + , + {"code": "changeAccessSign", + "type": 12,"dbname": "Код признака изменения доступа","name": "Признак изменения доступа","shortname": "Изменение доступа","searchable": true,"sortable": true,"visible": true,"link": "allowed" + } + , + {"code": "changeDataSign", + "type": 12,"dbname": "Код признака изменения данных","name": "Признак изменения данных","shortname": "Изменение данных","searchable": true,"sortable": true,"visible": true,"link": "allowed" + } + , + {"code": "eventDate", + "type": 4,"name": "Дата события ЕГРЮЛ","shortname": "Дата события","searchable": true,"sortable": true + } + , + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + ] + + } + , + "inDocumentJournal": { + + "name": "Журнал входящих документов", + + "destination": "in-document-journals", + + "class": "ru.clearing.classes.statics.data.journal.InDocumentJournal", + + "table": "in_document_journal", + + "fields": [ + {"code": "registrationDate", + "type": 6,"name": "Дата регистрации","shortname": "Дата","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registrationTime", + "type": 5,"name": "Время регистрации","shortname": "Время","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registrationNumber", + "type": 1,"name": "Регистационный номер","shortname": "Регистационный номер","searchable": true,"sortable": true,"visible": true + } + , + {"code": "documentName", + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true + } + , + {"code": "sender", + "type": 2,"length": 255,"name": "Полное наименование отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"visible": true + } + , + {"code": "quantity", + "type": 1,"name": "Количествово экземпляров","shortname": "Кол-во экз.","searchable": true,"sortable": true,"visible": true + } + , + {"code": "clearingCode", + "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Код УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "courierType", + "type": 12,"dbname": "Код способа отправки","name": "Наименование способа отправки","shortname": "Способ отправки","searchable": true,"sortable": true,"visible": true,"link": "courierType" + } + , + {"code": "emailDate", + "type": 6,"name": "Дата отправки электронной почтой","shortname": "Дата отправки эл. почтой","searchable": true,"sortable": true,"visible": true + } + , + {"code": "amount", + "type": 11,"name": "Сумма","shortname": "Сумма","searchable": true,"sortable": true,"visible": true + } + , + {"code": "dossierNumber", + "type": 2,"length": 50,"name": "Номер дела","shortname": "Дело №","searchable": true,"sortable": true,"visible": true + } + , + {"code": "comment", + "type": 2,"length": 255,"name": "Комментарий","shortname": "Комментарий","searchable": true,"sortable": true,"visible": true + } + , + {"code": "receiptDate", + "type": 6,"name": "Дата получения оригинала","shortname": "Дата получения","searchable": true,"sortable": true,"visible": true + } + , + {"code": "resultStatus", + "type": 12,"dbname": "Код статуса загрузки документа","name": "Наименование статуса загрузки документа","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" + } + , + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + ] + + } + , + "outDocumentJournal": { + + "name": "Журнал исходящих документов", + + "destination": "out-document-journals", + + "class": "ru.clearing.classes.statics.data.journal.OutDocumentJournal", + + "table": "out_document_journal", + + "fields": [ + {"code": "registrationDate", + "type": 6,"name": "Дата регистрации","shortname": "Дата","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registrationTime", + "type": 5,"name": "Время регистрации","shortname": "Время","searchable": true,"sortable": true,"visible": true + } + , + {"code": "registrationNumber", + "type": 1,"name": "Регистационный номер","shortname": "Регистационный номер","searchable": true,"sortable": true,"visible": true + } + , + {"code": "documentName", + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Документ","searchable": true,"sortable": true,"visible": true + } + , + {"code": "addressee", + "type": 2,"length": 255,"name": "Полное наименование получателя","shortname": "Получатель","searchable": true,"sortable": true,"visible": true + } + , + {"code": "quantity", + "type": 1,"name": "Количествово экземпляров","shortname": "Кол-во экз.","searchable": true,"sortable": true,"visible": true + } + , + {"code": "clearingCode", + "type": 2,"length": 255,"name": "Код участника клиринга","shortname": "Код УК","searchable": true,"sortable": true,"visible": true + } + , + {"code": "courierType", + "type": 12,"dbname": "Код способа отправки","name": "Наименование способа отправки","shortname": "Способ отправки","searchable": true,"sortable": true,"visible": true,"link": "courierType" + } + , + {"code": "emailDate", + "type": 6,"name": "Дата отправки электронной почтой","shortname": "Дата отправки эл. почтой","searchable": true,"sortable": true,"visible": true + } + , + {"code": "amount", + "type": 11,"name": "Сумма","shortname": "Сумма","searchable": true,"sortable": true,"visible": true + } + , + {"code": "dossierNumber", + "type": 2,"length": 50,"name": "Номер дела","shortname": "Дело №","searchable": true,"sortable": true,"visible": true + } + , + {"code": "postDate", + "type": 6,"name": "Дата почтового отправления","shortname": "Дата отправления","searchable": true,"sortable": true,"visible": true + } + , + {"code": "resultStatus", + "type": 12,"dbname": "Код статуса загрузки документа","name": "Наименование статуса загрузки документа","shortname": "Статус","searchable": true,"sortable": true,"visible": true,"link": "resultStatus" + } + , + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + ] + + } + , + "reportRegister": { + + "name": "Реестр отправленных отчетов", + + "destination": "report-registers", + + "class": "ru.clearing.classes.statics.data.register.ReportRegister", + + "table": "report_register", + + "fields": [ + {"code": "companyFullName", + "type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true + } + , + {"code": "clearingCode", + "type": 2,"length": 255,"name": "Код клиринга","shortname": "Код участника","searchable": true,"sortable": true + } + , + {"code": "sessionId", + "type": 1,"dbname": "Идентификатор клиринговой сессии","name": "Клиринговая сессия","shortname": "Сессия","visible": true,"searchable": true,"sortable": true,"link": "session" + } + , + {"code": "comment", + "type": 2,"name": "Комментарий","shortname": "Основание","searchable": true,"sortable": true,"length": 255 + } + , + {"code": "name", + "type": 2,"length": 255,"name": "Наименование","shortname": "Наименование","visible": false,"searchable": true,"sortable": true + } + , + {"code": "quantity", + "type": 1,"name": "Количество записей","shortname": "Количество","visible": false,"searchable": true,"sortable": true + } + , + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "clearingDate", + "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"ignore": true + } + ] + + } + , + "contractRegister": { + + "name": "Журнал регистрации договоров", + + "destination": "contract-registers", + + "class": "ru.clearing.classes.statics.data.register.ContractRegister", + + "table": "contract_register", + + "fields": [ + {"code": "name", + "type": 2,"length": 255,"name": "Наименование документа","shortname": "Наименование","searchable": true,"sortable": true,"visible": true + } + , + {"code": "number", + "type": 2,"length": 255,"name": "Номер документа","shortname": "Номер","searchable": true,"sortable": true,"visible": true + } + , + {"code": "issueDate", + "type": 6,"name": "Дата составления","shortname": "Дата выдачи","searchable": true,"sortable": true + } + , + {"code": "companyFullName", + "type": 2,"length": 255,"name": "Полное наименование компании","shortname": "Полное наименование компании","searchable": true,"sortable": true,"visible": true + } + , + {"code": "companyId", + "type": 1,"name": "Наименование компании","shortname": "Компания","searchable": true,"sortable": true,"visible": true,"link": "company","linkCode": "shortName" + } + , + {"code": "documentType", + "type": 12,"dbname": "Код типа документа","name": "Наименование типа документа","shortname": "Тип документа","searchable": true,"sortable": true,"visible": true,"link": "documentType" + } + , + {"code": "issuePlace", + "type": 2,"length": 255,"name": "Место выдачи","shortname": "Место выдачи","searchable": true,"sortable": true,"visible": true + } + , + {"code": "issuer", + "type": 2,"length": 255,"name": "Кем выдан","shortname": "Кем выдан","searchable": true,"sortable": true,"visible": true + } + , + {"code": "issuerCode", + "type": 2,"length": 255,"name": "Код выдавшего органа","shortname": "Код выдавшего органа","searchable": true,"sortable": true,"visible": true + } + , + {"code": "place", + "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true + } + , + {"code": "validFromDate", + "type": 6,"name": "Дата начала срока действия","shortname": "Дата начала срока действия","searchable": true,"sortable": true + } + , + {"code": "validToDate", + "type": 6,"name": "Дата окончания срока действия","shortname": "Дата окончания срока действия","searchable": true,"sortable": true + } + , + {"code": "closeDate", + "type": 6,"name": "Дата расторжения","shortname": "Дата расторжения","searchable": true,"sortable": true + } + , + {"code": "comment", + "type": 2,"length": 255,"name": "Место","shortname": "Место","searchable": true,"sortable": true,"visible": true + } + , + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + ] + + } + , + "operation": { + + "name": "Проводки", + + "destination": "operations", + + "class": "", + + "table": "operation", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор записи","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + , + {"code": "addresseeId", + "type": 1,"dbname": "Идентификатор компании-получателя","name": "Наименование компании-получателя","shortname": "Получатель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" + } + , + {"code": "senderId", + "type": 1,"dbname": "Идентификатор компании-отправителя","name": "Наименование компании-отправителя","shortname": "Отправитель","searchable": true,"sortable": true,"link": "company","linkCode": "shortName" + } + , + {"code": "createdAt", + "field": "created","type": 4,"webtype": "5","dbname": "Дата-время создания записи","name": "Время создания записи","shortname": "Создано","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "updatedAt", + "field": "updated","type": 4,"webtype": "5","dbname": "Дата-время изменения записи","name": "Время изменения записи","shortname": "Изменено","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "clearingDate", + "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"ignore": true + } + , + {"code": "operationTypeId", + "type": 1,"name": "Тип проводки","shortname": "Тип","searchable": true,"sortable": true,"link": "operationType" + } + , + {"code": "operationStatus", + "type": 12,"dbname": "Код статуса обработки","name": "Наименование статуса обработки","shortname": "Статус","searchable": true,"sortable": true,"link": "operationStatus" + } + ] + + } + , + "marketDataLiquidation": { + + "name": "Статичная ценовая информация для ликвидации активов", + + "destination": "market-data-liquidations", + + "class": "", + + "table": "market_data_liquidation", + + "fields": [ + {"code": "id", + "type": 1,"name": "Идентификатор","shortname": "ID","searchable": true,"sortable": true,"visible": false + } + , + {"code": "securityId", + "type": 1,"dbname": "Идентификатор инструмента","name": "Наименование инструмента","shortname": "Инструмент","searchable": true,"sortable": true,"visible": true,"link": "security","linkCode": "securitySymbol" + } + , + {"code": "price", + "type": 10,"name": "Цена за 1 штуку ликвидационного актива","shortname": "Цена за шт.","searchable": true,"sortable": true,"visible": true + } + , + {"code": "clearingDate", + "type": 6,"name": "Дата","shortname": "Дата","searchable": true,"sortable": true,"ignore": true } ]