clean up code, added junit tests

imixs · Jan 16, 2025 · ef3049b · ef3049b
1 parent 9ca937a
commit ef3049b
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 32 deletions.
diff --git a/imixs-archive-documents/pom.xml b/imixs-archive-documents/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.imixs.util</groupId>
 			<artifactId>imixs-e-invoice</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>${org.imixs-e-invoice.version}</version>
 		</dependency>
 
 

diff --git a/imixs-archive-documents/src/main/java/org/imixs/archive/documents/EInvoiceAdapter.java b/imixs-archive-documents/src/main/java/org/imixs/archive/documents/EInvoiceAdapter.java
@@ -476,37 +476,7 @@ private void readEInvoiceContent(FileData eInvoiceFileData, List<ItemCollection>
 				String itemType = entityDef.getItemValueString("type");
 
 				readItem(workitem, xPathExpr, itemType, itemName);
-				// XPathExpression expr = compiledExpressions.computeIfAbsent(xPathExpr,
-				// k -> {
-				// try {
-				// return xpath.compile(k);
-				// } catch (Exception e) {
-				// logger.warning("Error compiling XPath expression: " + k + " - " +
-				// e.getMessage());
-				// return null;
-				// }
-				// });
-				// // extract the xpath value and update the workitem...
-				// if (expr != null) {
-				// Node node = (Node) expr.evaluate(xmlDoc, XPathConstants.NODE);
-				// String itemValue = node != null ? node.getTextContent() : null;
-				// // test if we have a type....
-
-				// if ("date".equalsIgnoreCase(itemType)) {
-				// SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-				// try {
-				// Date invoiceDate = formatter.parse(itemValue);
-				// workitem.setItemValue(itemName, invoiceDate);
-				// } catch (ParseException e) {
-				// e.printStackTrace();
-				// }
-				// } else if ("double".equalsIgnoreCase(itemType)) {
-				// workitem.setItemValue(itemName, Double.parseDouble(itemValue));
-				// } else {
-				// // default...
-				// workitem.setItemValue(itemName, itemValue);
-				// }
-				// }
+
 			}
 		} catch (Exception e) {
 			logger.warning("Error analyzing XML content: " + e.getMessage());

diff --git a/imixs-archive-documents/src/test/java/org/imixs/archive/documents/EInvoiceAdapterTest.java b/imixs-archive-documents/src/test/java/org/imixs/archive/documents/EInvoiceAdapterTest.java
@@ -125,6 +125,28 @@ void testExecuteWithStandaloneXMLExtractData() throws AdapterException, PluginEx
 
     }
 
+    /**
+     * This test uses the xpath expressions form a xml document with custom
+     * namespaces
+     * 
+     * @throws AdapterException
+     * @throws PluginException
+     * @throws IOException
+     */
+    @Test
+    void testExecuteWithCustomNamespaces() throws AdapterException, PluginException, IOException {
+
+        // Prepare test data
+        FileData xmlFile = createFileData("e-invoice/Rechnung_CustomNamespace_CII.xml", "application/xml");
+        workitem.addFileData(xmlFile);
+
+        adapter.execute(workitem, event);
+
+        assertEquals("102026", workitem.getItemValueString("invoice.number"));
+        assertEquals("Foo Innovation GmbH", workitem.getItemValueString("cdtr.name"));
+
+    }
+
     @Test
     void testExecuteWithZIPContainingXML() throws AdapterException, PluginException, IOException {
         // Prepare test data

diff --git a/...-archive-documents/src/test/java/org/imixs/archive/documents/EInvoiceAutoAdapterTest.java b/...-archive-documents/src/test/java/org/imixs/archive/documents/EInvoiceAutoAdapterTest.java
@@ -145,6 +145,28 @@ void testZugferdWithExtraction() throws AdapterException, PluginException, IOExc
 
     }
 
