From 71fd1cc0e2d7a05b2a58847a2bd11a753aec5c38 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 15 Feb 2024 22:08:04 +0100 Subject: [PATCH] Recreate assigns --- .../workflow/RecreateAssignProcessesIT.java | 2 +- .../lis/workflow/TaxOfficeInvoiceApiIT.java | 25 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lis-app/src/test/java/hu/user/lis/workflow/RecreateAssignProcessesIT.java b/lis-app/src/test/java/hu/user/lis/workflow/RecreateAssignProcessesIT.java index 4af49ba..9cca6ac 100644 --- a/lis-app/src/test/java/hu/user/lis/workflow/RecreateAssignProcessesIT.java +++ b/lis-app/src/test/java/hu/user/lis/workflow/RecreateAssignProcessesIT.java @@ -9,6 +9,7 @@ import hu.user.lis.db.InvoiceImport; import hu.user.lis.db.repository.InvoiceImportRepository; import hu.user.lis.workflow.invoice.service.WorkflowManagerService; import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.util.Strings; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +17,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import org.zkoss.lang.Strings; import java.util.List; diff --git a/lis-app/src/test/java/hu/user/lis/workflow/TaxOfficeInvoiceApiIT.java b/lis-app/src/test/java/hu/user/lis/workflow/TaxOfficeInvoiceApiIT.java index 536105f..dc5bb2c 100644 --- a/lis-app/src/test/java/hu/user/lis/workflow/TaxOfficeInvoiceApiIT.java +++ b/lis-app/src/test/java/hu/user/lis/workflow/TaxOfficeInvoiceApiIT.java @@ -9,10 +9,12 @@ import hu.gov.nav.schemas.ntca._1_0.common.BasicResultType; import hu.gov.nav.schemas.ntca._1_0.common.FunctionCodeType; import hu.gov.nav.schemas.osa._3_0.api.*; import hu.gov.nav.schemas.osa._3_0.data.InvoiceData; +import hu.user.lis.db.IncomingInvoice; import hu.user.lis.service.nav.TaxOfficeInvoiceService; import hu.user.lis.service.nav.TaxOfficeProperties; import hu.user.lis.service.nav.TaxOfficeRequestBuilder; import hu.user.lis.service.nav.TaxOfficeXmlConverter; +import hu.user.lis.service.nav.mapper.InvoiceMapper; import io.netty.channel.ChannelOption; import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.handler.timeout.WriteTimeoutHandler; @@ -67,13 +69,15 @@ public class TaxOfficeInvoiceApiIT { @Autowired TaxOfficeInvoiceService taxOfficeInvoiceService; + @Autowired + InvoiceMapper invoiceMapper; @Test public void testWithRestTemplate() throws Exception { QueryInvoiceDigestRequest queryRequest = taxOfficeRequestBuilder.requestInvoiceDigest(); queryRequest.setPage(1); queryRequest.setInvoiceDirection(InvoiceDirectionType.INBOUND); - queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(34)); + queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(0, 34)); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_XML); @@ -96,7 +100,7 @@ public class TaxOfficeInvoiceApiIT { QueryInvoiceDigestRequest queryRequest = taxOfficeRequestBuilder.requestInvoiceDigest(); queryRequest.setPage(1); queryRequest.setInvoiceDirection(InvoiceDirectionType.INBOUND); - queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(34)); + queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(0, 34)); WebClient client = WebClient.create(properties.getUrl()); WebClient.UriSpec uriSpec = client.post(); @@ -122,7 +126,7 @@ public class TaxOfficeInvoiceApiIT { QueryInvoiceDigestRequest queryRequest = taxOfficeRequestBuilder.requestInvoiceDigest(); queryRequest.setPage(1); queryRequest.setInvoiceDirection(InvoiceDirectionType.INBOUND); - queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(34)); + queryRequest.setInvoiceQueryParams(taxOfficeRequestBuilder.params(0, 34)); HttpClient httpClient = HttpClient.create() .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000) @@ -153,7 +157,7 @@ public class TaxOfficeInvoiceApiIT { int availablePages = 1; int currentPage = 1; while (currentPage <= availablePages) { - Optional response = taxOfficeInvoiceService.queryInboundInvoices(currentPage, 34); + Optional response = taxOfficeInvoiceService.queryInboundInvoices(currentPage, 15, 34); if (!response.isPresent()) { break; } @@ -176,11 +180,22 @@ public class TaxOfficeInvoiceApiIT { if (invoiceList.isPresent()) { for (InvoiceDigestType invoiceDigest : invoiceList.get()) { String invoiceNumber = invoiceDigest.getInvoiceNumber(); - log.info("Invoice found: {}", invoiceNumber); + String supplierTaxNumber = invoiceDigest.getSupplierTaxNumber(); String invoiceXML = taxOfficeInvoiceService.queryInboundInvoiceDataAsString(invoiceNumber, supplierTaxNumber); Optional invoiceData = taxOfficeXmlConverter.fromXml(invoiceXML, InvoiceData.class); //invoiceData.ifPresent(invoice -> log.info("Found invoice: {}", invoiceXML)); + + IncomingInvoice entity = null; + if (invoiceData.isPresent()) { + entity = invoiceMapper.toEntity(invoiceData.get()); + } + + log.info("Invoice found: {} {} {} {}", invoiceNumber, entity.getNetAmount(), entity.getGrossAmount(), entity.getVatAmount()); + if ("MPHGT-2023-68".equals(invoiceNumber) || "2FBT-2022-29".equals(invoiceNumber)) { + log.info("found"); + } + } } } -- 2.54.0