Merge pull request #98 from shockbytes/improve-search

Search for author and subTitle in search view too
shockbytes · Sep 29, 2020 · 67707ae · 67707ae
2 parents ad4a584 + 38f86a1
commit 67707ae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/app/src/main/java/at/shockbytes/dante/ui/viewmodel/SearchViewModel.kt b/app/src/main/java/at/shockbytes/dante/ui/viewmodel/SearchViewModel.kt
@@ -22,6 +22,7 @@ class SearchViewModel @Inject constructor(
     }
 
     private val searchState = MutableLiveData<SearchState>()
+    fun getSearchState(): LiveData<SearchState> = searchState
 
     private val bookDownloadSubject = PublishSubject.create<BookSearchItem>()
 
@@ -35,25 +36,25 @@ class SearchViewModel @Inject constructor(
         searchState.postValue(SearchState.InitialState)
     }
 
-    fun getSearchState(): LiveData<SearchState> = searchState
-
     fun showBooks(query: CharSequence, keepLocal: Boolean) {
 
         if (query.isNotEmpty()) {
 
-            searchState.postValue(SearchState.LoadingState)
-
             resolveSource(query.toString(), keepLocal)
-                    .subscribe({
-                        if (it.isNotEmpty()) {
-                            searchState.postValue(SearchState.SuccessState(it))
+                    .doOnSubscribe {
+                        searchState.postValue(SearchState.LoadingState)
+                    }
+                    .map { bookSearchItems ->
+                        if (bookSearchItems.isNotEmpty()) {
+                            SearchState.SuccessState(bookSearchItems)
                         } else {
-                            searchState.postValue(SearchState.EmptyState)
+                            SearchState.EmptyState
                         }
-                    }, {
-                        Timber.e(it)
-                        searchState.postValue(SearchState.ErrorState(it))
-                    })
+                    }
+                    .doOnError { throwable ->
+                        searchState.postValue(SearchState.ErrorState(throwable))
+                    }
+                    .subscribe(searchState::postValue, Timber::e)
                     .addTo(compositeDisposable)
         }
     }

diff --git a/core/src/main/java/at/shockbytes/dante/core/data/local/RealmBookEntityDao.kt b/core/src/main/java/at/shockbytes/dante/core/data/local/RealmBookEntityDao.kt
@@ -95,6 +95,10 @@ class RealmBookEntityDao(private val realm: RealmInstanceProvider) : BookEntityD
     override fun search(query: String): Observable<List<BookEntity>> {
         return realm.instance.where(bookClass)
                 .contains("title", query, Case.INSENSITIVE)
+                .or()
+                .contains("author", query, Case.INSENSITIVE)
+                .or()
+                .contains("subTitle", query, Case.INSENSITIVE)
                 .findAll()
                 .asFlowable()
                 .map { mapper.mapTo(it) }