From e1c324dbc74431c5ec4f5061f2ad310d35a2b8b5 Mon Sep 17 00:00:00 2001 From: amihaiemil Date: Mon, 29 Aug 2022 18:38:52 +0300 Subject: [PATCH] #1291 new company address after 15th August 2022 --- .../com/selfxdsd/api/PlatformInvoice.java | 9 ++++- .../core/StoredPlatformInvoiceTestCase.java | 38 ++++++++++++++++++- .../core/projects/XmlBnrTestCase.java | 2 +- 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/self-api/src/main/java/com/selfxdsd/api/PlatformInvoice.java b/self-api/src/main/java/com/selfxdsd/api/PlatformInvoice.java index 4918807b..59d577b1 100644 --- a/self-api/src/main/java/com/selfxdsd/api/PlatformInvoice.java +++ b/self-api/src/main/java/com/selfxdsd/api/PlatformInvoice.java @@ -70,9 +70,16 @@ default String serialNumber() { * @return String */ default String billedBy() { + final String streetAddress; + if(this.createdAt().isBefore(LocalDateTime.of(2022, 8, 15, 0, 0))) { + streetAddress = "Transilvaniei St. 18, bl. U2, ap. 111"; + } else { + streetAddress = "Alexandru Odobescu St. 5, bl. PB91, ap. 1"; + } return new StringBuilder() .append("SC Extremely Distributed Technologies SRL\n\n") - .append("Transilvaniei St. 18, bl. U2, ap. 111\n") + .append(streetAddress) + .append("\n") .append("Oradea, Romania\n\n") .append("Nr. ORC/Reg. Number: J05/197/2021\n") .append("Cod TVA/VAT Code: RO43621869\n") diff --git a/self-core-impl/src/test/java/com/selfxdsd/core/StoredPlatformInvoiceTestCase.java b/self-core-impl/src/test/java/com/selfxdsd/core/StoredPlatformInvoiceTestCase.java index d4af1c39..4552ba02 100644 --- a/self-core-impl/src/test/java/com/selfxdsd/core/StoredPlatformInvoiceTestCase.java +++ b/self-core-impl/src/test/java/com/selfxdsd/core/StoredPlatformInvoiceTestCase.java @@ -259,10 +259,11 @@ public void returnsSerialNumber() { } /** - * StoredPlatformInvoice can return its billedBy. + * StoredPlatformInvoice can return its updated billedBy, with the new + * address after August 15th 2022. */ @Test - public void returnsBilledBy() { + public void returnsUpdatedBilledBy() { final PlatformInvoice invoice = new StoredPlatformInvoice( 1234, LocalDateTime.now(), @@ -275,6 +276,39 @@ public void returnsBilledBy() { BigDecimal.valueOf(487), Mockito.mock(Storage.class) ); + MatcherAssert.assertThat( + invoice.billedBy(), + Matchers.equalTo( + new StringBuilder() + .append("SC Extremely Distributed Technologies SRL\n\n") + .append("Alexandru Odobescu St. 5, bl. PB91, ap. 1\n") + .append("Oradea, Romania\n\n") + .append("Nr. ORC/Reg. Number: J05/197/2021\n") + .append("Cod TVA/VAT Code: RO43621869\n") + .append("EUID: ROONRC.J05/197/2021") + .toString() + ) + ); + } + + /** + * StoredPlatformInvoice can return its old billedBy, with the old + * address from before August 15th 2022. + */ + @Test + public void returnsOldBilledBy() { + final PlatformInvoice invoice = new StoredPlatformInvoice( + 1234, + LocalDateTime.of(2022, 7, 3, 0, 0), + "mihai", + BigDecimal.valueOf(100), + BigDecimal.valueOf(19), + "transactionId123", + LocalDateTime.of(2022, 7, 3, 0, 0), + 10, + BigDecimal.valueOf(487), + Mockito.mock(Storage.class) + ); MatcherAssert.assertThat( invoice.billedBy(), Matchers.equalTo( diff --git a/self-core-impl/src/test/java/com/selfxdsd/core/projects/XmlBnrTestCase.java b/self-core-impl/src/test/java/com/selfxdsd/core/projects/XmlBnrTestCase.java index fce3ae83..bdda7d33 100644 --- a/self-core-impl/src/test/java/com/selfxdsd/core/projects/XmlBnrTestCase.java +++ b/self-core-impl/src/test/java/com/selfxdsd/core/projects/XmlBnrTestCase.java @@ -45,7 +45,7 @@ public final class XmlBnrTestCase { public void getsEurToRonFromBnr() { MatcherAssert.assertThat( new XmlBnr().euroToRon(), - Matchers.greaterThan(BigDecimal.valueOf(490)) + Matchers.greaterThan(BigDecimal.valueOf(480)) ); }