Remove duplicates in Search Api fields

francistagbo · web-flow · commit ff4fd2ed2643 · 2022-03-23T23:04:19.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Search.java b/cloudinary-core/src/main/java/com/cloudinary/Search.java
@@ -40,18 +40,28 @@ public Search nextCursor(String value) {
     }
 
     public Search aggregate(String field) {
-        aggregateParam.add(field);
+        if (!aggregateParam.contains(field)) {
+            aggregateParam.add(field);
+        }
         return this;
     }
 
     public Search withField(String field) {
-        withFieldParam.add(field);
+        if (!withFieldParam.contains(field)) {
+            withFieldParam.add(field);
+        }
         return this;
     }
 
     public Search sortBy(String field, String dir) {
         HashMap<String, Object> sortBucket = new HashMap<String, Object>();
         sortBucket.put(field, dir);
+        for (int i = 0; i < sortByParam.size(); i++) {
+            if (sortByParam.get(i).containsKey(field)){
+                sortByParam.add(i, sortBucket);
+                return this;
+            }
+        }
         sortByParam.add(sortBucket);
         return this;
     }
@@ -68,4 +78,4 @@ public ApiResponse execute() throws Exception {
         Map<String, String> options = ObjectUtils.asMap("content_type", "json");
         return this.api.callApi(Api.HttpMethod.POST, Arrays.asList("resources", "search"), this.toQuery(), options);
     }
-}
+}
diff --git a/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java b/cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractSearchTest.java
@@ -1,15 +1,15 @@
 package com.cloudinary.test;
 
 import com.cloudinary.Cloudinary;
+import com.cloudinary.Search;
 import com.cloudinary.utils.ObjectUtils;
 import org.junit.*;
 import org.junit.rules.TestName;
 
-import java.util.List;
-import java.util.Map;
+import java.lang.reflect.Field;
+import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNotNull;
 
 @SuppressWarnings({"rawtypes", "unchecked", "JavaDoc"})
@@ -74,12 +74,46 @@ public void shouldFindResourceByAssetId() throws Exception {
         assertEquals(1, resources.size());
     }
 
+    @Test
+    public void testShouldNotDuplicateValues() throws Exception {
+        Search request = cloudinary.search().maxResults(1).
+                sortBy("created_at", "asc")
+                .sortBy("created_at", "desc")
+                .sortBy("public_id", "asc")
+                .aggregate("format")
+                .aggregate("format")
+                .aggregate("resource_type")
+                .withField("context")
+                .withField("context")
+                .withField("tags");
+        Field[] fields = Search.class.getDeclaredFields();
+        for(Field field : fields) {
+            if(field.getName() == "aggregateParam") {
+                field.setAccessible(true);
+                ArrayList<String> aggregateList = (ArrayList<String>) field.get(request);
+                Set<String> testSet = new HashSet<String>(aggregateList);
+                assertTrue(aggregateList.size() == testSet.size());
+            }
+            if (field.getName() == "withFieldParam") {
+                field.setAccessible(true);
+                ArrayList<String> withFieldList = (ArrayList<String>) field.get(request);
+                Set<String> testSet = new HashSet<String>(withFieldList);
+                assertTrue(withFieldList.size() == testSet.size());
+            }
+            if (field.getName() == "sortByParam") {
+                field.setAccessible(true);
+                ArrayList<HashMap<String, Object>> sortByList = (ArrayList<HashMap<String, Object>>) field.get(request);
+                Set<HashMap<String, Object>> testSet = new HashSet<HashMap<String, Object>>(sortByList);
+                assertTrue(sortByList.size() == testSet.size());
+            }
+        }
+    }
+
     @Test
     public void shouldPaginateResourcesLimitedByTagAndOrderdByAscendingPublicId() throws Exception {
         List<Map> resources;
         Map result = cloudinary.search().maxResults(1).expression(String.format("tags:%s", SEARCH_TAG)).sortBy("public_id", "asc").execute();
         resources = (List<Map>) result.get("resources");
-
         assertEquals(1, resources.size());
         assertEquals(3, result.get("total_count"));
         assertEquals(SEARCH_TEST, resources.get(0).get("public_id"));
