Merge pull request #520 from squanchy-dev/move_search_logic_to_service

Move search logic to service

Author: rock3r

app/src/main/java/net/squanchy/search/SearchActivity.kt

@@ -74,7 +74,7 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
 
         val searchSubscription = querySubject.throttleLast(QUERY_DEBOUNCE_TIMEOUT, TimeUnit.MILLISECONDS)
             .doOnNext(::updateSearchActionIcon)
-            .startWith(EMPTY_QUERY)
+            .startWith(getInitialQuery())
             .flatMap(searchService::find)
             .distinctUntilChanged()
             .subscribeOn(Schedulers.io())
@@ -93,6 +93,11 @@ class SearchActivity : AppCompatActivity(), SearchRecyclerView.OnSearchResultCli
         searchField.requestFocus()
     }
 
+    private fun getInitialQuery(): String {
+        val text = searchField.text
+        return text?.toString() ?: EMPTY_QUERY
+    }
+
     private fun updateSearchActionIcon(query: String) {
         hasQuery = query.isNotEmpty()
         invalidateOptionsMenu()

app/src/main/java/net/squanchy/search/SearchResult.kt

@@ -5,17 +5,25 @@ import net.squanchy.speaker.domain.view.Speaker
 
 sealed class SearchResult {
 
-    data class Success(val events: List<Event>, val speakers: List<Speaker>) : SearchResult() {
+    data class Success(val elements: List<SearchListElement>) : SearchResult() {
         val isEmpty: Boolean
-            get() = events.isEmpty() && speakers.isEmpty()
+            get() = elements.isEmpty()
     }
 
     object Error : SearchResult()
 
     companion object {
 
-        private val emptySearch = SearchResult.Success(emptyList(), emptyList())
+        private val emptySearch = SearchResult.Success(emptyList())
 
         fun empty(): SearchResult = emptySearch
     }
 }
+
+sealed class SearchListElement {
+    object EventHeader : SearchListElement()
+    data class EventElement(val event: Event) : SearchListElement()
+    object SpeakerHeader : SearchListElement()
+    data class SpeakerElement(val speaker: Speaker) : SearchListElement()
+    object AlgoliaLogo : SearchListElement()
+}

app/src/main/java/net/squanchy/search/SearchService.kt

@@ -8,6 +8,11 @@ import net.squanchy.search.algolia.model.AlgoliaSearchResult
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.ErrorSearching
 import net.squanchy.search.algolia.model.AlgoliaSearchResult.Matches
+import net.squanchy.search.SearchListElement.SpeakerHeader
+import net.squanchy.search.SearchListElement.EventHeader
+import net.squanchy.search.SearchListElement.SpeakerElement
+import net.squanchy.search.SearchListElement.AlgoliaLogo
+import net.squanchy.search.SearchListElement.EventElement
 import net.squanchy.service.repository.AuthService
 import net.squanchy.service.repository.EventRepository
 import net.squanchy.service.repository.SpeakerRepository
@@ -34,16 +39,41 @@ class SearchService(
     private fun combineWithSearchResult(): Function3<List<Event>, List<Speaker>, AlgoliaSearchResult, SearchResult> {
         return Function3 { events, speakers, result ->
             when (result) {
-                is QueryNotLongEnough -> SearchResult.Success(emptyList(), speakers)
+                is QueryNotLongEnough -> SearchResult.Success(createResultForQueryNotLongEnough(speakers))
                 is ErrorSearching -> SearchResult.Error
-                is Matches -> SearchResult.Success(
-                    events.filter { result.eventIds.contains(it.id) },
-                    speakers.filter { result.speakerIds.contains(it.id) }
-                )
+                is Matches -> {
+                    val filteredEvents = events.filter { result.eventIds.contains(it.id) }
+                    val filteredSpeakers = speakers.filter { result.speakerIds.contains(it.id) }
+                    SearchResult.Success(createResultForSuccessfulSearch(filteredEvents, filteredSpeakers))
+                }
             }
         }
     }
 
+    private fun createResultForQueryNotLongEnough(speakers: List<Speaker>): List<SearchListElement> {
+        return listOf(SpeakerHeader) + speakers.map(::SpeakerElement)
+    }
+
+    private fun createResultForSuccessfulSearch(events: List<Event>, speakers: List<Speaker>): List<SearchListElement> {
+        if (speakers.isEmpty() && events.isEmpty()) {
+            return emptyList()
+        }
+
+        return ArrayList<SearchListElement>(events.size + speakers.size).apply {
+            if (events.isNotEmpty()) {
+                add(EventHeader)
+                addAll(events.map(::EventElement))
+            }
+
+            if (speakers.isNotEmpty()) {
+                add(SpeakerHeader)
+                addAll(speakers.map(::SpeakerElement))
+            }
+
+            add(AlgoliaLogo)
+        }
+    }
+
     fun speakers(): Observable<List<Speaker>> {
         return speakerRepository.speakers()
             .map { it.sortedBy(Speaker::name) }

app/src/main/java/net/squanchy/search/view/AlgoliaLogoViewHolder.kt

@@ -1,25 +1,25 @@
 package net.squanchy.search.view
 
 import android.support.v7.widget.GridLayoutManager
-import net.squanchy.search.view.SearchAdapter.Companion.ViewTypeId
+import net.squanchy.search.SearchListElement
 
-internal class GridSpanSizeLookup(private val itemsAdapter: ItemsAdapter, private val columnCount: Int) : GridLayoutManager.SpanSizeLookup() {
+internal class GridSpanSizeLookup(private val items: List<SearchListElement>, private val columnCount: Int) : GridLayoutManager.SpanSizeLookup() {
 
     init {
         super.setSpanIndexCacheEnabled(true)
     }
 
     override fun getSpanSize(position: Int): Int {
-        return if (itemsAdapter.isEmpty) SINGLE_COLUMN_SPAN_SIZE else getSpanSizeFor(itemsAdapter.viewTypeAtAbsolutePosition(position))
+        return if (items.isEmpty()) SINGLE_COLUMN_SPAN_SIZE else getSpanSizeFor(items[position])
     }
 
-    private fun getSpanSizeFor(@ViewTypeId viewTypeId: Int): Int =
-        when (viewTypeId) {
-            SearchAdapter.HEADER -> columnCount
-            SearchAdapter.EVENT -> columnCount
-            SearchAdapter.SPEAKER -> SINGLE_COLUMN_SPAN_SIZE
-            SearchAdapter.ALGOLIA_LOGO -> columnCount
-            else -> error("Invalid ViewTypeId $viewTypeId")
+    private fun getSpanSizeFor(element: SearchListElement): Int =
+        when (element) {
+            is SearchListElement.EventHeader -> columnCount
+            is SearchListElement.SpeakerHeader -> columnCount
+            is SearchListElement.EventElement -> columnCount
+            is SearchListElement.SpeakerElement -> SINGLE_COLUMN_SPAN_SIZE
+            is SearchListElement.AlgoliaLogo -> columnCount
         }
 
     companion object {