Allow offline filtering #75

davidoskky · 2022-10-08T15:17:54Z

davidoskky commented

2022-10-08 15:17:54 +00:00

Types of changes

I have read the CONTRIBUTING document.
My code follows the code style of this project.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.
This is NOT translation related.

This closes issue #58

Also fixed the database was storing the article title in place of the source title.

## Types of changes - [x] I have read the **CONTRIBUTING** document. - [x] My code follows the code style of this project. - [ ] I have updated the documentation accordingly. - [x] I have added tests to cover my changes. - [x] All new and existing tests passed. - [x] This is **NOT** translation related. This closes issue #58 Also fixed the database was storing the article title in place of the source title.

davidoskky added 3 commits 2022-10-08 15:17:54 +00:00

Correct database source title fe12819163

Filter items from database according to tag and source 1d1c121aab

Add tests for offline filtering

continuous-integration/drone/pr Build is passing

Details

d0a982f385

AmineB requested changes 2022-10-10 18:27:18 +00:00

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt Outdated

						
				@@ -71,6 +71,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap

				                        displayedItems == ItemType.ALL ||

AmineB commented

2022-10-10 18:26:28 +00:00

This should be something like this.

                    val dbItems = getDBItems().filter {
                        displayedItems == ItemType.ALL ||
                                (it.unread && displayedItems == ItemType.UNREAD) ||
                                (it.starred && displayedItems == ItemType.STARRED)
                    }
                    if (tagFilter != null) {
                        dbItems = dbItems.filter {
                            tagFilter == null || it.tags.contains(tagFilter!!.tag)
                        }
                    }
                    if (sourceFilter!= null) {
                        dbItems = dbItems.filter {
                            sourceFilter == null || it.sourcetitle == sourceFilter!!.title
                        }
                    }
                    return dbItems.map { it.toView() }

This should be something like this. ``` val dbItems = getDBItems().filter { displayedItems == ItemType.ALL || (it.unread && displayedItems == ItemType.UNREAD) || (it.starred && displayedItems == ItemType.STARRED) } if (tagFilter != null) { dbItems = dbItems.filter { tagFilter == null || it.tags.contains(tagFilter!!.tag) } } if (sourceFilter!= null) { dbItems = dbItems.filter { sourceFilter == null || it.sourcetitle == sourceFilter!!.title } } return dbItems.map { it.toView() } ```

davidoskky added 1 commit 2022-10-10 22:52:16 +00:00

Rearrange filtering steps

continuous-integration/drone/pr Build is passing

Details

02098a7aa9

davidoskky requested review from AmineB 2022-10-12 22:09:41 +00:00

AmineB requested changes 2022-10-13 18:27:44 +00:00

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt Outdated

						
				@@ -69,0 +72,4 @@

				                            (it.starred && displayedItems == ItemType.STARRED)

				                }

				                if (tagFilter != null) {

				                    dbItems.filter { it.tags.contains(tagFilter!!.tag) }

AmineB commented

2022-10-13 18:27:31 +00:00

This should be dbItems = dbItems.filter { it.tags.contains(tagFilter!!.tag) } (with dbItems being a var). Else, it does not filter anything.

This should be `dbItems = dbItems.filter { it.tags.contains(tagFilter!!.tag) }` (with `dbItems` being a var). Else, it does not filter anything.

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt Outdated

						
				@@ -69,0 +75,4 @@

				                    dbItems.filter { it.tags.contains(tagFilter!!.tag) }

				                }

				                if (sourceFilter != null) {

				                    dbItems.filter { it.sourcetitle == sourceFilter!!.title }