Merge pull request #265 from rsunbury/Allow-non-strings-tobe-nillable

Allow non strings tobe nillable
loopbackio · Feb 25, 2020 · d03d717 · d03d717
2 parents 0bdb991 + 44a0de2
commit d03d717
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/parser/xmlHandler.js b/src/parser/xmlHandler.js
@@ -878,7 +878,7 @@ function toXmlDateTime(date) {
 }
 
 function toXmlDateOrTime(descriptor, val) {
-  if (!descriptor || !descriptor.type) return val;
+  if (!descriptor || !descriptor.type || val === null) return val;
   if (descriptor.type.name === 'date') {
     val = toXmlDate(val);
   } else if (descriptor.type.name === 'time') {

diff --git a/test/request-response-samples/Dummy__should_parse_nil/common.xsd b/test/request-response-samples/Dummy__should_parse_nil/common.xsd
@@ -22,7 +22,8 @@
         <xs:sequence>
             <xs:element name="DummyIntFilter" type="xs:string" minOccurs="0"/>
             <xs:element name="DummyStringFilter" type="xs:string" nillable="true" minOccurs="0"/>
-        </xs:sequence>
+			<xs:element name="DummyDateFilter" type="xs:date" nillable="true" minOccurs="0"/>
+		</xs:sequence>
     </xs:complexType>
 </xs:schema>
 
diff --git a/test/request-response-samples/Dummy__should_parse_nil/request.json b/test/request-response-samples/Dummy__should_parse_nil/request.json
@@ -2,7 +2,8 @@
   "DummyRequest": {
       "DummyField1": "Humpty",
       "DummyFilter": {
-        "DummyStringFilter": null
+        "DummyStringFilter": null,
+        "DummyDateFilter": null
       }
   }
 }
diff --git a/test/request-response-samples/Dummy__should_parse_nil/request.xml b/test/request-response-samples/Dummy__should_parse_nil/request.xml
@@ -6,6 +6,7 @@
             <ns1:DummyField1>Humpty</ns1:DummyField1>
             <ns1:DummyFilter>
                  <ns2:DummyStringFilter xmlns:ns2="http://www.Dummy.com/Common/Types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>
+                 <ns2:DummyDateFilter xmlns:ns2="http://www.Dummy.com/Common/Types" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>
             </ns1:DummyFilter>
         </ns1:DummyRequest>
 </soap:Body>