From 10a5e1900dcb5da74acd86b643d9b6c748e0f74c Mon Sep 17 00:00:00 2001
From: aaron-kumar <arun.kaundal@gmail.com>
Date: Sun, 15 Oct 2023 00:18:25 +0530
Subject: [PATCH] Made C1 country code mandatory as per Peppol SBDH v2.0.1

---
 .../oxalis/sniffer/PeppolStandardBusinessHeader.java        | 6 ++----
 .../src/test/resources/peppol-bis-invoice-sbdh.xml          | 4 ++++
 .../src/test/resources/peppol-bis-invoice-sbdh.xml          | 4 ++++
 pom.xml                                                     | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java
index 349c05ea1..e513f6856 100644
--- a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java
@@ -130,8 +130,7 @@ public boolean isComplete() {
                 (senderId != null) &&
                 (peppolDocumentTypeId != null) &&
                 (profileTypeIdentifier != null) &&
-                // TODO: C1 Country is Not mandatory yet, uncomment once C1 country code will become mandatory
-                //(c1CountryIdentifier != null) &&
+                (c1CountryIdentifier != null) &&
                 (instanceId != null) &&
                 (creationDateAndTime != null));
     }
@@ -147,8 +146,7 @@ public List<String> listMissingProperties() {
         if (senderId == null) mhf.add("senderId");
         if (peppolDocumentTypeId == null) mhf.add("peppolDocumentTypeId");
         if (profileTypeIdentifier == null) mhf.add("profileTypeIdentifier");
-        // TODO: C1 Country is Not mandatory yet, uncomment once C1 country code will become mandatory
-        //if (c1CountryIdentifier == null) mhf.add("c1CountryIdentifier");
+        if (c1CountryIdentifier == null) mhf.add("c1CountryIdentifier");
         if (instanceId == null) mhf.add("messageId");
         if (creationDateAndTime == null) mhf.add("creationDateAndTime");
         return mhf;
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml
index 5939bb626..312208373 100644
--- a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml
@@ -24,6 +24,10 @@
                 <Type>PROCESSID</Type>
                 <InstanceIdentifier>urn:www.cenbii.eu:profile:bii04:ver1.0</InstanceIdentifier>
             </Scope>
+            <Scope>
+                <Type>COUNTRY_C1</Type>
+                <InstanceIdentifier>SE</InstanceIdentifier>
+            </Scope>
         </BusinessScope>
     </StandardBusinessDocumentHeader>
     <Invoice:Invoice xmlns:Invoice="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml
index 95515f77c..a3059c19f 100644
--- a/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml
+++ b/oxalis-outbound/src/test/resources/peppol-bis-invoice-sbdh.xml
@@ -46,6 +46,10 @@
                 <Type>PROCESSID</Type>
                 <InstanceIdentifier>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</InstanceIdentifier>
             </Scope>
+            <Scope>
+                <Type>COUNTRY_C1</Type>
+                <InstanceIdentifier>NO</InstanceIdentifier>
+            </Scope>
         </BusinessScope>
     </StandardBusinessDocumentHeader>
     <Invoice:Invoice xmlns:Invoice="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/pom.xml b/pom.xml
index daf9b6a1d..9de764293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <javax.inject.version>1</javax.inject.version>
         <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
         <bouncycastle.version>1.70</bouncycastle.version>
-        <vefa.peppol.version>3.2.0</vefa.peppol.version>
+        <vefa.peppol.version>3.3.0</vefa.peppol.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <jakarta.mail.version>1.6.7</jakarta.mail.version>
         <jakarta.activation.version>1.2.2</jakarta.activation.version>