From a0e9fba8e00b2e9c6a28794f4288d4484a2384de Mon Sep 17 00:00:00 2001 From: AK47454453 <211493676+ak47454453@users.noreply.github.com> Date: Fri, 5 Dec 2025 09:30:02 +0100 Subject: [PATCH] release 3.0.7 --- RELEASE_NOTES.md | 21 +++++++++++++++++++ demo-web-app/build.gradle.kts | 2 +- .../sdk/DuplicateInvoiceIntegrationTest.java | 16 ++++++++------ ...earchEntityInvoiceRoleIntegrationTest.java | 6 ------ ksef-client/build.gradle.kts | 2 +- .../pl/akmf/ksef/sdk/system/FilesUtil.java | 12 ++--------- 6 files changed, 35 insertions(+), 24 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 55dac08..4ec4d3f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1373,4 +1373,25 @@ |-------------|---------------| | ➕ dodane | 34 | | 🔧 zmienione | 42 | +| ➖ usunięte | 0 | +--- +# Changelog zmian - `## 3.0.7 (2025-12-05)` - `API: 2.0.0 RC6.0` + +## 1. ksef-client + +### 1.1 system +- **FilesUtil.java**: 🔧 usunięcie `Map generateInvoicesInMemory(int invoicesCount, String contextNip, LocalDate invoicingDate, String invoiceNumber, String invoiceTemplate)` + +## 2. demo-web-app + +### 2.1 integrationTest +- **DuplicateInvoiceIntegrationTest.java**: 🔧 poprawka scenariusza testowego +- **SearchEntityInvoiceRoleIntegrationTest.java**: 🔧 usunięcie zbędnych importów + +## 3. Podsumowanie + +| Typ zmiany | Liczba plików | +|-------------|---------------| +| ➕ dodane | 0 | +| 🔧 zmienione | 3 | | ➖ usunięte | 0 | \ No newline at end of file diff --git a/demo-web-app/build.gradle.kts b/demo-web-app/build.gradle.kts index 553fbc4..4058c91 100644 --- a/demo-web-app/build.gradle.kts +++ b/demo-web-app/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "pl.akmf.ksef" -version = "3.0.6" +version = "3.0.7" java { toolchain { diff --git a/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/DuplicateInvoiceIntegrationTest.java b/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/DuplicateInvoiceIntegrationTest.java index 172660c..c4526cb 100644 --- a/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/DuplicateInvoiceIntegrationTest.java +++ b/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/DuplicateInvoiceIntegrationTest.java @@ -37,6 +37,7 @@ import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.util.Base64; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -129,14 +130,17 @@ void DuplicateInvoiceOnlineFirstBatchFailedListContainsDuplicate(SystemCode syst private String openBatchSessionAndSendInvoicesPartsStream(String contextNip, SystemCode systemCode, String invoiceTemplatePath, String invoiceNumber, EncryptionData encryptionData, String accessToken) throws IOException, ApiException { - String invoice = new String(readBytesFromPath("/xml/invoices/sample/" + invoiceTemplatePath), StandardCharsets.UTF_8); + String invoiceTemplate = new String(readBytesFromPath("/xml/invoices/sample/" + invoiceTemplatePath), StandardCharsets.UTF_8); - Map invoicesInMemory = FilesUtil.generateInvoicesInMemory(BATCH_TOTAL_INVOICES, - contextNip, - LocalDate.of(2025, 6, 15), - invoiceNumber, - invoice); + Map invoicesInMemory = new HashMap<>(); + for (int i = 0; i < BATCH_TOTAL_INVOICES; i++) { + String invoice = invoiceTemplate + .replace("#nip#", contextNip) + .replace("#invoicing_date#", LocalDate.of(2025, 6, 15).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + .replace("#invoice_number#", invoiceNumber); + invoicesInMemory.put("faktura_" + (i + 1) + ".xml", invoice.getBytes(StandardCharsets.UTF_8)); + } ZipInputStreamWithSize zipInputStreamWithSize = FilesUtil.createZipInputStream(invoicesInMemory); InputStream zipInputStream = zipInputStreamWithSize.getInputStream(); int zipLength = zipInputStreamWithSize.getZipLength(); diff --git a/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/SearchEntityInvoiceRoleIntegrationTest.java b/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/SearchEntityInvoiceRoleIntegrationTest.java index 46da323..1631b76 100644 --- a/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/SearchEntityInvoiceRoleIntegrationTest.java +++ b/demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/SearchEntityInvoiceRoleIntegrationTest.java @@ -5,12 +5,6 @@ import org.junit.jupiter.api.Test; import pl.akmf.ksef.sdk.client.model.ApiException; import pl.akmf.ksef.sdk.client.model.permission.search.QueryEntityRolesResponse; -import pl.akmf.ksef.sdk.client.model.permission.search.QueryPersonalGrantRequest; -import pl.akmf.ksef.sdk.client.model.permission.search.QueryPersonalGrantResponse; -import pl.akmf.ksef.sdk.client.model.testdata.TestDataAuthorizedIdentifier; -import pl.akmf.ksef.sdk.client.model.testdata.TestDataContextIdentifier; -import pl.akmf.ksef.sdk.client.model.testdata.TestDataPermission; -import pl.akmf.ksef.sdk.client.model.testdata.TestDataPermissionRequest; import pl.akmf.ksef.sdk.client.model.testdata.TestDataPersonCreateRequest; import pl.akmf.ksef.sdk.client.model.testdata.TestDataPersonRemoveRequest; import pl.akmf.ksef.sdk.configuration.BaseIntegrationTest; diff --git a/ksef-client/build.gradle.kts b/ksef-client/build.gradle.kts index 9cd2b46..66f702a 100644 --- a/ksef-client/build.gradle.kts +++ b/ksef-client/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } -val appVersion = "3.0.6" +val appVersion = "3.0.7" val artifactName = "ksef-client" val githubRepositoryToken = "token" diff --git a/ksef-client/src/main/java/pl/akmf/ksef/sdk/system/FilesUtil.java b/ksef-client/src/main/java/pl/akmf/ksef/sdk/system/FilesUtil.java index d5bab54..65ca6f1 100644 --- a/ksef-client/src/main/java/pl/akmf/ksef/sdk/system/FilesUtil.java +++ b/ksef-client/src/main/java/pl/akmf/ksef/sdk/system/FilesUtil.java @@ -30,20 +30,12 @@ private FilesUtil() { } public static Map generateInvoicesInMemory(int invoicesCount, String contextNip, String invoiceTemplate) { - return generateInvoicesInMemory(invoicesCount, - contextNip, - LocalDate.of(2025, 6, 15), - UUID.randomUUID().toString(), - invoiceTemplate); - } - - public static Map generateInvoicesInMemory(int invoicesCount, String contextNip, LocalDate invoicingDate, String invoiceNumber, String invoiceTemplate) { Map invoiceMap = new HashMap<>(); for (int i = 0; i < invoicesCount; i++) { String invoice = invoiceTemplate .replace("#nip#", contextNip) - .replace("#invoicing_date#", invoicingDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .replace("#invoice_number#", invoiceNumber); + .replace("#invoicing_date#", LocalDate.of(2025, 6, 15).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + .replace("#invoice_number#", UUID.randomUUID().toString()); invoiceMap.put("faktura_" + (i + 1) + ".xml", invoice.getBytes(StandardCharsets.UTF_8)); }