update unpinTool to track changes

CruGlobal · Sep 19, 2023 · a7d7253 · a7d7253
1 parent 78e31bd
commit a7d7253
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/library/db/src/main/kotlin/org/cru/godtools/db/room/dao/ToolsDao.kt b/library/db/src/main/kotlin/org/cru/godtools/db/room/dao/ToolsDao.kt
@@ -48,8 +48,6 @@ internal interface ToolsDao {
     suspend fun upsertSyncTools(tools: Collection<SyncTool>)
     @Update(entity = ToolEntity::class)
     suspend fun update(tool: ToolFavorite)
-    @Query("UPDATE tools SET isFavorite = :isFavorite WHERE code = :code")
-    suspend fun updateIsFavorite(code: String, isFavorite: Boolean)
     @Query("UPDATE tools SET `order` = ${Int.MAX_VALUE}")
     fun resetToolOrder()
     @Query("UPDATE tools SET `order` = :order WHERE code = :code")

diff --git a/library/db/src/main/kotlin/org/cru/godtools/db/room/repository/ToolsRoomRepository.kt b/library/db/src/main/kotlin/org/cru/godtools/db/room/repository/ToolsRoomRepository.kt
@@ -12,6 +12,7 @@ import org.cru.godtools.db.room.entity.ToolEntity
 import org.cru.godtools.db.room.entity.partial.SyncTool
 import org.cru.godtools.model.Resource
 import org.cru.godtools.model.Tool
+import org.cru.godtools.model.trackChanges
 
 private val TOOL_TYPES = setOf(Tool.Type.TRACT, Tool.Type.CYOA, Tool.Type.ARTICLE)
 
@@ -42,7 +43,12 @@ internal abstract class ToolsRoomRepository(private val db: GodToolsRoomDatabase
         tool.isFavorite = true
         dao.update(tool)
     }
-    override suspend fun unpinTool(code: String) = dao.updateIsFavorite(code, false)
+    @Transaction
+    override suspend fun unpinTool(code: String) {
+        val tool = dao.findToolFavorite(code) ?: return
+        tool.trackChanges { it.isFavorite = false }
+        dao.update(tool)
+    }
 
     @Transaction
     override suspend fun storeToolOrder(tools: List<String>) {

diff --git a/library/db/src/test/kotlin/org/cru/godtools/db/repository/ToolsRepositoryIT.kt b/library/db/src/test/kotlin/org/cru/godtools/db/repository/ToolsRepositoryIT.kt
@@ -346,18 +346,45 @@ abstract class ToolsRepositoryIT {
     }
     // endregion pinTool()
 
+    // region unpinTool()
     @Test
-    fun verifyUnpinTool() = testScope.runTest {
+    fun `unpinTool()`() = testScope.runTest {
         val code = "pinTool"
         repository.storeInitialResources(listOf(Tool(code) { isFavorite = true }))
 
         repository.findToolFlow(code).test {
-            assertTrue(assertNotNull(awaitItem()).isFavorite)
+            assertNotNull(awaitItem()) {
+                assertTrue(it.isFavorite)
+                assertFalse(Tool.ATTR_IS_FAVORITE in it.changedFields)
+            }
 
             repository.unpinTool(code)
-            assertFalse(assertNotNull(awaitItem()).isFavorite)
+            assertNotNull(awaitItem()) {
+                assertFalse(it.isFavorite)
+                assertTrue(Tool.ATTR_IS_FAVORITE in it.changedFields)
+            }
+        }
+    }
+
+    @Test
+    fun `unpinTool() - No Change`() = testScope.runTest {
+        val code = "pinTool"
+        repository.storeInitialResources(listOf(Tool(code) { isFavorite = false }))
+
+        repository.findToolFlow(code).test {
+            assertNotNull(awaitItem()) {
+                assertFalse(it.isFavorite)
+                assertFalse(Tool.ATTR_IS_FAVORITE in it.changedFields)
+            }
+
+            repository.unpinTool(code)
+            assertNotNull(awaitItem()) {
+                assertFalse(it.isFavorite)
+                assertFalse(Tool.ATTR_IS_FAVORITE in it.changedFields)
+            }
         }
     }
+    // endregion unpinTool()
 
     // region storeToolOrder()
     @Test

diff --git a/library/model/src/main/kotlin/org/cru/godtools/model/ChangeTrackingModel.kt b/library/model/src/main/kotlin/org/cru/godtools/model/ChangeTrackingModel.kt
@@ -10,3 +10,12 @@ interface ChangeTrackingModel {
         if (isTrackingChanges) changedFieldsStr = "$changedFieldsStr,$field"
     }
 }
+
+fun <T : ChangeTrackingModel> T.trackChanges(block: (T) -> Unit) {
+    isTrackingChanges = true
+    try {
+        block(this)
+    } finally {
+        isTrackingChanges = false
+    }
+}