Merge pull request #93 from visenze/feature/ctl

[API-8655] Add item_count to CTL set-based response
visenze · Sep 28, 2022 · fe0b111 · fe0b111
2 parents 278e621 + 780e278
commit fe0b111
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,11 +13,7 @@ pipeline {
   agent {
     label "${params.AGENT_LABEL ?: 'build'}"
   }
-
-  environment {
-    ANDROID_HOME = tool(name: 'android-sdk-tools', type: 'com.cloudbees.jenkins.plugins.customtools.CustomTool')
-  }
-
+
   parameters {
     string(name: 'AGENT_LABEL', defaultValue: 'build')
     booleanParam(name: 'BINTRAY_PUBLISH', defaultValue: false)

diff --git a/doc/ProductSearch.md b/doc/ProductSearch.md
@@ -6,7 +6,7 @@ With the release of ViSenze's Catalog system, ViSearch Android SDK will now incl
 - Aggregate search results on a product level instead of image level
 - Consistent data type in API response with Catalog’s schema
 
-> Current stable version: 2.2.3
+> Current stable version: 2.2.4
 
 > Minimum Android SDK Version: API 9, Android 2.3
 
@@ -64,7 +64,7 @@ allprojects {
 include the dependency in your project using gradle:
 ```gradle
 implementation 'com.github.visenze:visenze-tracking-android:0.2.1'
-implementation 'com.github.visenze:visearch-sdk-android:2.2.3'
+implementation 'com.github.visenze:visearch-sdk-android:2.2.4'
 ```
 
 ### 1.3 Add User Permissions

diff --git a/doc/ViSearch.md b/doc/ViSearch.md
@@ -4,7 +4,7 @@ ViSearch is an API that provides accurate, reliable and scalable image search. V
 
 The ViSearch Android SDK is an open source software to provide easy integration of ViSearch Search API with your Android mobile applications. It provides three search methods based on the ViSearch Search API - pre-indexed search, color search and upload search. For source code and references, please visit the [Github Repository](https://github.com/visenze/visearch-sdk-android).
 
->Current stable version: 2.2.3
+>Current stable version: 2.2.4
 
 >Minimum Android SDK Version: API 9, Android 2.3
 
@@ -80,7 +80,7 @@ allprojects {
 include the dependency in your project using gradle:
 ```gradle
 implementation 'com.github.visenze:visenze-tracking-android:0.2.1'
-implementation 'com.github.visenze:visearch-sdk-android:2.2.3'
+implementation 'com.github.visenze:visearch-sdk-android:2.2.4'
 ```
 
 ### 1.3 Add User Permissions

diff --git a/visearch-android/build.gradle b/visearch-android/build.gradle
@@ -5,8 +5,8 @@ plugins {
 
 def versionMajor = 2
 def versionMinor = 2
-def versionPatch = 3
-version = '2.2.3'
+def versionPatch = 4
+version = '2.2.4'
 
 android {
     compileSdkVersion 29

diff --git a/visearch-android/src/main/java/com/visenze/visearch/android/model/SetInfo.java b/visearch-android/src/main/java/com/visenze/visearch/android/model/SetInfo.java
@@ -10,6 +10,9 @@ public class SetInfo {
     @SerializedName("set_score")
     private double setScore;
 
+    @SerializedName("item_count")
+    private int itemCount;
+
     public String getSetId() {
         return setId;
     }
@@ -25,4 +28,12 @@ public double getSetScore() {
     public void setSetScore(double setScore) {
         this.setScore = setScore;
     }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(int itemCount) {
+        this.itemCount = itemCount;
+    }
 }
diff --git a/visearch-android/src/test/java/com/visenze/visearch/android/ProductSearchTest.java b/visearch-android/src/test/java/com/visenze/visearch/android/ProductSearchTest.java
@@ -639,11 +639,13 @@ public void testCtlSetBasedResponse() {
                         "\"set_info\": [\n" +
                         "    {\n" +
                         "      \"set_id\": \"set1\",\n" +
-                        "      \"set_score\": 1000\n" +
+                        "      \"set_score\": 1000,\n" +
+                        "      \"item_count\": 5\n" +
                         "    },\n" +
                         "    {\n" +
                         "      \"set_id\": \"set2\",\n" +
-                        "      \"set_score\": 900\n" +
+                        "      \"set_score\": 900,\n" +
+                        "      \"item_count\": 2\n" +
                         "    }\n" +
                         "  ]," +
                         "    \"strategy\": {\n" +
@@ -676,9 +678,11 @@ public void onSearchResult(ProductResponse response, ErrorData error) {
 
                 assertEquals("set1", setInfoList.get(0).getSetId());
                 assertTrue(1000 == setInfoList.get(0).getSetScore());
+                assertTrue(5 == setInfoList.get(0).getItemCount());
 
                 assertEquals("set2", setInfoList.get(1).getSetId());
                 assertTrue(900 == setInfoList.get(1).getSetScore());
+                assertTrue(2 == setInfoList.get(1).getItemCount());
 
             }
         });