From d764fb4784ff1800f89be6bfd5204ac84d98bc82 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Thu, 26 Nov 2020 09:39:47 +0100
Subject: [PATCH] closes #201

---
 History.md                                    |  6 +++
 .../main/java/org/mustangproject/Invoice.java | 17 +++++++
 .../ZUGFeRD/ZUGFeRD2PullProvider.java         |  2 +-
 .../org/mustangproject/ZUGFeRD/XRTest.java    | 44 +++++++++++++++++++
 .../mustangproject/ZUGFeRD/ZF2PushTest.java   |  4 +-
 .../mustangproject/validator/LibraryTest.java |  2 +-
 6 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 838ba158..fa2e51df 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,9 @@
+2.0.3
+=======
+
+
+- #201 correct embedded files in XRechnung
+
 2.0.2
 =======
 2020-11-25
diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java
index 68c49339..1d0c121f 100644
--- a/library/src/main/java/org/mustangproject/Invoice.java
+++ b/library/src/main/java/org/mustangproject/Invoice.java
@@ -40,6 +40,7 @@ public class Invoice implements IExportableTransaction {
 	protected ArrayList<IZUGFeRDExportableItem> ZFItems = null;
 	protected ArrayList<String> notes = null;
 	protected String contractReferencedDocument = null;
+	protected ArrayList<FileAttachment> xmlEmbeddedFiles=null;
 
 	protected Date detailedDeliveryDateStart = null;
 	protected Date detailedDeliveryPeriodEnd = null;
@@ -78,6 +79,22 @@ public class Invoice implements IExportableTransaction {
 		return this;
 	}
 
+	public Invoice embedFileInXML(FileAttachment fa) {
+		if (xmlEmbeddedFiles == null) {
+			xmlEmbeddedFiles=new ArrayList<FileAttachment>();
+		}
+		xmlEmbeddedFiles.add(fa);
+		return this;
+	}
+
+	public FileAttachment[] getAdditionalReferencedDocuments() {
+		if (xmlEmbeddedFiles == null) {
+			return null;
+		}
+		return xmlEmbeddedFiles.toArray(new FileAttachment[0]);
+
+	}
+
 
 	@Override
 	public String getNumber() {
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index f31176df..54d1c169 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -442,7 +442,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 						+ "    <ram:TypeCode>916</ram:TypeCode>\n"
 						+ "    <ram:Name>" + f.getDescription() + "</ram:Name>\n"
 						+ "    <ram:AttachmentBinaryObject mimeCode=\"" + f.getMimetype() + "\"\n"
-						+ "      filename=\"" + f.getFilename() + "\">" + documentContent + "\n"
+						+ "      filename=\"" + f.getFilename() + "\">" + documentContent + "</ram:AttachmentBinaryObject>\n"
 						+ "  </ram:AdditionalReferencedDocument>\n";
 			}
 		}
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
index 6166dd51..ac94775d 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
@@ -39,6 +39,7 @@ import static org.xmlunit.assertj.XmlAssert.assertThat;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class XRTest extends TestCase {
 	final String TARGET_XML = "./target/testout-XR.xml";
+	final String TARGET_EDGE_XML = "./target/testout-XR-Edge.xml";
 	public void testXRExport() {
 
 		// the writing part
@@ -76,5 +77,48 @@ public class XRTest extends TestCase {
 		}
 
 	}
+	public void testXREdgeExport() {
+
+		// the writing part
+
+		String orgname = "Test company";
+		String number = "123";
+		String amountStr = "1.00";
+		BigDecimal amount = new BigDecimal(amountStr);
+		byte[] b = {12, 13};
+		FileAttachment fe1=new FileAttachment("one.pdf", "application/pdf", "Alternative", b);
+		FileAttachment fe2=new FileAttachment("two.pdf", "application/pdf", "Alternative", b);
+		Invoice i = new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
+				.setSender(new TradeParty(orgname,"teststr","55232","teststadt","DE").addTaxID("DE4711").addVATID("DE0815").setContact(new Contact("Hans Test","+49123456789","test@example.org")).addBankDetails(new BankDetails("DE12500105170648489890","COBADEFXXX")))
+				.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE"))
+				.setReferenceNumber("991-01484-64")//leitweg-id
+				// not using any VAT, this is also a test of zero-rated goods:
+				.setNumber(number).addItem(new Item(new Product("Testprodukt", "", "C62", BigDecimal.ZERO), amount, new BigDecimal(1.0)))
+				.embedFileInXML(fe1).embedFileInXML(fe2);
+
+
+		ZUGFeRD2PullProvider zf2p = new ZUGFeRD2PullProvider();
+
+		zf2p.setProfile(Profiles.getByName("XRechnung"));
+		zf2p.generateXML(i);
+		String theXML = new String(zf2p.getXML());
+		assertTrue(theXML.contains("<rsm:CrossIndustryInvoice"));
+		assertThat(theXML).valueByXPath("count(//*[local-name()='IncludedSupplyChainTradeLineItem'])")
+				.asInt()
+				.isEqualTo(1); //2 errors are OK because there is a known bug
+
+
+		assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
+				.asDouble()
+				.isEqualTo(1);
+		try {
+			BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML));
+			writer.write(theXML);
+			writer.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+	}
 
 }
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
index fb41990a..c19cf0c7 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
@@ -119,8 +119,8 @@ public class ZF2PushTest extends TestCase {
 					 .load(SOURCE_PDF)) {
 
 			byte[] b = {12, 13};
-			ze.attachFile("one.pdf", b, "Application/PDF", "Alternative");
-			ze.attachFile("two.pdf", b, "Application/PDF", "Alternative");
+			ze.attachFile("one.pdf", b, "application/pdf", "Alternative");
+			ze.attachFile("two.pdf", b, "application/pdf", "Alternative");
 			ze.setTransaction(new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date()).setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").addTaxID(taxID)).setOwnVATID("DE0815").setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE4711").setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE"))).setNumber(number).addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), price, new BigDecimal(1.0)))
 
 			);
diff --git a/validator/src/test/java/org/mustangproject/validator/LibraryTest.java b/validator/src/test/java/org/mustangproject/validator/LibraryTest.java
index 977d85d3..f780b390 100644
--- a/validator/src/test/java/org/mustangproject/validator/LibraryTest.java
+++ b/validator/src/test/java/org/mustangproject/validator/LibraryTest.java
@@ -157,7 +157,7 @@ public class LibraryTest extends ResourceCase {
 	 * automatically test the xrechnung
 	 */
 	public void testXRValidation() {
-		File tempFile = new File("../library/target/testout-XR.xml");
+		File tempFile = new File("../library/target/testout-XR-Edge.xml");
 		ZUGFeRDValidator zfv = new ZUGFeRDValidator();
 
 		String res = zfv.validate(tempFile.getAbsolutePath());