Implement search for galleries

Author: Pawel Szymanski

api/src/main/java/com/creatubbles/api/repository/GalleryRepository.java

@@ -19,6 +19,8 @@ public interface GalleryRepository {
 
     void getPublic(@Nullable Integer page, @Nullable GallerySortMode sort, @Nullable ResponseCallback<CreatubblesResponse<List<Gallery>>> callback);
 
+    void searchPublic(@NonNull String query, @Nullable Integer page, @Nullable GallerySortMode sort, @Nullable ResponseCallback<CreatubblesResponse<List<Gallery>>> callback);
+
     /**
      * Get current user’s favorite galleries.
      */

api/src/main/java/com/creatubbles/api/repository/GalleryRepositoryImpl.java

@@ -36,7 +36,14 @@ class GalleryRepositoryImpl implements GalleryRepository {
     public void getPublic(@Nullable Integer page, @Nullable GallerySortMode sort,
                           ResponseCallback<CreatubblesResponse<List<Gallery>>> callback) {
         String sortParam = sort != null ? sort.toString() : null;
-        Call<JSONAPIDocument<List<Gallery>>> call = galleryService.getPublic(page, sortParam);
+        Call<JSONAPIDocument<List<Gallery>>> call = galleryService.getPublic(null, page, sortParam);
+        call.enqueue(new JsonApiResponseMapper<>(objectMapper, callback));
+    }
+
+    @Override
+    public void searchPublic(@NonNull String query, @Nullable Integer page, @Nullable GallerySortMode sort, @Nullable ResponseCallback<CreatubblesResponse<List<Gallery>>> callback) {
+        String sortParam = sort != null ? sort.toString() : null;
+        Call<JSONAPIDocument<List<Gallery>>> call = galleryService.getPublic(query, page, sortParam);
         call.enqueue(new JsonApiResponseMapper<>(objectMapper, callback));
     }
 

api/src/main/java/com/creatubbles/api/service/GalleryService.java

@@ -26,12 +26,13 @@ public interface GalleryService {
     String PARAM_PAGE = "page";
     String PARAM_SORT = "sort";
     String PARAM_FILTER = "filter";
+    String PARAM_QUERY = "query";
 
     @GET(EndPoints.GALLERIES)
-    Call<JSONAPIDocument<List<Gallery>>> getPublic(@Query(PARAM_PAGE) Integer page,
+    Call<JSONAPIDocument<List<Gallery>>> getPublic(@Query(PARAM_QUERY) String query,
+                                                   @Query(PARAM_PAGE) Integer page,
                                                    @Query(PARAM_SORT) String sort);
 
-
     @GET(EndPoints.USERS + PATH_ID_GALLERIES)
     Call<JSONAPIDocument<List<Gallery>>> getByUser(@Path(PARAM_ID) String userId,
                                                    @Query(PARAM_PAGE) Integer page,

api/src/test/groovy/com/creatubbles/api/repository/GalleryRepositoryTest.groovy

@@ -20,7 +20,14 @@ class GalleryRepositoryTest extends Specification {
         when:
         repository.getPublic(anyPage(), anySortMode(), anyCallback());
         then:
-        service.getPublic(_, _) >> anyCall()
+        service.getPublic(_, _, _) >> anyCall()
+    }
+
+    def "should call get public when searching in public galleries"() {
+        when:
+        repository.searchPublic(anyQuery(), anyPage(), anySortMode(), anyCallback());
+        then:
+        service.getPublic(_, _, _) >> anyCall()
     }
 
     def "should cal get favorite when obtaining favorite galleries"() {
@@ -113,4 +120,8 @@ class GalleryRepositoryTest extends Specification {
     private anyCall() {
         Mock(Call)
     }
+
+    private String anyQuery() {
+        ""
+    }
 }

app/src/main/java/com/creatubbles/app/view/MainActivity.java

@@ -117,7 +117,8 @@ public class MainActivity extends AppCompatActivity {
             R.id.get_user_details_btn, R.id.get_avatar_suggestion, R.id.get_notifications_btn,
             R.id.update_last_viewed_time_btn, R.id.get_toyboo_details_btn, R.id.find_partner_applications,
             R.id.get_partner_app_by_id, R.id.get_content_btn, R.id.get_recent_content_btn, R.id.get_followed_content_btn,
-            R.id.get_trending_content_btn, R.id.get_connected_content_btn, R.id.get_schools_btn, R.id.search_user_connections_btn})
+            R.id.get_trending_content_btn, R.id.get_connected_content_btn, R.id.get_schools_btn, R.id.search_user_connections_btn,
+            R.id.search_galleries_btn})
     List<Button> actionButtons;
 
     @Bind(R.id.send_file_btn)
@@ -690,6 +691,28 @@ public void onError(String message) {
         });
     }
 
+    public void onSearchGalleriesClicked(View view) {
+        GalleryRepository galleryRepository = new GalleryRepositoryBuilder(accessToken)
+                .build();
+
+        galleryRepository.searchPublic("test", null, null, new ResponseCallback<CreatubblesResponse<List<Gallery>>>() {
+            @Override
+            public void onSuccess(CreatubblesResponse<List<Gallery>> response) {
+                Toast.makeText(MainActivity.this, "Galleries total count: " + response.getMeta().getTotalCount(),
+                        Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onServerError(ErrorResponse errorResponse) {
+                displayError(errorResponse);
+            }
+
+            @Override
+            public void onError(String message) {
+            }
+        });
+    }
+
     public void onGetAllLandingUrlsClicked(View view) {
         LandingUrlsRepository repository = new LandingUrlsRepositoryBuilder(accessToken)
                 .build();

app/src/main/res/layout/content_main.xml

@@ -240,6 +240,13 @@
             android:onClick="onGetGalleriesByIdClicked"
             android:enabled="false"/>
 
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/search_galleries_btn"
+            android:text="Search public galleries"
+            android:onClick="onSearchGalleriesClicked"
+            android:enabled="false" />
 
         <Button
             android:layout_width="wrap_content"