Recreate assigns

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 4af49ba0947f0270576353b4f0534a37f5f237f3..9cca6ac0486c2099a9492cf6b5fe5bac710acee7 100644 (file)
--- 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 536105fac4d9588ec43bb4cc71995fd34a12551a..dc5bb2c1b1c1ffe50616bf305019c16e2e01dbe8 100644 (file)
--- 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<WebClient.RequestBodySpec> 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<QueryInvoiceDigestResponse> response = taxOfficeInvoiceService.queryInboundInvoices(currentPage, 34);
+            Optional<QueryInvoiceDigestResponse> 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> 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");
+                        }
+
                     }
                 }
             }