From 1c35dc2881eedf3200e240b10279a57538cee811 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 14 May 2024 17:32:42 +0300 Subject: [PATCH 1/4] =?UTF-8?q?account-service=20=D0=B7=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20bankAccount.currency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/account/service/BankAccountService.java | 2 ++ .../spcex/clearing/account/service/BankAccountServiceTest.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java index bc06ddb64..a8513210c 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/BankAccountService.java @@ -109,6 +109,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea account.setStatus(req.getStatus()); } account.setCompanyId(req.getCompanyId()); + account.setCurrency(req.getCurrency()); account.setCreated(now); account.setUpdated(now); requestInfoUpdate = accountService.fillAccountFromRelation(account, userRequest.getId(), false); @@ -178,6 +179,7 @@ public class BankAccountService extends QueueConsumer implements InitializingBea Account account = accountMap.getSingleObjectByID(bankAccount.getAccountId()); account.setAccount(req.account); + account.setCurrency(req.getCurrency()); account.setUpdated(Instant.now()); ImdgTransaction imdgTransaction = imdgProvider.newTransaction(); diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java index 102b021a2..a19dd8b49 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java @@ -395,6 +395,7 @@ public class BankAccountServiceTest { account.setAccountType(AccountType.Bank.getKey()); account.setStatus(Status.Active.getKey()); account.setProcessingSign(Allowed.ALLOWED.getKey()); + account.setCurrency(currency); return account; } @@ -418,6 +419,7 @@ public class BankAccountServiceTest { bankAccount.setDestination(destination); bankAccount.setTaxpayerIdentificationNumber(taxpayerIdentificationNumber); bankAccount.setTaxRegistrationReasonCode(taxRegistrationReasonCode); + bankAccount.setCurrency(currency); bankAccount.setSwiftCode(swiftCode); return bankAccount; } @@ -434,6 +436,7 @@ public class BankAccountServiceTest { bankAccountNewRequest.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); bankAccountNewRequest.setAccount(bankAccount.getAccount()); bankAccountNewRequest.setCompanyId(bankAccount.getCompanyId()); + bankAccountNewRequest.setCurrency(bankAccount.getCurrency()); bankAccountNewRequest.setSwiftCode(bankAccount.getSwiftCode()); return bankAccountNewRequest; } From 932eb6d57f320bedfce5e6adacf81061d496f21d Mon Sep 17 00:00:00 2001 From: akulikov Date: Wed, 15 May 2024 10:01:57 +0300 Subject: [PATCH 2/4] reports-service: fix KSRepTradesReportBuilder --- .../reports/builders/ks/KSRepTradesReportBuilder.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java index 2d2b8090f..36236c6f6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java @@ -330,10 +330,8 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder Date: Wed, 15 May 2024 12:01:59 +0300 Subject: [PATCH 3/4] http://jira.mfd.msk:8088/browse/CLS-673 DATA --- clearing-parent/backend-api/src/main/resources/meta/data.xml | 2 +- clearing-parent/db-scripts/src/main/resources/db/DATA.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index 6a23c230d..502464da9 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -507,7 +507,7 @@ - + diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index ab4f9806f..659e2002f 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -1,4 +1,4 @@ --- DB version: 3.11.0.86 +-- DB version: 3.11.0.88 -- DATA version: 3.11.0.78 @@ -982,7 +982,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5435, 'CLRN', 'Све INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5600, 'DBFI', 'Общая ошибка модуля dbf-importer.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5700, 'CLRN', 'При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5700, 'CLRN', 'При проверке обязательств во время сессии не найден регистр для хранения активов для инструмента.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5800, 'DBFE', 'Общая ошибка модуля dbf-exporter.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; From a52265eca52d3e83d65d61f99c90699162d33486 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Wed, 15 May 2024 12:11:27 +0300 Subject: [PATCH 4/4] =?UTF-8?q?DATA=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D1=83?= =?UTF-8?q?=20=D0=B2=20ERROR=5FCODE=5FDICTIONARY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clearing-parent/backend-api/src/main/resources/meta/data.xml | 2 +- clearing-parent/db-scripts/src/main/resources/db/DATA.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml index 502464da9..2ebffe166 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/data.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml @@ -452,7 +452,7 @@ - + diff --git a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql index 659e2002f..ab95215cc 100644 --- a/clearing-parent/db-scripts/src/main/resources/db/DATA.sql +++ b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql @@ -880,7 +880,7 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5024, 'ACNT', 'Не у INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5025, 'ACNT', 'Необходимо указать ДЕПО счет.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; -INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5026, 'ACNT', 'Счет %S не валютный') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; +INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5026, 'ACNT', 'Счет %S не валютный.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME; INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (5200, 'BLNC', 'Общая ошибка модуля balance-service.') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;