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; - } -}