From 038e086825c8e68c9d75a00c1fcd1df4920eb8c9 Mon Sep 17 00:00:00 2001
From: Jens Stalder <jens.stalder@casasoft.ch>
Date: Fri, 9 Oct 2020 18:33:25 +0200
Subject: [PATCH 1/5] Initial

---
 examples/full.xml |  4 ++++
 schema/schema.xsd | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/examples/full.xml b/examples/full.xml
index 33616bc..402395d 100644
--- a/examples/full.xml
+++ b/examples/full.xml
@@ -242,6 +242,10 @@
         <buy referring="all">
           <price>850000</price>
           <extra>25000</extra>
+          <priceRange>
+            <min>750000</min>
+            <max>950000</max>
+          </priceRange>
           <wirPercentage>5</wirPercentage>
         </buy>
         <auction start="2012-12-13T12:12:12" expiration="2012-12-13T12:12:13">745</auction>
diff --git a/schema/schema.xsd b/schema/schema.xsd
index 80695a3..5c35f6e 100644
--- a/schema/schema.xsd
+++ b/schema/schema.xsd
@@ -713,6 +713,19 @@
           <xs:all>
             <xs:element minOccurs="1" maxOccurs="1" name="price" type="xs:positiveInteger" />
             <xs:element minOccurs="0" maxOccurs="1" name="extra" type="xs:positiveInteger" />
+            <xs:element name="priceRange" minOccurs="0" maxOccurs="1">
+              <xs:annotation>
+                <xs:documentation>Optional price range to describe a more flexible pricing model for purchase</xs:documentation>
+              </xs:annotation>
+              <xs:complexType>
+                <xs:all>
+                  <xs:element minOccurs="1" maxOccurs="1" name="min" type="xs:positiveInteger" />
+                  <xs:element minOccurs="1" maxOccurs="1" name="max" type="xs:positiveInteger" />
+                </xs:all>
+              </xs:complexType>
+            </xs:element>
+            <xs:element minOccurs="0" maxOccurs="1" name="priceFrom" type="xs:positiveInteger" />
+            <xs:element minOccurs="0" maxOccurs="1" name="priceTo" type="xs:positiveInteger" />
             <xs:element name="wirPercentage" type="percent" minOccurs="0" maxOccurs="1">
               <xs:annotation>
                 <xs:documentation>The percententage of the gross price which has to paid in WIR Franc electronic currency.</xs:documentation>

From 4b7b01c0fb03c623d785e3f2ea6ac927651e32ff Mon Sep 17 00:00:00 2001
From: Jens Stalder <jens.stalder@casasoft.ch>
Date: Fri, 9 Oct 2020 18:54:59 +0200
Subject: [PATCH 2/5] Assert and test

---
 schema/schema.xsd                             |  3 +--
 .../should-fail/price-range-min-gt-max.xml    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 scripts/tests/should-fail/price-range-min-gt-max.xml

diff --git a/schema/schema.xsd b/schema/schema.xsd
index 5c35f6e..3f66bfd 100644
--- a/schema/schema.xsd
+++ b/schema/schema.xsd
@@ -721,11 +721,10 @@
                 <xs:all>
                   <xs:element minOccurs="1" maxOccurs="1" name="min" type="xs:positiveInteger" />
                   <xs:element minOccurs="1" maxOccurs="1" name="max" type="xs:positiveInteger" />
+                  <xs:assert test="min le max"/>
                 </xs:all>
               </xs:complexType>
             </xs:element>
-            <xs:element minOccurs="0" maxOccurs="1" name="priceFrom" type="xs:positiveInteger" />
-            <xs:element minOccurs="0" maxOccurs="1" name="priceTo" type="xs:positiveInteger" />
             <xs:element name="wirPercentage" type="percent" minOccurs="0" maxOccurs="1">
               <xs:annotation>
                 <xs:documentation>The percententage of the gross price which has to paid in WIR Franc electronic currency.</xs:documentation>
