From a4febcafb1b146143f9d215d30fd987e1ee2dd2d Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 14 Aug 2024 12:23:25 +0300 Subject: [PATCH 1/5] http://jira.mfd.msk:8088/browse/CLS-732 sdf54 & DM*I hotfix --- .../payment/PaymentInstructionOutboundService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java index ee1e59243..422afad0c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java @@ -187,13 +187,6 @@ public class PaymentInstructionOutboundService { SDf54 sDf54 = sdf54Creator.create(pmt); sDf54.setId(idGenerator.nextId()); sDf54.setGenerationId(pmt.getId()); - sdf54Imdg.insert(sDf54); - log.debug("new sdf54.id: {}", sDf54.getId()); - dmiService.setProcComment(tcr.getId(), - curr, - safeBD(amount).negate(), - sDf54.getDocnm_ref()); - assetsMng.process(assets.get().a__b(), assets.get().a__t(), assets.get().a__f(), BigDecimal.ZERO); if (time.isTradingTime()) { Supplier builder = () -> GatewayRequestCreator.from(pmt, assets.get().a__b().getTradingCode(), @@ -213,6 +206,13 @@ public class PaymentInstructionOutboundService { return error(req.getId(), ClearingError.GeneralError); } } + sdf54Imdg.insert(sDf54); + log.debug("new sdf54.id: {}", sDf54.getId()); + dmiService.setProcComment(tcr.getId(), + curr, + safeBD(amount).negate(), + sDf54.getDocnm_ref()); + assetsMng.process(assets.get().a__b(), assets.get().a__t(), assets.get().a__f(), BigDecimal.ZERO); SdfClearingRequest exp = new SdfClearingRequest(); exp.setGroupId(sDf54.getGenerationId()); kafkaSender.sendRequestToQueue(Consts.SDF54_PROCESS, exp); From 98bb9a26c8401fade4aa6e195e6331073a671b8d Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 14 Aug 2024 12:35:42 +0300 Subject: [PATCH 2/5] pom upversion SPCEX-3.12.9 -> SPCEX-3.12.10 --- clearing-parent/account-service/pom.xml | 2 +- clearing-parent/backend-api/pom.xml | 2 +- clearing-parent/balance-service/pom.xml | 2 +- clearing-parent/classes/pom.xml | 2 +- clearing-parent/cleaning-builders/pom.xml | 6 +++--- clearing-parent/clearing-service/pom.xml | 2 +- clearing-parent/clearing-validation/pom.xml | 8 ++++---- clearing-parent/company-service/pom.xml | 2 +- clearing-parent/db-scripts/pom.xml | 4 ++-- clearing-parent/dbf-exporter/pom.xml | 4 ++-- clearing-parent/dbf-importer/pom.xml | 4 ++-- clearing-parent/dictionary/pom.xml | 4 ++-- clearing-parent/extdb-importer/pom.xml | 4 ++-- clearing-parent/gateway-api/pom.xml | 2 +- clearing-parent/imdg-hist/pom.xml | 10 +++++----- clearing-parent/imdg/pom.xml | 10 +++++----- clearing-parent/lim-exporter/pom.xml | 6 +++--- clearing-parent/pom.xml | 4 ++-- clearing-parent/registry-service/pom.xml | 2 +- clearing-parent/reports-service/pom.xml | 4 ++-- clearing-parent/scheduler-service/pom.xml | 4 ++-- clearing-parent/securities-service/pom.xml | 2 +- clearing-parent/security-util/pom.xml | 8 ++++---- clearing-parent/swt-exporter/pom.xml | 6 +++--- clearing-parent/swt-importer/pom.xml | 2 +- clearing-parent/test-clearing/pom.xml | 4 ++-- clearing-parent/trade-importer/pom.xml | 6 +++--- clearing-parent/utility-service/pom.xml | 2 +- platform-parent/pom.xml | 2 +- pom.xml | 4 ++-- z-distr/pom.xml | 2 +- 31 files changed, 63 insertions(+), 63 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index fe2cf59cc..ee7cad381 100644 --- a/clearing-parent/account-service/pom.xml +++ b/clearing-parent/account-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 46b27db03..b357389a7 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -11,7 +11,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index 1698bbe9f..a5fc4798a 100644 --- a/clearing-parent/balance-service/pom.xml +++ b/clearing-parent/balance-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index a0a09fa8e..c5b6dd087 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index 88812290f..ab02fecc8 100644 --- a/clearing-parent/cleaning-builders/pom.xml +++ b/clearing-parent/cleaning-builders/pom.xml @@ -6,13 +6,13 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.12.9 + SPCEX-3.12.10 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 9b9b74d63..3652eab61 100644 --- a/clearing-parent/clearing-service/pom.xml +++ b/clearing-parent/clearing-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index bd471da33..4e8de4ad6 100644 --- a/clearing-parent/clearing-validation/pom.xml +++ b/clearing-parent/clearing-validation/pom.xml @@ -8,12 +8,12 @@ clearing-validation Clearing-module, dependency version of platform-utils jar - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile ru.spcex.clearing dictionary - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 02a2b92c7..857e228f2 100644 --- a/clearing-parent/company-service/pom.xml +++ b/clearing-parent/company-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 2e10f5da2..48fd83e4e 100644 --- a/clearing-parent/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,12 @@ db-scripts db-scripts db-scripts for PostgreSQL - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 9c6ce7fe9..24f617934 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -7,12 +7,12 @@ dbf-exporter dbf-exporter DBF exporter for DBF files - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index a116e7e4c..4189e9cb6 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -8,12 +8,12 @@ dbf-importer dbf-importer DBF loader for DBF files - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 80decdbf0..08c84d32e 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 7d6fd2a9f..614ba961a 100644 --- a/clearing-parent/extdb-importer/pom.xml +++ b/clearing-parent/extdb-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.12.9 + SPCEX-3.12.10 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index eda002a71..d8042c8e4 100644 --- a/clearing-parent/gateway-api/pom.xml +++ b/clearing-parent/gateway-api/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index 307f33f02..dc0267ae5 100644 --- a/clearing-parent/imdg-hist/pom.xml +++ b/clearing-parent/imdg-hist/pom.xml @@ -5,12 +5,12 @@ 4.0.0 imdg-hist jar - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile ru.spcex.clearing dictionary - SPCEX-3.12.9 + SPCEX-3.12.10 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index 272bd0970..aed366469 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -7,12 +7,12 @@ imdg Clearing in memory data grid jar - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile ru.spcex.clearing dictionary - SPCEX-3.12.9 + SPCEX-3.12.10 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index db735f2ea..9bbf18a4f 100644 --- a/clearing-parent/lim-exporter/pom.xml +++ b/clearing-parent/lim-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lim-exporter Lim exporter - SPCEX-3.12.9 + SPCEX-3.12.10 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 18a24e7b9..44d88d3fe 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.12.9 + SPCEX-3.12.10 clearing ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 8eddb2eeb..440f13cb6 100644 --- a/clearing-parent/registry-service/pom.xml +++ b/clearing-parent/registry-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 9efef7ab7..87044ad05 100644 --- a/clearing-parent/reports-service/pom.xml +++ b/clearing-parent/reports-service/pom.xml @@ -8,12 +8,12 @@ reports-service reports-service Service for creating reports - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 51a3dfeae..18a63179e 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index a45cd514d..0be4701b6 100644 --- a/clearing-parent/securities-service/pom.xml +++ b/clearing-parent/securities-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index 22cfca782..c96e3e369 100644 --- a/clearing-parent/security-util/pom.xml +++ b/clearing-parent/security-util/pom.xml @@ -8,12 +8,12 @@ security-util clearing Clearing misc util for verify user roles jar - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile ru.spcex.clearing dictionary - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index cba323c34..570e57c9c 100644 --- a/clearing-parent/swt-exporter/pom.xml +++ b/clearing-parent/swt-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 swt-exporter Swt exporter - SPCEX-3.12.9 + SPCEX-3.12.10 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 2c0eb7a47..26ccbda22 100644 --- a/clearing-parent/swt-importer/pom.xml +++ b/clearing-parent/swt-importer/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 2b1d3d3ae..1c50a5dea 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -4,11 +4,11 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 test-clearing Test-clearing - SPCEX-3.12.9 + SPCEX-3.12.10 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 23e084d8e..6b212a1d6 100644 --- a/clearing-parent/trade-importer/pom.xml +++ b/clearing-parent/trade-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.9 + SPCEX-3.12.10 trade-importer trade-importer Trade importer module - SPCEX-3.12.9 + SPCEX-3.12.10 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.12.9 + SPCEX-3.12.10 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index cc9c0dafd..7e6371a0d 100644 --- a/clearing-parent/utility-service/pom.xml +++ b/clearing-parent/utility-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 2d78e9606..161c1af6a 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.12.9 + SPCEX-3.12.10 diff --git a/pom.xml b/pom.xml index 665237b09..20094fdd2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.12.9 + SPCEX-3.12.10 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.12.9 + SPCEX-3.12.10 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index c5a1ae18e..44cd2b043 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.12.9 + SPCEX-3.12.10 4.0.0 From 8ead0d74b5b3644f4192cd7b92af52947c448ac9 Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 14 Aug 2024 16:01:57 +0300 Subject: [PATCH 3/5] http://jira.mfd.msk:8088/browse/CLS-732 sdf54 & DM*I hotfix --- .../service/payment/PaymentInstructionOutboundService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java index 422afad0c..fc181c258 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/payment/PaymentInstructionOutboundService.java @@ -203,7 +203,7 @@ public class PaymentInstructionOutboundService { pmt.setTransactionStatus(TransactionStatus.fail.getKey()); pmt.setUpdated(now); pmtImdg.update(pmt); - return error(req.getId(), ClearingError.GeneralError); + return error(req.getId(), ClearingError.GatewayNotApproved); } } sdf54Imdg.insert(sDf54); From a30cb92e47fbff71e33f66b6766e82d692d15fc5 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 20 Aug 2024 18:48:27 +0300 Subject: [PATCH 4/5] http://jira.mfd.msk:8088/browse/CLS-739 --- .../clearing/config/ValidationConfig.java | 1 + .../validation/Sdf55ValidationRule.java | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java index 9271670e1..d073b268f 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java @@ -561,6 +561,7 @@ public class ValidationConfig { ctx.addImdg(IMDGDistributedNames.Map_SDf54, sDf54Imdg); ctx.addImdg(IMDGDistributedNames.Map_PaymentInstruction, pmtImdg); ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistry, imdgTradingClearingRegistry); + ctx.addImdg(IMDGDistributedNames.Map_TradingClearingRegistryList, imdgTradingClearingRegistryList); return new ValidatorImpl<>(ctx, Sdf55ValidationRule.Fields, Sdf55ValidationRule.GenerationIdFound, diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf55ValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf55ValidationRule.java index 55da2138e..58d8f2978 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf55ValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf55ValidationRule.java @@ -7,6 +7,7 @@ import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.payment.PaymentInstruction; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; +import ru.clearing.classes.statics.data.registry.TradingClearingRegistryList; import ru.clearing.classes.statics.data.sdf.SDf54; import ru.clearing.classes.statics.data.sdf.SDf55; import ru.spcex.clearing.error.ClearingError; @@ -14,6 +15,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import ru.spcex.clearing.service.AssetTrio; import ru.spcex.clearing.service.registry.AssetTBFProcessing; +import ru.spcex.platform.enumeration.CurrencyCode; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; @@ -73,20 +75,36 @@ public enum Sdf55ValidationRule implements IValidationRule validate(ImdgValidationContext context) { + Imdg tcrListImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistryList, TradingClearingRegistryList.class); Imdg tcrImdg = context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class); PaymentInstruction pmt = context.getStoredObject(ValidationStored.Sdf55PaymentInstruction); Long accCredId = pmt.getCreditLeg_accountId(); + String creditCurrency = pmt.getCreditLeg_currencyCode(); Long addresseeId = pmt.getSenderId(); if (accCredId == null || addresseeId == null) { return of(ClearingError.RecordNotFound, "TCR - no PI(id=%d)#CreditLeg_accountId/SenderId" - .formatted(pmt.getId())); + .formatted(pmt.getId())); } - TradingClearingRegistry tcr = tcrImdg.getFirstObjectBySQL( - "moneyAccountId = '%d' and companyId = %d".formatted(accCredId, addresseeId) - ); + TradingClearingRegistry tcr = null; + TradingClearingRegistryList tcrList; + String errMsg; + if (CurrencyCode.RUB.equalsByKey(creditCurrency)) { + errMsg = "TCR moneyAccountId = '%d' and companyId = %d".formatted(accCredId, addresseeId); + tcr = tcrImdg.getFirstObjectBySQL( + "moneyAccountId = '%d' and companyId = %d".formatted(accCredId, addresseeId)); + } else { + errMsg = "TCR_LIST accountId = '%d' and companyId = %d".formatted(accCredId, addresseeId); + tcrList = tcrListImdg.getFirstObjectBySQL( + "accountId = '%d'".formatted(accCredId) + ); + if (tcrList != null) { + tcr = tcrImdg.getFirstObjectBySQL( + "id = '%d' and companyId = %d".formatted(tcrList.getTradingClearingRegistryId(), addresseeId)); + } + } + if (tcr == null) { - return of(ClearingError.RecordNotFound, "TCR moneyAccountId = '%d' and companyId = %d" - .formatted(accCredId, addresseeId)); + return of(ClearingError.RecordNotFound, errMsg); } context.storeObject(ValidationStored.Sdf55Tcr, tcr); return empty(); From eecddc03cc2fd53e1fb9ee3d5f8dda752fb92fa5 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 20 Aug 2024 18:49:01 +0300 Subject: [PATCH 5/5] up pom version --- clearing-parent/account-service/pom.xml | 2 +- clearing-parent/backend-api/pom.xml | 2 +- clearing-parent/balance-service/pom.xml | 2 +- clearing-parent/classes/pom.xml | 2 +- clearing-parent/cleaning-builders/pom.xml | 6 +++--- clearing-parent/clearing-service/pom.xml | 2 +- clearing-parent/clearing-validation/pom.xml | 8 ++++---- clearing-parent/company-service/pom.xml | 2 +- clearing-parent/db-scripts/pom.xml | 4 ++-- clearing-parent/dbf-exporter/pom.xml | 4 ++-- clearing-parent/dbf-importer/pom.xml | 4 ++-- clearing-parent/dictionary/pom.xml | 4 ++-- clearing-parent/extdb-importer/pom.xml | 4 ++-- clearing-parent/gateway-api/pom.xml | 2 +- clearing-parent/imdg-hist/pom.xml | 10 +++++----- clearing-parent/imdg/pom.xml | 10 +++++----- clearing-parent/lim-exporter/pom.xml | 6 +++--- clearing-parent/pom.xml | 4 ++-- clearing-parent/registry-service/pom.xml | 2 +- clearing-parent/reports-service/pom.xml | 4 ++-- clearing-parent/scheduler-service/pom.xml | 4 ++-- clearing-parent/securities-service/pom.xml | 2 +- clearing-parent/security-util/pom.xml | 8 ++++---- clearing-parent/swt-exporter/pom.xml | 6 +++--- clearing-parent/swt-importer/pom.xml | 2 +- clearing-parent/test-clearing/pom.xml | 4 ++-- clearing-parent/trade-importer/pom.xml | 6 +++--- clearing-parent/utility-service/pom.xml | 2 +- platform-parent/pom.xml | 2 +- pom.xml | 4 ++-- z-distr/pom.xml | 2 +- 31 files changed, 63 insertions(+), 63 deletions(-) diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml index ee7cad381..138463b41 100644 --- a/clearing-parent/account-service/pom.xml +++ b/clearing-parent/account-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index b357389a7..ff6581441 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -11,7 +11,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml index a5fc4798a..5f88042a0 100644 --- a/clearing-parent/balance-service/pom.xml +++ b/clearing-parent/balance-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index c5b6dd087..823bfa5b0 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -12,7 +12,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml index ab02fecc8..4878bbc9c 100644 --- a/clearing-parent/cleaning-builders/pom.xml +++ b/clearing-parent/cleaning-builders/pom.xml @@ -6,13 +6,13 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 cleaning-builders cleaning-builders Cleaning builders module - SPCEX-3.12.10 + SPCEX-3.12.11 jar @@ -26,7 +26,7 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml index 3652eab61..15058bb8e 100644 --- a/clearing-parent/clearing-service/pom.xml +++ b/clearing-parent/clearing-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml index 4e8de4ad6..2eb4ad7b2 100644 --- a/clearing-parent/clearing-validation/pom.xml +++ b/clearing-parent/clearing-validation/pom.xml @@ -8,12 +8,12 @@ clearing-validation Clearing-module, dependency version of platform-utils jar - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile ru.spcex.clearing dictionary - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml index 857e228f2..745cd194e 100644 --- a/clearing-parent/company-service/pom.xml +++ b/clearing-parent/company-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml index 48fd83e4e..19903d61d 100644 --- a/clearing-parent/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,12 @@ db-scripts db-scripts db-scripts for PostgreSQL - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 24f617934..69d3ba548 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -7,12 +7,12 @@ dbf-exporter dbf-exporter DBF exporter for DBF files - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 4189e9cb6..e43e7db4b 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -8,12 +8,12 @@ dbf-importer dbf-importer DBF loader for DBF files - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml index 08c84d32e..9f3411a24 100644 --- a/clearing-parent/dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -8,12 +8,12 @@ Clearing dictionary Clearing dictionary jar - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml index 614ba961a..65b407642 100644 --- a/clearing-parent/extdb-importer/pom.xml +++ b/clearing-parent/extdb-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 extdb-importer extdb-importer Extdb importer module. Аналог trade-importer. - SPCEX-3.12.10 + SPCEX-3.12.11 jar diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml index d8042c8e4..689f0aace 100644 --- a/clearing-parent/gateway-api/pom.xml +++ b/clearing-parent/gateway-api/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml index dc0267ae5..b5680ac87 100644 --- a/clearing-parent/imdg-hist/pom.xml +++ b/clearing-parent/imdg-hist/pom.xml @@ -5,12 +5,12 @@ 4.0.0 imdg-hist jar - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -36,13 +36,13 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile ru.spcex.clearing dictionary - SPCEX-3.12.10 + SPCEX-3.12.11 compile @@ -82,7 +82,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml index aed366469..5c86eff9d 100644 --- a/clearing-parent/imdg/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -7,12 +7,12 @@ imdg Clearing in memory data grid jar - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -32,13 +32,13 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile ru.spcex.clearing dictionary - SPCEX-3.12.10 + SPCEX-3.12.11 compile @@ -89,7 +89,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml index 9bbf18a4f..cf251dce8 100644 --- a/clearing-parent/lim-exporter/pom.xml +++ b/clearing-parent/lim-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 lim-exporter Lim exporter - SPCEX-3.12.10 + SPCEX-3.12.11 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 44d88d3fe..5c2b5a80c 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -7,12 +7,12 @@ _parent_clearing Clearing parent module pom - SPCEX-3.12.10 + SPCEX-3.12.11 clearing ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml index 440f13cb6..3020af53a 100644 --- a/clearing-parent/registry-service/pom.xml +++ b/clearing-parent/registry-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml index 87044ad05..3490e7422 100644 --- a/clearing-parent/reports-service/pom.xml +++ b/clearing-parent/reports-service/pom.xml @@ -8,12 +8,12 @@ reports-service reports-service Service for creating reports - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml index 18a63179e..0b43357d5 100644 --- a/clearing-parent/scheduler-service/pom.xml +++ b/clearing-parent/scheduler-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 @@ -51,7 +51,7 @@ ru.spcex.clearing cleaning-builders - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml index 0be4701b6..951ecf2a2 100644 --- a/clearing-parent/securities-service/pom.xml +++ b/clearing-parent/securities-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml index c96e3e369..fb6f36b0e 100644 --- a/clearing-parent/security-util/pom.xml +++ b/clearing-parent/security-util/pom.xml @@ -8,12 +8,12 @@ security-util clearing Clearing misc util for verify user roles jar - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -35,13 +35,13 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile ru.spcex.clearing dictionary - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml index 570e57c9c..e93d9ba08 100644 --- a/clearing-parent/swt-exporter/pom.xml +++ b/clearing-parent/swt-exporter/pom.xml @@ -3,13 +3,13 @@ 4.0.0 swt-exporter Swt exporter - SPCEX-3.12.10 + SPCEX-3.12.11 jar ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 @@ -35,7 +35,7 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml index 26ccbda22..f52af848f 100644 --- a/clearing-parent/swt-importer/pom.xml +++ b/clearing-parent/swt-importer/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 1c50a5dea..50c97de67 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -4,11 +4,11 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 test-clearing Test-clearing - SPCEX-3.12.10 + SPCEX-3.12.11 ru.spcex.platform diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml index 6b212a1d6..2aec5432e 100644 --- a/clearing-parent/trade-importer/pom.xml +++ b/clearing-parent/trade-importer/pom.xml @@ -4,12 +4,12 @@ ru.spcex.clearing clearing-parent - SPCEX-3.12.10 + SPCEX-3.12.11 trade-importer trade-importer Trade importer module - SPCEX-3.12.10 + SPCEX-3.12.11 jar @@ -51,7 +51,7 @@ ru.spcex.clearing classes - SPCEX-3.12.10 + SPCEX-3.12.11 compile diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml index 7e6371a0d..91079d0b4 100644 --- a/clearing-parent/utility-service/pom.xml +++ b/clearing-parent/utility-service/pom.xml @@ -5,7 +5,7 @@ clearing-parent ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0 diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml index 161c1af6a..29bbc9aa3 100644 --- a/platform-parent/pom.xml +++ b/platform-parent/pom.xml @@ -14,7 +14,7 @@ ru.spcex.clearing clearing - SPCEX-3.12.10 + SPCEX-3.12.11 diff --git a/pom.xml b/pom.xml index 20094fdd2..973921555 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ __parent_ROOT Clearing main parent pom - SPCEX-3.12.10 + SPCEX-3.12.11 clearing-parent @@ -24,7 +24,7 @@ 17 Maven - SPCEX-3.12.10 + SPCEX-3.12.11 2.6.3 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 44cd2b043..3e0999d9b 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -5,7 +5,7 @@ clearing ru.spcex.clearing - SPCEX-3.12.10 + SPCEX-3.12.11 4.0.0