From a44d0a688141798988daf0d638c6a84f98754e25 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 13 Feb 2025 10:44:39 +0000
Subject: [PATCH 1/3] Extending contact details

---
 103120/schema/xsd/ts_103120_Common.xsd | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index cea9e81d..5dff3cbb 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -36,6 +36,7 @@
             <xs:element name="ApproverRole" type="etsi:LongString" minOccurs="0"/>
             <xs:element name="ApproverIdentity" type="ApproverIdentity" minOccurs="0"/>
             <xs:element name="ApproverContactDetails" type="ApproverContactDetails" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="ExtendedContactDetails" type="GenericContactDetails" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="ApproverIdentity">
@@ -50,6 +51,27 @@
             <xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="GenericContactDetails">
+        <xs:sequence>
+            <xs:element name="Name" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="Role" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="EmailAddress" type="etsi:InternationalizedEmailAddress" minOccurs="0"/>
+            <xs:element name="PhoneNumber" type="etsi:InternationalE164" minOccurs="0"/>
+            <xs:element name="FaxNumber" type="etsi:InternationalE164" minOccurs="0"/>
+            <xs:element name="Address" type="etsi:LongString" minOccurs="0"/>
+            <xs:element name="Languages" type="LanguageIdentifier" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="LanguageIdentifier">
+        <xs:choice>
+            <xs:element name="ISO639Set1LanguageIdentifier" type="ISO639Set1LanguageIdentifier"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:simpleType name="ISO639Set1LanguageIdentifier">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:complexType name="NationalApproverIdentity" abstract="true">
         <xs:sequence>
             <xs:element name="CountryCode" type="etsi:ISOCountryCode"/>
-- 
GitLab


From 153dbfeee5d6ee90bdb1e1cdf366a8a3ece52f13 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Tue, 25 Feb 2025 21:31:39 +0000
Subject: [PATCH 2/3] Lower-casing regex

---
 103120/schema/xsd/ts_103120_Common.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index 5dff3cbb..490147b7 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -69,7 +69,7 @@
     </xs:complexType>
     <xs:simpleType name="ISO639Set1LanguageIdentifier">
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]{2}"/>
+            <xs:pattern value="[a-z]{2}"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="NationalApproverIdentity" abstract="true">
-- 
GitLab


From a348239211346cc896ec316362ed7d543af60f91 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Thu, 27 Feb 2025 10:29:27 +0000
Subject: [PATCH 3/3] Making Approver ContactDetails an extension of
 GenericContactDetails

---
 .../examples/xml/request9_contact_details.xml | 50 +++++++++++++++++++
 103120/schema/xsd/ts_103120_Common.xsd        | 15 +++---
 2 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 103120/examples/xml/request9_contact_details.xml

diff --git a/103120/examples/xml/request9_contact_details.xml b/103120/examples/xml/request9_contact_details.xml
new file mode 100644
index 00000000..a74155f2
--- /dev/null
+++ b/103120/examples/xml/request9_contact_details.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
+    <Header>
+        <SenderIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR01</UniqueIdentifier>
+        </SenderIdentifier>
+        <ReceiverIdentifier>
+            <CountryCode>XX</CountryCode>
+            <UniqueIdentifier>ACTOR02</UniqueIdentifier>
+        </ReceiverIdentifier>
+        <TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
+        <Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
+        <Version>
+            <ETSIVersion>V1.13.1</ETSIVersion>
+            <NationalProfileOwner>XX</NationalProfileOwner>
+            <NationalProfileVersion>v1.0</NationalProfileVersion>
+        </Version>
+    </Header>
+    <Payload>
+        <RequestPayload>
+            <ActionRequests>
+                <ActionRequest>
+                    <ActionIdentifier>0</ActionIdentifier>
+                    <CREATE>
+                        <HI1Object xsi:type="auth:AuthorisationObject">
+                            <ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
+                            <CountryCode>XX</CountryCode>
+                            <OwnerIdentifier>ACTOR01</OwnerIdentifier>
+                            <auth:AuthorisationReference>W000001</auth:AuthorisationReference>
+                            <auth:AuthorisationTimespan>
+                                <auth:StartTime>2025-09-01T12:00:00Z</auth:StartTime>
+                                <auth:EndTime>2025-12-01T12:00:00Z</auth:EndTime>
+                            </auth:AuthorisationTimespan>
+                            <auth:AuthorisationApprovalDetails>
+                                <common:ApprovalType>Approval type</common:ApprovalType>
+                                <common:ApproverDetails>
+                                    <common:ApproverContactDetails>
+                                        <common:Name>Approver name</common:Name>
+                                        <common:ApproverAlternateName>Alternate name</common:ApproverAlternateName>
+                                    </common:ApproverContactDetails>
+                                </common:ApproverDetails>
+                            </auth:AuthorisationApprovalDetails>
+                        </HI1Object>
+                    </CREATE>
+                </ActionRequest>
+            </ActionRequests>
+        </RequestPayload>
+    </Payload>
+</HI1Message>
diff --git a/103120/schema/xsd/ts_103120_Common.xsd b/103120/schema/xsd/ts_103120_Common.xsd
index 490147b7..79f28e0a 100644
--- a/103120/schema/xsd/ts_103120_Common.xsd
+++ b/103120/schema/xsd/ts_103120_Common.xsd
@@ -36,7 +36,6 @@
             <xs:element name="ApproverRole" type="etsi:LongString" minOccurs="0"/>
             <xs:element name="ApproverIdentity" type="ApproverIdentity" minOccurs="0"/>
             <xs:element name="ApproverContactDetails" type="ApproverContactDetails" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="ExtendedContactDetails" type="GenericContactDetails" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="ApproverIdentity">
@@ -45,11 +44,15 @@
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="ApproverContactDetails">
-        <xs:sequence>
-            <xs:element name="ApproverAlternateName" type="etsi:LongString" minOccurs="0"/>
-            <xs:element name="ApproverEmailAddress" type="etsi:InternationalizedEmailAddress" minOccurs="0"/>
-            <xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"/>
-        </xs:sequence>
+        <xs:complexContent>
+            <xs:extension base="GenericContactDetails">
+                <xs:sequence>
+                    <xs:element name="ApproverAlternateName" type="etsi:LongString" minOccurs="0"/>
+                    <xs:element name="ApproverEmailAddress" type="etsi:InternationalizedEmailAddress" minOccurs="0"/>
+                    <xs:element name="ApproverPhoneNumber" type="etsi:InternationalE164" minOccurs="0"/>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
     </xs:complexType>
     <xs:complexType name="GenericContactDetails">
         <xs:sequence>
-- 
GitLab