diff --git a/scripts/tests/should-fail/price-range-min-gt-max.xml b/scripts/tests/should-fail/price-range-min-gt-max.xml
new file mode 100644
index 0000000..4c4616f
--- /dev/null
+++ b/scripts/tests/should-fail/price-range-min-gt-max.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://swissrets.ch/dist/v2.0.0/schema.xsd">
+  <properties>
+    <property id="1245687">
+      <referenceId>LA-644238</referenceId>
+      <type>rent</type>
+      <address>
+        <countryCode>CH</countryCode>
+        <locality>Kirchlindach</locality>
+        <postalCode>3038</postalCode>
+      </address>
+      <prices>
+        <buy referring="all">
+          <price>850000</price>
+          <extra>25000</extra>
+          <priceRange>
+            <min>1050000</min>
+            <max>550000</max>
+          </priceRange>
+          <wirPercentage>5</wirPercentage>
+        </buy>
+      </prices>
+    </property>
+  </properties>
+</export>

From 80dd16410cff8d5701df073ac956e6a0e8788d7f Mon Sep 17 00:00:00 2001
From: Jens Stalder <jens.stalder@casasoft.ch>
Date: Fri, 9 Oct 2020 19:03:30 +0200
Subject: [PATCH 3/5] assert in the right place

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

diff --git a/schema/schema.xsd b/schema/schema.xsd
index 3f66bfd..97dc375 100644
--- a/schema/schema.xsd
+++ b/schema/schema.xsd
@@ -721,8 +721,8 @@
                 <xs:all>
                   <xs:element minOccurs="1" maxOccurs="1" name="min" type="xs:positiveInteger" />
                   <xs:element minOccurs="1" maxOccurs="1" name="max" type="xs:positiveInteger" />
-                  <xs:assert test="min le max"/>
                 </xs:all>
+                <xs:assert test="min le max"/>
               </xs:complexType>
             </xs:element>
             <xs:element name="wirPercentage" type="percent" minOccurs="0" maxOccurs="1">

From e3ab499bc146d0b9548b434f26eabb89a45390ed Mon Sep 17 00:00:00 2001
From: Jens Stalder <jens.stalder@casasoft.ch>
Date: Fri, 9 Oct 2020 19:50:44 +0200
Subject: [PATCH 4/5] Back to 1.0 for now sadface

---
 schema/schema.xsd | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/schema/schema.xsd b/schema/schema.xsd
index 97dc375..896a56b 100644
--- a/schema/schema.xsd
+++ b/schema/schema.xsd
@@ -718,11 +718,10 @@
                 <xs:documentation>Optional price range to describe a more flexible pricing model for purchase</xs:documentation>
               </xs:annotation>
               <xs:complexType>
-                <xs:all>
+                <xs:sequence>
                   <xs:element minOccurs="1" maxOccurs="1" name="min" type="xs:positiveInteger" />
                   <xs:element minOccurs="1" maxOccurs="1" name="max" type="xs:positiveInteger" />
-                </xs:all>
-                <xs:assert test="min le max"/>
+                </xs:sequence>
               </xs:complexType>
             </xs:element>
             <xs:element name="wirPercentage" type="percent" minOccurs="0" maxOccurs="1">

From a7c5c2659930891d6df539133fe5362a11f20a84 Mon Sep 17 00:00:00 2001
From: Jens Stalder <jens.stalder@casasoft.ch>
Date: Fri, 9 Oct 2020 19:52:56 +0200
Subject: [PATCH 5/5] remove test since it wont work

---
 .../should-fail/price-range-min-gt-max.xml    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 scripts/tests/should-fail/price-range-min-gt-max.xml

diff --git a/scripts/tests/should-fail/price-range-min-gt-max.xml b/scripts/tests/should-fail/price-range-min-gt-max.xml
deleted file mode 100644
index 4c4616f..0000000
--- a/scripts/tests/should-fail/price-range-min-gt-max.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://swissrets.ch/dist/v2.0.0/schema.xsd">
-  <properties>
-    <property id="1245687">
-      <referenceId>LA-644238</referenceId>
-      <type>rent</type>
-      <address>
-        <countryCode>CH</countryCode>
-        <locality>Kirchlindach</locality>
-        <postalCode>3038</postalCode>
-      </address>
-      <prices>
-        <buy referring="all">
-          <price>850000</price>
-          <extra>25000</extra>
-          <priceRange>
-            <min>1050000</min>
-            <max>550000</max>
-          </priceRange>
-          <wirPercentage>5</wirPercentage>
-        </buy>
-      </prices>
-    </property>
-  </properties>
-</export>