From 9bebeda22cb20d535760ccfc816232999c21f2cc Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 29 Dec 2022 12:36:08 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20Sdf01ExecutorTest.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balance/service/AccountBalanceServiceTest.java | 2 +- .../clearing/balance/service/Sdf01ExecutorTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java index 495ffb276..d45fc9c97 100644 --- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java +++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java @@ -19,7 +19,7 @@ import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFields class AccountBalanceServiceTest extends AbstractServiceTest { - public static final Matcher ACCOUNT_BALANCE_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); + private static final Matcher ACCOUNT_BALANCE_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); private final BigDecimal amountNew = new BigDecimal(1000); private final String cashMovementCurrencyCodeNew = "cash"; private final Long accountIdUpdate = accountIdNew; diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java index a745cfe74..a3e5a56b3 100644 --- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java +++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java @@ -5,14 +5,20 @@ import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.sdf.SDf01; +import ru.clearing.classes.statics.data.statement.Statement; +import ru.spcex.clearing.balance.utils.MatcherFactory; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Collections; +import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFieldsComparator; + class Sdf01ExecutorTest extends AbstractServiceTest { + private static final MatcherFactory.Matcher SDF01_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); + private final static DateTimeFormatter datFormatter = DateTimeFormatter.ofPattern("dd.MM.yy"); private final Long id = currentId.getAndIncrement(); @Autowired @@ -20,6 +26,7 @@ class Sdf01ExecutorTest extends AbstractServiceTest { @Test void execute() { + //check create statement SDf01 sDf01 = new SDf01(); sDf01.setMarket("U");//!"U".equals sDf01.setDeal(deal);//tradingCode @@ -38,6 +45,8 @@ class Sdf01ExecutorTest extends AbstractServiceTest { Result predictableResult = new Result(); predictableResult.setGenerationId(id); + Statement predictableStatement = new Statement(); Result result = sdf01Executor.execute(Collections.singletonList(sDf01), statementRequest); + SDF01_MATCHER.assertMatch(result, predictableResult); } } \ No newline at end of file From e80a94cd85c6ee64687947ebb2f73ae0775e94df Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 29 Dec 2022 13:16:54 +0300 Subject: [PATCH 2/4] =?UTF-8?q?meta=20data=20=D0=B3=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=BE=D1=80:=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D1=80=D0=BE=D0=BB=D0=B8=D0=B2=D0=BA=D0=B5=20ON=20C?= =?UTF-8?q?ONFLICT=20(ID)=20DO=20UPDATE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/xsl/data.xsl | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/xsl/data.xsl b/clearing-parent/backend-api/src/main/resources/meta/xsl/data.xsl index c3568c6af..8508cf5f2 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/xsl/data.xsl +++ b/clearing-parent/backend-api/src/main/resources/meta/xsl/data.xsl @@ -38,7 +38,9 @@ INSERT INTO ( ) values ( -); +) ON CONFLICT (ID) DO UPDATE SET + +; @@ -48,7 +50,9 @@ INSERT INTO ( ) values ( -); +) ON CONFLICT (ID) DO UPDATE SET + +; @@ -78,6 +82,19 @@ INSERT INTO (, + + + + + + + + + = EXCLUDED. +, + + + From 10cfe4f895b1994c3e7e0e156972b0cada3ef1bc Mon Sep 17 00:00:00 2001 From: mfd Date: Thu, 29 Dec 2022 15:04:22 +0300 Subject: [PATCH 3/4] SPCEX-1.0.0.0 backend-api added data values to db.html --- .../backend-api/src/main/resources/meta/xsl/db.xsl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/clearing-parent/backend-api/src/main/resources/meta/xsl/db.xsl b/clearing-parent/backend-api/src/main/resources/meta/xsl/db.xsl index 80a747f3a..1d610d880 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/xsl/db.xsl +++ b/clearing-parent/backend-api/src/main/resources/meta/xsl/db.xsl @@ -1,13 +1,14 @@ - + + + + abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ _0123456789 - - @@ -72,11 +73,17 @@ +

. - ( )

№ПолеТипНаименование
+ +
Значения:
+ + . -
+ @@ -87,7 +94,6 @@ №ПолеТипНаименование - From 6294fcd36dc0470a5443d3d63ee1f905bbceaef7 Mon Sep 17 00:00:00 2001 From: mfd Date: Thu, 29 Dec 2022 15:17:43 +0300 Subject: [PATCH 4/4] SPCEX-1.0.0.0 backend-api Deleted old transformation for meta --- .../src/main/resources/meta/meta.server.xslt | 197 ------------------ 1 file changed, 197 deletions(-) delete mode 100644 clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt b/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt deleted file mode 100644 index 78e8d929d..000000000 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.server.xslt +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - { - "version": "", - - } - - - - "enums": { - - } - - - - - ,"objects": { - - } - - - - - ,"views": { - - } - - - - - - - - ,"types": [ - - ] - - - - - , - { - "code": "", - - "": "" - , - - } - - - - - , - "": { - - "": "", - - "fields": [] - } - - - - - , - "": { - - "": "", - - "fields": [] - - ,"actions":[] - } - - - - - - - - - - - - , - {"method":"", - - "": "", - - "fields": [] - } - - - - - - - - , - "": { - - "": "", - - "sources": [] - ,"fields":[] - } - - - - - , - "" - - - - - , - - - - - - { - - , - "": - - { - - - , - - } - - - } - - - - - - - , - {"code": "", - - - "": - "": - "": - "": - "": - "": - "": - "": - "": "" - - , - - } - - - - , - {"": - { - - - "": - "": "" - "": "" - "": "" - - , - - }} - - - - - - "": - "": - "": - "": - "": - "": - "": - "": "" - - -