Change health-allowance service to municipal-allowance service (#29)

* Change health-allowance service to municipal-allowance service * update description * Rename health allowance services to municipal allowance service * Rename remaining elements/types and minor type description * Review comments
trifork · Sep 23, 2024 · a5cda90 · a5cda90
1 parent f56ed1a
commit a5cda90
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>dk.lmst.ctr</groupId>
     <artifactId>ctr-schemas</artifactId>
-    <version>1.1.14</version>
+    <version>1.1.15</version>
     <name>ctr-schemas</name>
     <description>CTR schemas</description>
     <packaging>pom</packaging>

diff --git a/src/schemas/2022/12/01/GetAggregatedStatusResponse.xsd b/src/schemas/2022/12/01/GetAggregatedStatusResponse.xsd
@@ -8,7 +8,7 @@
     <include schemaLocation="PersonIdentifier.xsd"/>
     <include schemaLocation="IsChild.xsd"/>
     <include schemaLocation="AccountStatus.xsd"/>
-	<include schemaLocation="HealthAllowance.xsd"/>
+	<include schemaLocation="MunicipalAllowance.xsd"/>
 	<include schemaLocation="ReimbursementGrant.xsd"/>
 	<include schemaLocation="Deferment.xsd"/>
 
@@ -23,7 +23,7 @@
 				<element name="IsChild" type="ctr:IsChildType"/>
 				<element name="PatientStatus" type="ctr:PatientStatusType"/>
 				<element name="AccountStatus" type="ctr:AccountStatusType" minOccurs="0" maxOccurs="100"/>
-				<element name="HealthAllowance" type="ctr:HealthAllowanceType" minOccurs="0" maxOccurs="100"/>
+				<element name="MunicipalAllowance" type="ctr:MunicipalAllowanceType" minOccurs="0" maxOccurs="100"/>
 				<element name="ReimbursementGrant" type="ctr:ReimbursementGrantType" minOccurs="0" maxOccurs="100"/>
 				<element name="Deferment" type="ctr:DefermentType" minOccurs="0" maxOccurs="100"/>
 			</sequence>

diff --git a/...2022/12/01/GetHealthAllowancesRequest.xsd → ...2/12/01/GetMunicipalAllowancesRequest.xsd b/...2022/12/01/GetHealthAllowancesRequest.xsd → ...2/12/01/GetMunicipalAllowancesRequest.xsd
@@ -6,13 +6,13 @@
 
 	<include schemaLocation="PersonIdentifier.xsd"/>	
 
-	<element name="GetHealthAllowancesRequest" type="ctr:GetHealthAllowancesRequestType">
+	<element name="GetMunicipalAllowancesRequest" type="ctr:GetMunicipalAllowancesRequestType">
 		<annotation>
-			<documentation xml:lang="en-GB">Element for a request to fetch health allowances</documentation>
-			<documentation xml:lang="da-DK">Element for en forespørgsel til at hente kommunale helbredstillæg</documentation>
+			<documentation xml:lang="en-GB">Element for a request to fetch municipal allowances</documentation>
+			<documentation xml:lang="da-DK">Element for en forespørgsel til at hente kommunale tillæg</documentation>
 		</annotation>
 	</element>
-	<complexType name="GetHealthAllowancesRequestType">
+	<complexType name="GetMunicipalAllowancesRequestType">
 		<sequence>
             <element name="PersonIdentifier" type="ctr:PersonIdentifierType"/>			
 		</sequence>

diff --git a/...022/12/01/GetHealthAllowancesResponse.xsd → .../12/01/GetMunicipalAllowancesResponse.xsd b/...022/12/01/GetHealthAllowancesResponse.xsd → .../12/01/GetMunicipalAllowancesResponse.xsd
@@ -6,17 +6,17 @@
 
     <include schemaLocation="PersonIdentifier.xsd"/>
 	<include schemaLocation="ReimbursementGrant.xsd"/>
-	<include schemaLocation="HealthAllowance.xsd"/>
+	<include schemaLocation="MunicipalAllowance.xsd"/>
 
-	<element name="GetHealthAllowancesResponse">
+	<element name="GetMunicipalAllowancesResponse">
 		<annotation>
-			<documentation xml:lang="en-GB">Outer container element for a response with Health Allowances</documentation>
-			<documentation xml:lang="da-DK">Ydre container-element for et svar med kommunale helbredstillæg</documentation>
+			<documentation xml:lang="en-GB">Outer container element for a response with Municipal Allowances</documentation>
+			<documentation xml:lang="da-DK">Ydre container-element for et svar med kommunale tillæg</documentation>
 		</annotation>
 		<complexType>
 			<sequence>
 				<element name="PersonIdentifier" type="ctr:PersonIdentifierType"/>
-				<element name="HealthAllowance" type="ctr:HealthAllowanceType" minOccurs="0" maxOccurs="100"/>
+				<element name="MunicipalAllowance" type="ctr:MunicipalAllowanceType" minOccurs="0" maxOccurs="100"/>
 			</sequence>
 		</complexType>
 	</element>

diff --git a/src/schemas/2022/12/01/InvoicingMunicipalityNumber.xsd b/src/schemas/2022/12/01/InvoicingMunicipalityNumber.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ctr="http://lmst.dk/ctr/xml.schema/2022/12/01"
+        targetNamespace="http://lmst.dk/ctr/xml.schema/2022/12/01"
+        elementFormDefault="qualified">
+
+    <include schemaLocation="Source.xsd"/>
+
+    <element name="InvoicingMunicipalityNumber" type="ctr:InvoicingMunicipalityNumberType">
+        <annotation>
+            <documentation xml:lang="en-GB">Element for specifying an invoicing number, for instance, EAN location number.</documentation>
+            <documentation xml:lang="da-DK">Element for at specificere et fakturanummer f.eks. EAN-lokationsnummer.</documentation>
+        </annotation>
+    </element>
+    <complexType name="InvoicingMunicipalityNumberType">
+        <simpleContent>
+            <extension base="ctr:InvoicingMunicipalityNumberValueType">
+                <attribute name="source" type="ctr:InvoicingMunicipalityNumberSourceType" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <simpleType name="InvoicingMunicipalityNumberValueType">
+        <restriction base="string">
+            <minLength value="1"/>
+            <maxLength value="50"/>
+        </restriction>
+    </simpleType>
+
+    <simpleType name="InvoicingMunicipalityNumberSourceType">
+        <union memberTypes="ctr:InvoicingMunicipalityNumberPredefinedSourceType ctr:UndefinedSourceType"/>
+    </simpleType>
+
+    <simpleType name="InvoicingMunicipalityNumberPredefinedSourceType">
+        <restriction base="ctr:UndefinedSourceType">
+            <enumeration value="EAN-Lokationsnummer"/>
+        </restriction>
+    </simpleType>
+</schema>
diff --git a/src/schemas/2022/12/01/HealthAllowance.xsd → ...schemas/2022/12/01/MunicipalAllowance.xsd b/src/schemas/2022/12/01/HealthAllowance.xsd → ...schemas/2022/12/01/MunicipalAllowance.xsd
@@ -9,19 +9,23 @@
 	<include schemaLocation="OrganisationIdentifier.xsd"/>
 	<include schemaLocation="OrganisationName.xsd"/>
 	<include schemaLocation="Percentage.xsd"/>
+	<include schemaLocation="MunicipalAllowanceType.xsd"/>
+	<include schemaLocation="InvoicingMunicipalityNumber.xsd"/>
 
-	<element name="HealthAllowance" type="ctr:HealthAllowanceType">
+	<element name="MunicipalAllowance" type="ctr:MunicipalAllowanceType">
 		<annotation>
-			<documentation xml:lang="en-GB">Information about a HealthAllowance</documentation>
-			<documentation xml:lang="da-DK">Information om et kommunalt helbredstillæg</documentation>
+			<documentation xml:lang="en-GB">Information about a municipal allowance</documentation>
+			<documentation xml:lang="da-DK">Information om et kommunalt tillæg</documentation>
 		</annotation>
 	</element>
-	<complexType name="HealthAllowanceType">
+	<complexType name="MunicipalAllowanceType">
 		<sequence>
             <element name="ValidFromDate" type="ctr:ValidFromDateType"/>
             <element name="ValidToDate" type="ctr:ValidToDateType" minOccurs="0"/>
+			<element name="Type" type="ctr:MunicipalAllowanceTypeType"/>
             <element name="MunicipalityNumber" type="ctr:OrganisationIdentifierType"/>
             <element name="MunicipalityName" type="ctr:OrganisationNameType" minOccurs="0"/>
+			<element name="InvoicingMunicipalityNumber" type="ctr:InvoicingMunicipalityNumberType" minOccurs="0"/>
             <element name="Rate" type="ctr:PercentageType" minOccurs="0"/>
 		</sequence>
 	</complexType>

diff --git a/src/schemas/2022/12/01/MunicipalAllowanceType.xsd b/src/schemas/2022/12/01/MunicipalAllowanceType.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ctr="http://lmst.dk/ctr/xml.schema/2022/12/01"
+        targetNamespace="http://lmst.dk/ctr/xml.schema/2022/12/01"
+        elementFormDefault="qualified">
+
+    <element name="MunicipalAllowanceType" type="ctr:MunicipalAllowanceTypeType">
+        <annotation>
+            <documentation xml:lang="en-GB">Municipal Allowance type</documentation>
+            <documentation xml:lang="da-DK">Kommunalttillægstype</documentation>
+        </annotation>
+    </element>
+
+    <simpleType name="MunicipalAllowanceTypeType">
+        <union memberTypes="ctr:PredefinedMunicipalAllowanceTypeType ctr:UndefinedMunicipalAllowanceTypeType"/>
+    </simpleType>
+    <simpleType name="PredefinedMunicipalAllowanceTypeType">
+        <restriction base="ctr:UndefinedMunicipalAllowanceTypeType">
+            <enumeration value="Helbredstillæg">
+                <annotation>
+                    <documentation xml:lang="en-GB">Health allowance</documentation>
+                    <documentation xml:lang="da-DK">Helbredstillæg</documentation>
+                </annotation>
+            </enumeration>
+            <enumeration value="Kontanthjælpsmodtager">
+                <annotation>
+                    <documentation xml:lang="en-GB">Municipal allowance for a welfare recipient</documentation>
+                    <documentation xml:lang="en-GB">Kommunalt tillæg til kontanthjælpsmodtager</documentation>
+                </annotation>
+            </enumeration>
+            <enumeration value="Barn af Kontanthjælpsmodtager">
+                <annotation>
+                    <documentation xml:lang="en-GB">Municipal allowance for a child of a welfare recipient</documentation>
+                    <documentation xml:lang="en-GB">Kommunalt tillæg til barn af kontanthjælpsmodtager</documentation>
+                </annotation>
+            </enumeration>
+        </restriction>
+    </simpleType>
+    <simpleType name="UndefinedMunicipalAllowanceTypeType">
+        <restriction base="string">
+            <minLength value="1"/>
+            <maxLength value="100"/>
+        </restriction>
+    </simpleType>
+</schema>
diff --git a/src/wsdl/Ctr2_v1_0_0.wsdl b/src/wsdl/Ctr2_v1_0_0.wsdl
@@ -37,10 +37,10 @@
             <xs:include schemaLocation="../schemas/2022/12/01/GetReimbursementGrantsResponse.xsd"/>
         </xs:schema>
         <xs:schema targetNamespace="http://lmst.dk/ctr/xml.schema/2022/12/01" elementFormDefault="qualified">
-            <xs:include schemaLocation="../schemas/2022/12/01/GetHealthAllowancesRequest.xsd"/>
+            <xs:include schemaLocation="../schemas/2022/12/01/GetMunicipalAllowancesRequest.xsd"/>
         </xs:schema>
         <xs:schema targetNamespace="http://lmst.dk/ctr/xml.schema/2022/12/01" elementFormDefault="qualified">
-            <xs:include schemaLocation="../schemas/2022/12/01/GetHealthAllowancesResponse.xsd"/>
+            <xs:include schemaLocation="../schemas/2022/12/01/GetMunicipalAllowancesResponse.xsd"/>
         </xs:schema>
         <xs:schema targetNamespace="http://lmst.dk/ctr/xml.schema/2022/12/01" elementFormDefault="qualified">
             <xs:include schemaLocation="../schemas/2022/12/01/GetDefermentsRequest.xsd"/>
@@ -180,11 +180,11 @@
     <wsdl:message name="UpdateReimbursementGrantResponse">
         <wsdl:part name="UpdateReimbursementGrantResponse" element="ctr100:UpdateReimbursementGrantResponse"/>
     </wsdl:message>
-    <wsdl:message name="GetHealthAllowancesRequest">
-        <wsdl:part name="GetHealthAllowancesRequest" element="ctr100:GetHealthAllowancesRequest"/>
+    <wsdl:message name="GetMunicipalAllowancesRequest">
+        <wsdl:part name="GetMunicipalAllowancesRequest" element="ctr100:GetMunicipalAllowancesRequest"/>
     </wsdl:message>
-    <wsdl:message name="GetHealthAllowancesResponse">
-        <wsdl:part name="GetHealthAllowancesResponse" element="ctr100:GetHealthAllowancesResponse"/>
+    <wsdl:message name="GetMunicipalAllowancesResponse">
+        <wsdl:part name="GetMunicipalAllowancesResponse" element="ctr100:GetMunicipalAllowancesResponse"/>
     </wsdl:message>
     <wsdl:message name="GetDefermentsRequest">
         <wsdl:part name="GetDefermentsRequest" element="ctr100:GetDefermentsRequest"/>
@@ -308,12 +308,12 @@
                          message="tns:UpdateReimbursementGrantResponse"/>
             <wsdl:fault name='CTRFault' message='tns:CTRFault'/>
         </wsdl:operation>
-        <wsdl:operation name="GetHealthAllowances">
-            <soap:operation soapAction="http://lmst.dk/ctr/xml.schema/2022/12/01#GetHealthAllowances" style="document"/>
-            <wsdl:input name="GetHealthAllowancesRequest"
-                        message="tns:GetHealthAllowancesRequest"/>
-            <wsdl:output name="GetHealthAllowancesResponse"
-                         message="tns:GetHealthAllowancesResponse"/>
+        <wsdl:operation name="GetMunicipalAllowances">
+            <soap:operation soapAction="http://lmst.dk/ctr/xml.schema/2022/12/01#GetMunicipalAllowances" style="document"/>
+            <wsdl:input name="GetMunicipalAllowancesRequest"
+                        message="tns:GetMunicipalAllowancesRequest"/>
+            <wsdl:output name="GetMunicipalAllowancesResponse"
+                         message="tns:GetMunicipalAllowancesResponse"/>
             <wsdl:fault name='CTRFault' message='tns:CTRFault'/>
         </wsdl:operation>
         <wsdl:operation name="GetDeferments">
@@ -505,16 +505,16 @@
             </wsdl:fault>
         </wsdl:operation>
 
-        <wsdl:operation name="GetHealthAllowances">
-            <soap:operation soapAction="http://lmst.dk/ctr/xml.schema/2022/12/01#GetHealthAllowances"
+        <wsdl:operation name="GetMunicipalAllowances">
+            <soap:operation soapAction="http://lmst.dk/ctr/xml.schema/2022/12/01#GetMunicipalAllowances"
                             style="document"/>
-            <wsdl:input name="GetHealthAllowancesRequest">
+            <wsdl:input name="GetMunicipalAllowancesRequest">
                 <soap:header use='literal' part='SecurityHeader' message='tns:SecurityHeader' />
                 <soap:header use='literal' part='MedcomHeader' message='tns:MedComHeader' />
                 <soap:header use='literal' part='RequestHeader' message='tns:RequestHeader' />
                 <soap:body use="literal"/>
             </wsdl:input>
-            <wsdl:output name="GetHealthAllowancesResponse">
+            <wsdl:output name="GetMunicipalAllowancesResponse">
                 <soap:header use='literal' part='CTRResponseHeader' message='tns:CTRResponseHeader'/>
                 <soap:body use="literal"/>
             </wsdl:output>