From 920d4ac1ef99bf0f53fd7253f4a52100b32b86c1 Mon Sep 17 00:00:00 2001 From: davidoskky Date: Thu, 29 Sep 2022 19:34:25 +0200 Subject: [PATCH] Correctly implement disabling sources update --- .../repository/RepositoryImpl.kt | 23 ++++-- .../repository/RepositoryTest.kt | 74 +++++++++++++++---- 2 files changed, 78 insertions(+), 19 deletions(-) diff --git a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt index 26f4ebb..3afd977 100644 --- a/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt +++ b/shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt @@ -37,6 +37,9 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap var badgeStarred = 0 set(value) {field = if (value < 0) { 0 } else { value } } + private var fetchedSources = false + private var fetchedTags = false + init { // TODO: Dispatchers.IO not available in KMM, an alternative solution should be found runBlocking { @@ -144,13 +147,17 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap } suspend fun getTags(): List { - return if (isNetworkAvailable()) { + val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled() + return if (isNetworkAvailable() && !fetchedTags) { val apiTags = api.tags() - if (apiTags.success && apiTags.data != null && (appSettingsService.isItemCachingEnabled() || appSettingsService.isUpdateSourcesEnabled())) { + if (apiTags.success && apiTags.data != null && isDatabaseEnabled) { resetDBTagsWithData(apiTags.data) + if (!appSettingsService.isUpdateSourcesEnabled()) { + fetchedTags = true + } } apiTags.data ?: emptyList() - } else if (appSettingsService.isItemCachingEnabled() || appSettingsService.isUpdateSourcesEnabled()) { + } else if (isDatabaseEnabled) { getDBTags().map { it.toView() } } else { emptyList() @@ -172,13 +179,17 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap } suspend fun getSources(): ArrayList { - return if (isNetworkAvailable()) { + val isDatabaseEnabled = appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled() + return if (isNetworkAvailable() && !fetchedSources) { val apiSources = api.sources() - if (apiSources.success && apiSources.data != null && (appSettingsService.isItemCachingEnabled() || appSettingsService.isUpdateSourcesEnabled())) { + if (apiSources.success && apiSources.data != null && isDatabaseEnabled) { resetDBSourcesWithData(apiSources.data) + if (!appSettingsService.isUpdateSourcesEnabled()) { + fetchedSources = true + } } apiSources.data ?: ArrayList() - } else if (appSettingsService.isItemCachingEnabled() || appSettingsService.isUpdateSourcesEnabled()) { + } else if (isDatabaseEnabled) { ArrayList(getDBSources().map { it.toView() }) } else { ArrayList() diff --git a/shared/src/commonTest/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryTest.kt b/shared/src/commonTest/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryTest.kt index 567dbd6..7ca5948 100644 --- a/shared/src/commonTest/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryTest.kt +++ b/shared/src/commonTest/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryTest.kt @@ -342,12 +342,35 @@ class RepositoryTest() { testTags = repository.getTags() } + coVerify(exactly = 1) { api.tags() } assertNotSame(tags, testTags) assertContentEquals(tagsDB.map { it.toView() }, testTags) - coVerify(exactly = 1) { api.tags() } verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() } } + @Test + fun `Get tags with items caching disabled`() { + val tags = listOf(SelfossModel.Tag("test", "red", 6), + SelfossModel.Tag("second", "yellow", 0)) + val tagsDB = listOf(TAG("test_DB", "red", 6), + TAG("second_DB", "yellow", 0)) + + coEvery { api.tags() } returns SelfossModel.StatusAndData(success = true, data = tags) + coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB + every { appSettingsService.isUpdateSourcesEnabled() } returns true + every { appSettingsService.isItemCachingEnabled() } returns false + + val repository = Repository(api, appSettingsService, connectivityStatus, db) + var testTags: List = emptyList() + runBlocking { + testTags = repository.getTags() + } + + assertSame(tags, testTags) + coVerify(exactly = 1) { api.tags() } + verify(exactly = 0) { db.tagsQueries.tags().executeAsList() } + } + @Test fun `Get tags with sources update and items caching disabled`() { val tags = listOf(SelfossModel.Tag("test", "red", 6), @@ -364,11 +387,13 @@ class RepositoryTest() { var testTags: List = emptyList() runBlocking { testTags = repository.getTags() + testTags = repository.getTags() } - assertSame(tags, testTags) coVerify(exactly = 1) { api.tags() } - verify(exactly = 0) { db.tagsQueries.tags().executeAsList() } + assertNotSame(tags, testTags) + assertContentEquals(tagsDB.map { it.toView() }, testTags) + verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() } } @Test @@ -415,9 +440,9 @@ class RepositoryTest() { testTags = repository.getTags() } - assertContentEquals(tagsDB.map { it.toView() }, testTags) + assertSame(emptyList(), testTags) coVerify(exactly = 0) { api.tags() } - verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() } + verify(exactly = 0) { db.tagsQueries.tags().executeAsList() } } @Test @@ -464,9 +489,9 @@ class RepositoryTest() { testTags = repository.getTags() } - assertSame(emptyList(), testTags) + assertContentEquals(tagsDB.map { it.toView() }, testTags) coVerify(exactly = 0) { api.tags() } - verify(exactly = 0) { db.tagsQueries.tags().executeAsList() } + verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() } } @Test @@ -497,6 +522,7 @@ class RepositoryTest() { SOURCE("2", "Second source", "second","spouts\\rss\\fulltextrss", "", "b3aa8a664d08eb15d6ff1db2fa83e0d9.png")) every { appSettingsService.isUpdateSourcesEnabled() } returns false + every { appSettingsService.isItemCachingEnabled() } returns true coEvery { api.sources() } returns SelfossModel.StatusAndData(success = true, data = sources) every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB val repository = Repository(api, appSettingsService, connectivityStatus, db) @@ -507,12 +533,34 @@ class RepositoryTest() { testSources = repository.getSources() } + coVerify(exactly = 1) { api.sources() } assertNotSame(sources, testSources) assertContentEquals(sourcesDB.map { it.toView() }, testSources) - coVerify(exactly = 1) { api.sources() } verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() } } + @Test + fun `get sources with items caching disabled`() { + val sources = arrayListOf(SelfossModel.Source(1, "First source", listOf("Test", "second"),"spouts\\rss\\fulltextrss", "", "d8c92cdb1ef119ea85c4b9205c879ca7.png"), + SelfossModel.Source(2, "Second source", listOf("second"),"spouts\\rss\\fulltextrss", "", "b3aa8a664d08eb15d6ff1db2fa83e0d9.png")) + val sourcesDB = listOf(SOURCE("1", "First source", "Test,second","spouts\\rss\\fulltextrss", "", "d8c92cdb1ef119ea85c4b9205c879ca7.png"), + SOURCE("2", "Second source", "second","spouts\\rss\\fulltextrss", "", "b3aa8a664d08eb15d6ff1db2fa83e0d9.png")) + + every { appSettingsService.isUpdateSourcesEnabled() } returns true + every { appSettingsService.isItemCachingEnabled() } returns false + coEvery { api.sources() } returns SelfossModel.StatusAndData(success = true, data = sources) + every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB + val repository = Repository(api, appSettingsService, connectivityStatus, db) + var testSources: List? = null + runBlocking { + testSources = repository.getSources() + } + + assertSame(sources, testSources) + coVerify(exactly = 1) { api.sources() } + verify(exactly = 0) { db.sourcesQueries } + } + @Test fun `get sources with sources update and items caching disabled`() { val sources = arrayListOf(SelfossModel.Source(1, "First source", listOf("Test", "second"),"spouts\\rss\\fulltextrss", "", "d8c92cdb1ef119ea85c4b9205c879ca7.png"), @@ -532,7 +580,7 @@ class RepositoryTest() { assertSame(sources, testSources) coVerify(exactly = 1) { api.sources() } - verify(exactly = 0) { db.sourcesQueries.sources().executeAsList() } + verify(atLeast = 1) { db.sourcesQueries } } @Test @@ -574,9 +622,9 @@ class RepositoryTest() { testSources = repository.getSources() } - assertContentEquals(sourcesDB.map { it.toView() }, testSources) + assertContentEquals(ArrayList(), testSources) coVerify(exactly = 0) { api.sources() } - verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() } + verify(exactly = 0) { db.sourcesQueries.sources().executeAsList() } } @Test @@ -620,9 +668,9 @@ class RepositoryTest() { testSources = repository.getSources() } - assertContentEquals(ArrayList(), testSources) + assertContentEquals(sourcesDB.map { it.toView() }, testSources) coVerify(exactly = 0) { api.sources() } - verify(exactly = 0) { db.sourcesQueries.sources().executeAsList() } + verify(atLeast = 1) { db.sourcesQueries.sources().executeAsList() } } @Test