From: Vásáry Dániel <vasary@elgekko.net>
Date: Sat, 17 Feb 2024 23:35:37 +0000 (+0100)
Subject: Invoice mapping modified for vat
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=78e62e227158b49d2c4593c75fe76b7682b835cf;p=sly-crm.git

Invoice mapping modified for vat
---

diff --git a/lis-app/src/main/java/hu/user/lis/build/Exec.java b/lis-app/src/main/java/hu/user/lis/build/Exec.java
deleted file mode 100644
index caf7390..0000000
--- a/lis-app/src/main/java/hu/user/lis/build/Exec.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package hu.user.lis.build;
-
-
-import java.util.Arrays;
-
-public class Exec {
-
-    public static void main(String[] args) {
-        System.out.println("Running the main method");
-        if (args.length > 0) {
-            System.out.println("List of arguments: " + Arrays.toString(args));
-        }
-    }
-}
\ No newline at end of file
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 dc5bb2c..34753ed 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
@@ -157,7 +157,7 @@ public class TaxOfficeInvoiceApiIT {
         int availablePages = 1;
         int currentPage = 1;
         while (currentPage <= availablePages) {
-            Optional<QueryInvoiceDigestResponse> response = taxOfficeInvoiceService.queryInboundInvoices(currentPage, 15, 34);
+            Optional<QueryInvoiceDigestResponse> response = taxOfficeInvoiceService.queryInboundInvoices(currentPage, 5, 34);
             if (!response.isPresent()) {
                 break;
             }
@@ -191,10 +191,10 @@ public class TaxOfficeInvoiceApiIT {
                             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");
-                        }
+                        log.info("Invoice found: {} {} {} {} {}", invoiceNumber, entity.getNetAmount(), entity.getGrossAmount(), entity.getCurrency(), entity.getVatAmount());
+//                        if ("SZ/3303005/02810/00005".equals(invoiceNumber)) {
+//                            log.info("found");
+//                        }
 
                     }
                 }
diff --git a/lis-service/src/main/java/hu/user/lis/service/nav/mapper/InvoiceMapper.java b/lis-service/src/main/java/hu/user/lis/service/nav/mapper/InvoiceMapper.java
index a9e858b..67b8b50 100644
--- a/lis-service/src/main/java/hu/user/lis/service/nav/mapper/InvoiceMapper.java
+++ b/lis-service/src/main/java/hu/user/lis/service/nav/mapper/InvoiceMapper.java
@@ -19,7 +19,7 @@ public interface InvoiceMapper {
     @Mapping(target = "paymentDeadline", source = "invoiceMain.invoice.invoiceHead.invoiceDetail.paymentDate")
     @Mapping(target = "currency", source = "invoiceMain.invoice.invoiceHead.invoiceDetail.currencyCode")
     @Mapping(target = "netAmount", source = "invoiceMain.invoice.invoiceSummary.summaryNormal.invoiceNetAmount")
-    @Mapping(target = "vatAmount", source = "invoiceMain.invoice.invoiceSummary.summaryNormal.invoiceVatAmount")
+    @Mapping(target = "vatAmount", source = "invoiceMain.invoice.invoiceSummary.summaryNormal.invoiceVatAmountHUF")
     @Mapping(target = "grossAmount", source = "invoiceMain.invoice.invoiceSummary.summaryGrossData.invoiceGrossAmount")
     @Mapping(target = "incoming", constant = "true")
     @Mapping(target = "id", ignore = true)