From 89fe02d557625077f9b12ead132c0224a6c6d60c Mon Sep 17 00:00:00 2001 From: Aleksey Kulikov Date: Wed, 21 May 2025 14:22:40 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-843 --- .../cud/DigitalCertificateSecurityService.java | 18 +++--------------- .../service/cud/GatewaySecurityService.java | 7 +++++-- .../cud/UtilitarianDigitalRightService.java | 16 +++------------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/DigitalCertificateSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/DigitalCertificateSecurityService.java index afcf2db5b..5f272741a 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/DigitalCertificateSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/DigitalCertificateSecurityService.java @@ -27,7 +27,6 @@ import ru.spcex.platform.enumeration.WorkflowStatus; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.ImdgTransaction; import ru.spcex.platform.utils.error.ValidationException; @Service @@ -79,7 +78,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements try { userRoleVerification.validateRoleAndThrow(userRequest); DigitalCertificateSecurity digitalCertificateSecurity = newDigitalCertificate0(userRequest.getRequestPayload()); - log.debug("successfully processed, request id {}, new object id {}", userRequest.getId(), digitalCertificateSecurity.getId()); + log.debug("successfully processed, request id {}, new digital_certificate_security.id {}", userRequest.getId(), digitalCertificateSecurity.getId()); return null; } catch (ValidationException e) { return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); @@ -116,15 +115,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign()); digitalCertificate.setSettlementHouse(req.getSettlementHouse()); digitalCertificate.setDepository(req.getDepository()); - ImdgTransaction transaction = imdgProvider.newTransaction(); - try { - transaction.beginTransaction(); - Imdg digitalCertificateImdg = transaction.getImdg(IMDGDistributedNames.Map_DigitalCertificateSecurity, DigitalCertificateSecurity.class); - digitalCertificateImdg.insert(digitalCertificate); - transaction.commitTransaction(); - } catch (Throwable e) { - transaction.rollbackTransaction(); - } + digitalCertificateSecurityImdg.insert(digitalCertificate); return digitalCertificate; } @@ -133,7 +124,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements try { userRoleVerification.validateRoleAndThrow(userRequest); DigitalCertificateSecurity digitalCertificateSecurity = updateDigitalCertificate0(userRequest.getRequestPayload()); - log.debug("successfully processed, request id {}, updated object id {}", userRequest.getId(), digitalCertificateSecurity.getId()); + log.debug("successfully processed, request id {}, updated digital_certificate_security.id {}", userRequest.getId(), digitalCertificateSecurity.getId()); return null; } catch (ValidationException e) { return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); @@ -165,9 +156,6 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign()); digitalCertificate.setSettlementHouse(req.getSettlementHouse()); digitalCertificate.setDepository(req.getDepository()); - if (req.getWorkflowStatus() != null) { - digitalCertificate.setWorkflowStatus(req.getWorkflowStatus()); - } digitalCertificate.setInstrumentType(req.getInstrumentType()); digitalCertificateSecurityImdg.update(digitalCertificate); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java index 3532b4efb..055bcb317 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java @@ -21,6 +21,7 @@ import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow; import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity; import ru.clearing.classes.statics.data.misc.Listing; import ru.clearing.classes.statics.data.security.CurrencyPairSecurity; +import ru.clearing.classes.statics.data.security.DigitalCertificateSecurity; import ru.clearing.classes.statics.data.security.MoneyMarketSecurity; import ru.clearing.classes.statics.data.security.Security; import ru.clearing.platform.dictionary.CurrencyPairDictionary; @@ -73,6 +74,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin private final Imdg fixedIncomeSecurityImdg; private final Imdg equitySecurityImdg; + private final Imdg digitalCertificateSecurityImdg; private final Imdg moneyMarketSecurityImdg; private final Imdg currencyPairSecurityImdg; private final Imdg listingImdg; @@ -121,6 +123,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin this.validation = validation; this.fixedIncomeSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class); this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class); + this.digitalCertificateSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DigitalCertificateSecurity, DigitalCertificateSecurity.class); this.moneyMarketSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class); this.currencyPairSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairSecurity, CurrencyPairSecurity.class); this.currencyPairDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairDictionary, CurrencyPairDictionary.class); @@ -367,9 +370,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin } log.debug("Processed request with securitySymbol: {}", newRequest.getSecuritySymbol()); newRequest.setIssuerId(companyId); - log.trace("EquitySecurityNewRequest - FOND"); + log.trace("DigitalCertificateSecurityNewRequest - FOND"); String securitySymbol = newRequest.getSecuritySymbol(); - security = findSecurityBySecuritySymbol(equitySecurityImdg, securitySymbol); + security = findSecurityBySecuritySymbol(digitalCertificateSecurityImdg, securitySymbol); if (security == null) { security = digitalCertificateSecurityService.newDigitalCertificate0(newRequest); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/UtilitarianDigitalRightService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/UtilitarianDigitalRightService.java index 6aa917b4c..a10e18f11 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/UtilitarianDigitalRightService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/UtilitarianDigitalRightService.java @@ -23,7 +23,6 @@ import ru.spcex.platform.enumeration.UserRole; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.ImdgTransaction; import ru.spcex.platform.utils.error.ValidationException; @Service @@ -72,7 +71,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini try { userRoleVerification.validateRoleAndThrow(userRequest); UtilitarianDigitalRight utilitarianDigitalRight = newUtilitarianDigitalRight0(userRequest.getRequestPayload()); - log.debug("successfully processed, request id {}, new object id {}", userRequest.getId(), utilitarianDigitalRight.getId()); + log.debug("successfully processed, request id {}, new utilitarian_digital_right.id {}", userRequest.getId(), utilitarianDigitalRight.getId()); return null; } catch (ValidationException e) { return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); @@ -100,16 +99,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini utilitarianDigitalRight.setRightEssence(req.getRightEssence()); utilitarianDigitalRight.setRightUnit(req.getRightUnit()); utilitarianDigitalRight.setRightUnitMeasurement(req.getRightUnitMeasurement()); - - ImdgTransaction transaction = imdgProvider.newTransaction(); - try { - transaction.beginTransaction(); - Imdg utilitarianDigitalRightImdg = transaction.getImdg(IMDGDistributedNames.Map_UtilitarianDigitalRight, UtilitarianDigitalRight.class); - utilitarianDigitalRightImdg.insert(utilitarianDigitalRight); - transaction.commitTransaction(); - } catch (Throwable e) { - transaction.rollbackTransaction(); - } + utilitarianDigitalRightImdg.insert(utilitarianDigitalRight); return utilitarianDigitalRight; } @@ -118,7 +108,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini try { userRoleVerification.validateRoleAndThrow(userRequest); UtilitarianDigitalRight utilitarianDigitalRight = updateUtilitarianDigitalRight0(userRequest.getRequestPayload()); - log.debug("successfully processed, request id {}, updated object id {}", userRequest.getId(), utilitarianDigitalRight.getId()); + log.debug("successfully processed, request id {}, updated utilitarian_digital_right.id {}", userRequest.getId(), utilitarianDigitalRight.getId()); return null; } catch (ValidationException e) { return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg());