Merge pull request #4 from msomhorst/master

XSD update and SearchBuilder extention
devbolcom · Nov 20, 2015 · d45dcbf · d45dcbf
2 parents af5a64e + 17b9802
commit d45dcbf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/...cts/client/src/integrationTest/groovy/com/bol/openapi/OpenApiClientIntegrationSpec.groovy b/...cts/client/src/integrationTest/groovy/com/bol/openapi/OpenApiClientIntegrationSpec.groovy
@@ -101,6 +101,33 @@ class OpenApiClientIntegrationSpec extends Specification {
         product.offerData.offers.size() >= 1
     }
 
+    def 'Return products and categories'() {
+        def results = OpenApiClient.withDefaultClient(apiKey).searchBuilder()
+                .term('harry potter')
+                .dataType(QueryDataType.DataType.PRODUCTS)
+                .dataType(QueryDataType.DataType.CATEGORIES)
+                .search()
+
+        expect:
+        results.totalResultSize >= 1
+        results.products.size() > 0
+        results.categories.size() > 0
+        results.refinementGroups.size() == 0
+    }
+
+    def 'Return only refinements'() {
+        def results = OpenApiClient.withDefaultClient(apiKey).searchBuilder()
+                .term('harry potter')
+                .dataType(QueryDataType.DataType.REFINEMENTS)
+                .search()
+
+        expect:
+        results.totalResultSize >= 1
+        results.products.size() == 0
+        results.categories.size() == 0
+        results.refinementGroups.size() > 0
+    }
+
     def 'Can find out if the OpenAPI is healthy'() {
         def status = OpenApiClient.withDefaultClient(apiKey).getHealthStatus()
 

diff --git a/subprojects/client/src/main/java/com/bol/openapi/SearchBuilder.java b/subprojects/client/src/main/java/com/bol/openapi/SearchBuilder.java
@@ -55,6 +55,11 @@ public SearchBuilder category(String id) {
         return new SearchBuilder(this);
     }
 
+    public SearchBuilder dataType(QueryDataType.DataType dataType) {
+        dataTypes.add(dataType);
+        return new SearchBuilder(this);
+    }
+
     public SearchBuilder allOffers() {
         offerTypes.add(ALL);
         return new SearchBuilder(this);

diff --git a/subprojects/schema/src/main/xsd/openapi-4.0.0.xsd b/subprojects/schema/src/main/xsd/openapi-4.0.0.xsd
@@ -75,6 +75,7 @@
             <xs:element name="ShortDescription" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="LongDescription" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="TrackLists" type="TrackList" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="energyLabelLetter" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="AttributeGroups" type="AttributeGroup" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="EntityGroups" type="EntityGroup" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="Urls" type="Entry" minOccurs="0" maxOccurs="unbounded"/>
@@ -98,6 +99,7 @@
             <xs:element name="Comment" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="Seller" type="Seller" minOccurs="0" maxOccurs="1"/>
             <xs:element name="bestOffer" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="ReleaseDate" type="xs:string" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -131,6 +133,7 @@
             <xs:element name="warrantyConditions" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="repairConditions" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="approvalPercentage" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="registrationDate" type="xs:string" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -265,6 +268,7 @@
         <xs:sequence>
             <xs:element name="Category" minOccurs="0" maxOccurs="1" type="Category"/>
             <xs:element name="RefinementGroups" minOccurs="0" maxOccurs="unbounded" type="RefinementGroup"/>
+            <xs:element name="RetailId" minOccurs="0" maxOccurs="1" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>