fix albums right join db issue

app/src/main/java/com/biganto/visual/roompark/data/data_provider/AlbumsRepository.kt

@@ -31,6 +31,7 @@ class AlbumsContractModule @Inject constructor(
     override fun getProgressAlbumList(albumId: Int): Observable<List<AlbumPreviewModel>> =
         fetchAlbums(albumId)
 
+
     override fun getAlbumPhoto(photoId: Int): Observable<PhotoModel> {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
@@ -63,7 +64,6 @@ class AlbumsContractModule @Inject constructor(
 
     private val fetchTopLevelAlbumsDb =
         db.getTopLevelAlbums()
-            .toList()
             .toObservable()
             .subscribeOn(Schedulers.io())
 

app/src/main/java/com/biganto/visual/roompark/data/repository/db/IDb.kt

@@ -18,7 +18,7 @@ interface IDb {
     fun <T : List<Persistable>> blockingUpsert(entity: T)
     fun userObservableResult(uuid: Int): Observable<ReactiveResult<UserEntity>>
     fun fetchArticles(feedAlias: String, pageSize: Int, startIndex: Int): Observable<ArticleEntity>
-    fun getTopLevelAlbums(): Observable<ImageAlbumEntity>
+    fun getTopLevelAlbums(): Single<MutableList<ImageAlbumEntity>>
     fun getChildAlbums(parentId: Int): Observable<ImageAlbumEntity>
     fun checkIfExistsAlbumJunction(albumId: Int, parentAlbumId: Int): ImageAlbumJunctionEntity?
     fun getFeed(feedAlias: String): ReactiveResult<FeedEntity>

app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/RequeryRepository.kt

@@ -71,9 +71,12 @@ class RequeryRepository @Inject constructor(
                 fetchAll<ArticleEntity>().where(ArticleEntity.ID.eq(id))
                         .get()
 
-        override fun getTopLevelAlbums(): Observable<ImageAlbumEntity> =
+        override fun getTopLevelAlbums(): Single<MutableList<ImageAlbumEntity>> =
                 fetchAll<ImageAlbumEntity>()
-                        .get().observable()
+                        .join(ImageAlbumJunctionEntity::class)
+                        .on(ImageAlbumJunctionEntity.ALBUM_ID.eq(ImageAlbumEntity.ID))
+                        .where(ImageAlbumJunctionEntity.ALBUM_ID.isNull())
+                        .get().observable().toList()
 
         override fun getChildAlbums(parentId:Int): Observable<ImageAlbumEntity> =
                 store.select(ImageAlbumEntity::class)

app/src/main/java/com/biganto/visual/roompark/presentation/screen/albums/ScreenPresenter.kt

@@ -25,9 +25,11 @@ class AlbumsScreenPresenter @Inject constructor(
     override fun bindIntents() {
 
         val fetchParents = interactor.fetchHeaderAlbums()
+            .filter { !it.isNullOrEmpty() }
             .map { AlbumsScreenViewState.AlbumsListLoaded(it,selectedIndex) }
 
         val fetchSelected = interactor.fetchAlbumPhotos(selectedIndex)
+            .filter { !it.isNullOrEmpty() }
             .map { AlbumsScreenViewState.AlbumsSelected(it)}