+    /**
+     * This test uses the xpath expressions form a xml document with custom
+     * namespaces
+     * 
+     * @throws AdapterException
+     * @throws PluginException
+     * @throws IOException
+     */
+    @Test
+    void testExecuteWithCustomNamespaces() throws AdapterException, PluginException, IOException {
+
+        // Prepare test data
+        FileData xmlFile = createFileData("e-invoice/Rechnung_CustomNamespace_CII.xml", "application/xml");
+        workitem.addFileData(xmlFile);
+
+        adapter.execute(workitem, event);
+
+        assertEquals("102026", workitem.getItemValueString("invoice.number"));
+        assertEquals("Foo Innovation GmbH", workitem.getItemValueString("cdtr.name"));
+
+    }
+
     /**
      * Creates a FileData object from a file stored under /test/resources/
      * 

diff --git a/imixs-archive-documents/src/test/resources/e-invoice/Rechnung_CustomNamespace_CII.xml b/imixs-archive-documents/src/test/resources/e-invoice/Rechnung_CustomNamespace_CII.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<mgns1:CrossIndustryInvoice
+  xmlns:mgns1="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+  xmlns:mgns2="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+  xmlns:mgns3="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+
+  <mgns1:ExchangedDocumentContext>
+    <mgns2:BusinessProcessSpecifiedDocumentContextParameter>
+      <mgns2:ID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</mgns2:ID>
+    </mgns2:BusinessProcessSpecifiedDocumentContextParameter>
+    <mgns2:GuidelineSpecifiedDocumentContextParameter>
+      <mgns2:ID>
+        urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0#conformant#urn:xeinkauf.de:kosit:extension:xrechnung_3.0</mgns2:ID>
+    </mgns2:GuidelineSpecifiedDocumentContextParameter>
+  </mgns1:ExchangedDocumentContext>
+
+  <mgns1:ExchangedDocument>
+    <mgns2:ID>102026</mgns2:ID>
+    <mgns2:TypeCode>380</mgns2:TypeCode>
+    <mgns2:IssueDateTime>
+      <mgns3:DateTimeString format="102">20250101</mgns3:DateTimeString>
+    </mgns2:IssueDateTime>
+  </mgns1:ExchangedDocument>
+
+  <mgns1:SupplyChainTradeTransaction>
+    <mgns2:IncludedSupplyChainTradeLineItem>
+      <mgns2:AssociatedDocumentLineDocument>
+        <mgns2:LineID>1</mgns2:LineID>
+        <mgns2:IncludedNote>
+          <mgns2:Content>Vertrag 66790-01&#13;&#10;IDNR: 5657,S/N: 2Y3333302, CN IR ADV DX C5840I</mgns2:Content>
+        </mgns2:IncludedNote>
+      </mgns2:AssociatedDocumentLineDocument>
+      <mgns2:SpecifiedTradeProduct>
+        <mgns2:SellerAssignedID>Pauschale</mgns2:SellerAssignedID>
+        <mgns2:Name>Pauschale</mgns2:Name>
+      </mgns2:SpecifiedTradeProduct>
+      <mgns2:SpecifiedLineTradeAgreement>
+        <mgns2:NetPriceProductTradePrice>
+          <mgns2:ChargeAmount>44.00</mgns2:ChargeAmount>
+          <mgns2:BasisQuantity unitCode="H87">1</mgns2:BasisQuantity>
+        </mgns2:NetPriceProductTradePrice>
+      </mgns2:SpecifiedLineTradeAgreement>
+      <mgns2:SpecifiedLineTradeDelivery>
+        <mgns2:BilledQuantity unitCode="H87">1.00</mgns2:BilledQuantity>
+      </mgns2:SpecifiedLineTradeDelivery>
+      <mgns2:SpecifiedLineTradeSettlement>
+        <mgns2:ApplicableTradeTax>
+          <mgns2:TypeCode>VAT</mgns2:TypeCode>
+          <mgns2:CategoryCode>S</mgns2:CategoryCode>
+          <mgns2:RateApplicablePercent>19.00</mgns2:RateApplicablePercent>
+        </mgns2:ApplicableTradeTax>
+        <mgns2:BillingSpecifiedPeriod>
+          <mgns2:StartDateTime>
+            <mgns3:DateTimeString format="102">20250101</mgns3:DateTimeString>
+          </mgns2:StartDateTime>
+          <mgns2:EndDateTime>
+            <mgns3:DateTimeString format="102">20250131</mgns3:DateTimeString>
+          </mgns2:EndDateTime>
+        </mgns2:BillingSpecifiedPeriod>
+        <mgns2:SpecifiedTradeSettlementLineMonetarySummation>
+          <mgns2:LineTotalAmount>44.00</mgns2:LineTotalAmount>
+        </mgns2:SpecifiedTradeSettlementLineMonetarySummation>
+      </mgns2:SpecifiedLineTradeSettlement>
+    </mgns2:IncludedSupplyChainTradeLineItem>
+    <mgns2:ApplicableHeaderTradeAgreement>
+      <mgns2:BuyerReference>ohne</mgns2:BuyerReference>
+      <mgns2:SellerTradeParty>
+        <mgns2:Name>Foo Innovation GmbH</mgns2:Name>
+        <mgns2:DefinedTradeContact>
+          <mgns2:PersonName>Max Musternn</mgns2:PersonName>
+          <mgns2:TelephoneUniversalCommunication>
+            <mgns2:CompleteNumber>+49(40)23854517</mgns2:CompleteNumber>
+          </mgns2:TelephoneUniversalCommunication>
+          <mgns2:EmailURIUniversalCommunication>
+            <mgns2:URIID>[email protected]</mgns2:URIID>
+          </mgns2:EmailURIUniversalCommunication>
+        </mgns2:DefinedTradeContact>
+        <mgns2:PostalTradeAddress>
+          <mgns2:PostcodeCode>22089</mgns2:PostcodeCode>
+          <mgns2:LineOne>Heidenkampsweg 45</mgns2:LineOne>
+          <mgns2:CityName>Hamburg</mgns2:CityName>
+          <mgns2:CountryID>DE</mgns2:CountryID>
+        </mgns2:PostalTradeAddress>
+        <mgns2:URIUniversalCommunication>
+          <mgns2:URIID schemeID="EM">[email protected]</mgns2:URIID>
+        </mgns2:URIUniversalCommunication>
+        <mgns2:SpecifiedTaxRegistration>
+          <mgns2:ID schemeID="VA">DE9994727754</mgns2:ID>
+        </mgns2:SpecifiedTaxRegistration>
+      </mgns2:SellerTradeParty>
+      <mgns2:BuyerTradeParty>
+        <mgns2:ID>66790</mgns2:ID>
+        <mgns2:Name>ABC GmbH</mgns2:Name>
+        <mgns2:PostalTradeAddress>
+          <mgns2:PostcodeCode>20457</mgns2:PostcodeCode>
+          <mgns2:LineOne>Lindenstr 8</mgns2:LineOne>
+          <mgns2:CityName>Hamburg</mgns2:CityName>
+          <mgns2:CountryID>DE</mgns2:CountryID>
+        </mgns2:PostalTradeAddress>
+        <mgns2:URIUniversalCommunication>
+          <mgns2:URIID schemeID="EM" />
+        </mgns2:URIUniversalCommunication>
+      </mgns2:BuyerTradeParty>
+      <mgns2:SellerOrderReferencedDocument>
+        <mgns2:IssuerAssignedID>98234</mgns2:IssuerAssignedID>
+      </mgns2:SellerOrderReferencedDocument>
+    </mgns2:ApplicableHeaderTradeAgreement>
+    <mgns2:ApplicableHeaderTradeDelivery>
+      <mgns2:ShipToTradeParty>
+        <mgns2:Name>VALUES. Health GmbH</mgns2:Name>
+        <mgns2:PostalTradeAddress>
+          <mgns2:PostcodeCode>20457</mgns2:PostcodeCode>
+          <mgns2:LineOne>Lindenstr 8</mgns2:LineOne>
+          <mgns2:CityName>Hamburg</mgns2:CityName>
+          <mgns2:CountryID>DE</mgns2:CountryID>
+        </mgns2:PostalTradeAddress>
+      </mgns2:ShipToTradeParty>
+      <mgns2:ActualDeliverySupplyChainEvent>
+        <mgns2:OccurrenceDateTime>
+          <mgns3:DateTimeString format="102">20250131</mgns3:DateTimeString>
+        </mgns2:OccurrenceDateTime>
+      </mgns2:ActualDeliverySupplyChainEvent>
+    </mgns2:ApplicableHeaderTradeDelivery>
+    <mgns2:ApplicableHeaderTradeSettlement>
+      <mgns2:InvoiceCurrencyCode>EUR</mgns2:InvoiceCurrencyCode>
+      <mgns2:SpecifiedTradeSettlementPaymentMeans>
+        <mgns2:TypeCode>30</mgns2:TypeCode>
+        <mgns2:PayeePartyCreditorFinancialAccount>
+          <mgns2:IBANID>DE49200000001002127296</mgns2:IBANID>
+          <mgns2:AccountName>Foo Innovation GmbH</mgns2:AccountName>
+        </mgns2:PayeePartyCreditorFinancialAccount>
+        <mgns2:PayeeSpecifiedCreditorFinancialInstitution>
+          <mgns2:BICID>HASPDEHHABC</mgns2:BICID>
+        </mgns2:PayeeSpecifiedCreditorFinancialInstitution>
+      </mgns2:SpecifiedTradeSettlementPaymentMeans>
+      <mgns2:ApplicableTradeTax>
+        <mgns2:CalculatedAmount>8.36</mgns2:CalculatedAmount>
+        <mgns2:TypeCode>VAT</mgns2:TypeCode>
+        <mgns2:BasisAmount>44.00</mgns2:BasisAmount>
+        <mgns2:CategoryCode>S</mgns2:CategoryCode>
+        <mgns2:RateApplicablePercent>19.00</mgns2:RateApplicablePercent>
+      </mgns2:ApplicableTradeTax>
+      <mgns2:SpecifiedTradePaymentTerms>
+        <mgns2:Description>Innerhalb 14 Tagen nach Rechungsdatum netto, spätestens zum 15.01.2025</mgns2:Description>
+        <mgns2:DueDateDateTime>
+          <mgns3:DateTimeString format="102">20250115</mgns3:DateTimeString>
+        </mgns2:DueDateDateTime>
+      </mgns2:SpecifiedTradePaymentTerms>
+      <mgns2:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <mgns2:LineTotalAmount>44.00</mgns2:LineTotalAmount>
+        <mgns2:TaxBasisTotalAmount>44.00</mgns2:TaxBasisTotalAmount>
+        <mgns2:TaxTotalAmount currencyID="EUR">8.36</mgns2:TaxTotalAmount>
+        <mgns2:GrandTotalAmount>52.36</mgns2:GrandTotalAmount>
+        <mgns2:DuePayableAmount>52.36</mgns2:DuePayableAmount>
+      </mgns2:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </mgns2:ApplicableHeaderTradeSettlement>
+  </mgns1:SupplyChainTradeTransaction>
+
+</mgns1:CrossIndustryInvoice>
diff --git a/pom.xml b/pom.xml
@@ -87,6 +87,7 @@
 		<jakarta.version>10.0.0</jakarta.version>
 		<org.imixs.workflow.version>6.1.0</org.imixs.workflow.version>
 		<org.imixs.melman.version>2.1.0-SNAPSHOT</org.imixs.melman.version>
+		<org.imixs-e-invoice.version>1.0.1-SNAPSHOT</org.imixs-e-invoice.version>
 		<apache.pdfbox.version>2.0.21</apache.pdfbox.version>
 		<microprofile.version>6.0</microprofile.version>
 		<microprofile-metrics.version>4.0</microprofile-metrics.version>