From 1a60016a65eea734d62cff008e20a22615165ee9 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Tue, 30 Jul 2024 11:13:32 +0300 Subject: [PATCH] xml-importer&exporter object tag and SDf entities conversion methods fixed, tests fixed --- .../logic/data/tags/objects/DF07ObjectTag.java | 4 ++-- .../logic/data/tags/objects/DF54ObjectTag.java | 4 ++-- .../logic/stages/ExportFromHazelcastTest.java | 16 ++++++++-------- .../logic/data/tags/objects/DF06ObjectTag.java | 4 ++-- .../logic/data/tags/objects/DF55ObjectTag.java | 4 ++-- .../logic/data/tags/objects/DF57ObjectTag.java | 4 ++-- .../xml/importer/logic/steps/ImportToDBTest.java | 12 ++++++------ 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java index 6484ff0be..e6f5b1394 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF07ObjectTag.java @@ -71,8 +71,8 @@ public class DF07ObjectTag extends ObjectTag { this.spec = entity.getSpec(); this.number = entity.getNumber(); this.result = entity.getResult(); - this.docNum = entity.getDoc_Num(); - this.docDate = LocalDate.parse(entity.getDoc_Date(), dtf); + this.docNum = entity.getDoc_num(); + this.docDate = LocalDate.parse(entity.getDoc_date(), dtf); this.payVal = entity.getPay_val(); } diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java index 45ce4f437..7be93cd4c 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java @@ -181,8 +181,8 @@ public class DF54ObjectTag extends ObjectTag { this.specif1 = entity.getSpecif_1(); this.sendType = entity.getSend_type(); this.docResult = entity.getDoc_result(); - this.docNum = entity.getDoc_Num(); - this.docDate = LocalDate.parse(entity.getDoc_Date(), dtf); + this.docNum = entity.getDoc_num(); + this.docDate = LocalDate.parse(entity.getDoc_date(), dtf); this.valueDate = LocalDate.parse(entity.getValue_date(), dtf); this.swiftBen = entity.getSwift_ben(); this.swiftInt = entity.getSwift_int(); diff --git a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java index e7e3da7ed..be0282fb5 100644 --- a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java +++ b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java @@ -213,8 +213,8 @@ class ExportFromHazelcastTest { expectedSDf07.setBic("test8"); expectedSDf07.setSpec("test9"); expectedSDf07.setNumber(new BigDecimal(BigInteger.TWO)); - expectedSDf07.setDoc_Num("test11"); - expectedSDf07.setDoc_Date("14.03.24"); + expectedSDf07.setDoc_num("test11"); + expectedSDf07.setDoc_date("14.03.24"); expectedSDf07.setPay_val("test12"); Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf07, SDf07.class); @@ -238,8 +238,8 @@ class ExportFromHazelcastTest { Assertions.assertThat(actualObjectTag.getBic()).isEqualTo(expectedSDf07.getBic()); Assertions.assertThat(actualObjectTag.getSpec()).isEqualTo(expectedSDf07.getSpec()); Assertions.assertThat(actualObjectTag.getNumber()).isEqualTo(expectedSDf07.getNumber()); - Assertions.assertThat(actualObjectTag.getDocNum()).isEqualTo(expectedSDf07.getDoc_Num()); - Assertions.assertThat(actualObjectTag.getDocDate().format(formatter)).isEqualTo(expectedSDf07.getDoc_Date()); + Assertions.assertThat(actualObjectTag.getDocNum()).isEqualTo(expectedSDf07.getDoc_num()); + Assertions.assertThat(actualObjectTag.getDocDate().format(formatter)).isEqualTo(expectedSDf07.getDoc_date()); Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedSDf07.getPay_val()); } @@ -325,8 +325,8 @@ class ExportFromHazelcastTest { expectedSDf54.setSpecif_1("test23"); expectedSDf54.setSend_type("test24"); expectedSDf54.setDoc_result("test25"); - expectedSDf54.setDoc_Num("test26"); - expectedSDf54.setDoc_Date("14.03.24"); + expectedSDf54.setDoc_num("test26"); + expectedSDf54.setDoc_date("14.03.24"); expectedSDf54.setValue_date("14.03.24"); expectedSDf54.setSwift_ben("test27"); expectedSDf54.setSwift_int("test28"); @@ -368,8 +368,8 @@ class ExportFromHazelcastTest { Assertions.assertThat(actualObjectTag.getSpecif1()).isEqualTo(expectedSDf54.getSpecif_1()); Assertions.assertThat(actualObjectTag.getSendType()).isEqualTo(expectedSDf54.getSend_type()); Assertions.assertThat(actualObjectTag.getDocResult()).isEqualTo(expectedSDf54.getDoc_result()); - Assertions.assertThat(actualObjectTag.getDocNum()).isEqualTo(expectedSDf54.getDoc_Num()); - Assertions.assertThat(actualObjectTag.getDocDate().format(formatter)).isEqualTo(expectedSDf54.getDoc_Date()); + Assertions.assertThat(actualObjectTag.getDocNum()).isEqualTo(expectedSDf54.getDoc_num()); + Assertions.assertThat(actualObjectTag.getDocDate().format(formatter)).isEqualTo(expectedSDf54.getDoc_date()); Assertions.assertThat(actualObjectTag.getValueDate().format(formatter)).isEqualTo(expectedSDf54.getValue_date()); Assertions.assertThat(actualObjectTag.getSwiftBen()).isEqualTo(expectedSDf54.getSwift_ben()); Assertions.assertThat(actualObjectTag.getSwiftInt()).isEqualTo(expectedSDf54.getSwift_int()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java index 5c97ab1af..5da226924 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java @@ -72,8 +72,8 @@ public class DF06ObjectTag extends ObjectTag { result.setBic(this.getBic()); result.setSpec(this.getSpec()); result.setNumber(this.getNumber()); - result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); + result.setDoc_num(this.getDocNum()); + result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); result.setPay_val(this.getPayVal()); result.setFileName(this.getFileName()); result.setGenerationTime(Instant.now()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java index 4ccefd92b..508980cfc 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java @@ -171,8 +171,8 @@ public class DF55ObjectTag extends ObjectTag { result.setSpecif_1(this.getSpecif1()); result.setSend_type(this.getSendType()); result.setDoc_result(this.getDocResult()); - result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); + result.setDoc_num(this.getDocNum()); + result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(formatter)); result.setSwift_ben(this.getSwiftBen()); result.setSwift_int(this.getSwiftInt()); diff --git a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java index 7e9db0c74..4df10aa9c 100644 --- a/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java +++ b/clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java @@ -161,8 +161,8 @@ public class DF57ObjectTag extends ObjectTag { result.setKpp_cred(this.getKppCred()); result.setAcc_kr(this.getAccKr()); result.setSpecif(this.getSpecif()); - result.setDoc_Num(this.getDocNum()); - result.setDoc_Date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); + result.setDoc_num(this.getDocNum()); + result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter)); result.setDt_in(this.getDtIn()); result.setKt_in(this.getKtIn()); result.setDt_out(this.getDtOut()); diff --git a/clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java b/clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java index f3370b307..9778f8e1b 100644 --- a/clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java +++ b/clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java @@ -257,8 +257,8 @@ class ImportToDBTest { Assertions.assertThat(actualSDf06.getBic()).isEqualTo(expectedObjectTag.getBic()); Assertions.assertThat(actualSDf06.getSpec()).isEqualTo(expectedObjectTag.getSpec()); Assertions.assertThat(actualSDf06.getNumber()).isEqualTo(expectedObjectTag.getNumber()); - Assertions.assertThat(actualSDf06.getDoc_Num()).isEqualTo(expectedObjectTag.getDocNum()); - Assertions.assertThat(actualSDf06.getDoc_Date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); + Assertions.assertThat(actualSDf06.getDoc_num()).isEqualTo(expectedObjectTag.getDocNum()); + Assertions.assertThat(actualSDf06.getDoc_date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); Assertions.assertThat(actualSDf06.getPay_val()).isEqualTo(expectedObjectTag.getPayVal()); Assertions.assertThat(actualSDf06.getFileName()).isEqualTo(expectedObjectTag.getFileName()); Assertions.assertThat(actualSDf06.getGenerationId()).isEqualTo(expectedObjectTag.getGenerationId()); @@ -397,8 +397,8 @@ class ImportToDBTest { Assertions.assertThat(actualSDf55.getSpecif_1()).isEqualTo(expectedObjectTag.getSpecif1()); Assertions.assertThat(actualSDf55.getSend_type()).isEqualTo(expectedObjectTag.getSendType()); Assertions.assertThat(actualSDf55.getDoc_result()).isEqualTo(expectedObjectTag.getDocResult()); - Assertions.assertThat(actualSDf55.getDoc_Num()).isEqualTo(expectedObjectTag.getDocNum()); - Assertions.assertThat(actualSDf55.getDoc_Date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); + Assertions.assertThat(actualSDf55.getDoc_num()).isEqualTo(expectedObjectTag.getDocNum()); + Assertions.assertThat(actualSDf55.getDoc_date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); Assertions.assertThat(actualSDf55.getValue_date()).isEqualTo(expectedObjectTag.getValueDate().format(formatter)); Assertions.assertThat(actualSDf55.getSwift_ben()).isEqualTo(expectedObjectTag.getSwiftBen()); Assertions.assertThat(actualSDf55.getSwift_int()).isEqualTo(expectedObjectTag.getSwiftInt()); @@ -488,8 +488,8 @@ class ImportToDBTest { Assertions.assertThat(actualSDf57.getKpp_cred()).isEqualTo(expectedObjectTag.getKppCred()); Assertions.assertThat(actualSDf57.getAcc_kr()).isEqualTo(expectedObjectTag.getAccKr()); Assertions.assertThat(actualSDf57.getSpecif()).isEqualTo(expectedObjectTag.getSpecif()); - Assertions.assertThat(actualSDf57.getDoc_Num()).isEqualTo(expectedObjectTag.getDocNum()); - Assertions.assertThat(actualSDf57.getDoc_Date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); + Assertions.assertThat(actualSDf57.getDoc_num()).isEqualTo(expectedObjectTag.getDocNum()); + Assertions.assertThat(actualSDf57.getDoc_date()).isEqualTo(expectedObjectTag.getDocDate().format(formatter)); Assertions.assertThat(actualSDf57.getDt_in()).isEqualTo(expectedObjectTag.getDtIn()); Assertions.assertThat(actualSDf57.getKt_in()).isEqualTo(expectedObjectTag.getKtIn()); Assertions.assertThat(actualSDf57.getDt_out()).isEqualTo(expectedObjectTag.getDtOut());