Refactor: Rename insert/update to replace stat on new visitor stats dao

Author: ParaskP7

libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/NewVisitorStatsDao.kt

@@ -28,7 +28,7 @@ internal abstract class NewVisitorStatsDao {
     ): WCNewVisitorStatsModel?
 
     @Transaction
-    open suspend fun insertOrUpdateStat(entity: WCNewVisitorStatsModel) {
+    open suspend fun replaceStat(entity: WCNewVisitorStatsModel) {
         deleteStatForSite(entity.localSiteId)
         insertStat(entity)
     }

libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/store/WCStatsStore.kt

@@ -350,7 +350,7 @@ class WCStatsStore @Inject internal constructor(
                     it.causeOfChange = WCStatsAction.FETCH_NEW_VISITOR_STATS
                 }
             } else {
-                newVisitorStatsDao.insertOrUpdateStat(result.stats)
+                newVisitorStatsDao.replaceStat(result.stats)
                 OnWCStatsChanged(
                     payload.granularity,
                     result.stats.quantity,

libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/persistence/dao/NewVisitorStatsDaoTest.kt

@@ -30,9 +30,9 @@ class NewVisitorStatsDaoTest {
     }
 
     @Test
-    fun `when insert stat, then get stat returns by quantity and date`() = runTest {
+    fun `when replace stat, then get stat returns by quantity and date`() = runTest {
         val stat = statDay1Site1
-        dao.insertOrUpdateStat(stat)
+        dao.replaceStat(stat)
 
         val retrieved = dao.getStat(
             stat.localSiteId,
@@ -45,11 +45,11 @@ class NewVisitorStatsDaoTest {
     }
 
     @Test
-    fun `when insert stat again for same site, then previous stat is deleted`() = runTest {
-        // Insert first stat
-        dao.insertOrUpdateStat(statDay1Site1)
-        // Now insert a second stat for same site (should clear stat rows for that site)
-        dao.insertOrUpdateStat(statDay2Site1)
+    fun `when replace stat again for same site, then previous stat is deleted`() = runTest {
+        // Replace first stat
+        dao.replaceStat(statDay1Site1)
+        // Now replace a second stat for same site (should clear stat rows for that site)
+        dao.replaceStat(statDay2Site1)
 
         // First one should not be found anymore
         val first = dao.getStat(

libs/fluxc-plugin/src/test/java/org/wordpress/android/fluxc/store/WCStatsStoreTest.kt

@@ -819,7 +819,7 @@ class WCStatsStoreTest {
         // Get visitor Stats of the same site and granularity and assert not null
         val defaultDayVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel()
         val site = SiteModel().apply { id = defaultDayVisitorStatsModel.localSiteId.value }
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(defaultDayVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(defaultDayVisitorStatsModel)
 
         val defaultDayVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.DAYS, defaultDayVisitorStatsModel.quantity,
@@ -832,7 +832,7 @@ class WCStatsStoreTest {
         val defaultDayVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
             endDate = "2019-08-02"
         )
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(defaultDayVisitorStatsModel2)
+        databaseRule.db.newVisitorStatsDao.replaceStat(defaultDayVisitorStatsModel2)
         val defaultDayVisitorStats2 = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.DAYS, defaultDayVisitorStatsModel2.quantity,
             defaultDayVisitorStatsModel2.endDate
@@ -844,7 +844,7 @@ class WCStatsStoreTest {
         val customDayVisitorStatsModel = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
             quantity = "1", endDate = "2019-08-06", startDate = "2019-08-06"
         )
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customDayVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customDayVisitorStatsModel)
 
         val customDayVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.DAYS, customDayVisitorStatsModel.quantity,
@@ -887,7 +887,7 @@ class WCStatsStoreTest {
             granularity = StatsGranularity.WEEKS.toString()
         )
 
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customWeekVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customWeekVisitorStatsModel)
 
         val customWeekVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, customWeekVisitorStatsModel.quantity,
@@ -910,7 +910,7 @@ class WCStatsStoreTest {
             quantity = "1", endDate = "2019-02-01", startDate = "2019-02-01"
         )
 
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customWeekVisitorStatsModel2)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customWeekVisitorStatsModel2)
 
         val customWeekVisitorStats2 = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, customWeekVisitorStatsModel2.quantity,
@@ -929,7 +929,7 @@ class WCStatsStoreTest {
             granularity = StatsGranularity.WEEKS.toString()
         )
         val site = SiteModel().apply { id = defaultWeekVisitorStatsModel.localSiteId.value }
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(defaultWeekVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(defaultWeekVisitorStatsModel)
 
         val defaultWeekVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, defaultWeekVisitorStatsModel.quantity,
@@ -949,7 +949,7 @@ class WCStatsStoreTest {
         val defaultWeekVisitorStatsModel2 = WCStatsTestUtils.generateSampleNewVisitorStatsModel(
             granularity = StatsGranularity.WEEKS.toString(), endDate = "2019-03-20"
         )
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(defaultWeekVisitorStatsModel2)
+        databaseRule.db.newVisitorStatsDao.replaceStat(defaultWeekVisitorStatsModel2)
         val defaultWeekVisitorStats2 = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, defaultWeekVisitorStatsModel2.quantity,
             defaultWeekVisitorStatsModel2.endDate
@@ -962,7 +962,7 @@ class WCStatsStoreTest {
             granularity = StatsGranularity.WEEKS.toString(), quantity = "1",
             endDate = "2019-08-01", startDate = "2019-08-01"
         )
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customWeekVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customWeekVisitorStatsModel)
 
         val customWeekVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, customWeekVisitorStatsModel.quantity,
@@ -1006,7 +1006,7 @@ class WCStatsStoreTest {
             granularity = StatsGranularity.MONTHS.toString()
         )
 
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customMonthVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customMonthVisitorStatsModel)
 
         val customMonthVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.MONTHS, customMonthVisitorStatsModel.quantity,
@@ -1029,7 +1029,7 @@ class WCStatsStoreTest {
             quantity = "1", endDate = "2019-08-01", startDate = "2019-08-01"
         )
 
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(customMonthVisitorStatsModel2)
+        databaseRule.db.newVisitorStatsDao.replaceStat(customMonthVisitorStatsModel2)
 
         val customMonthVisitorStats2 = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.MONTHS, customMonthVisitorStatsModel2.quantity,
@@ -1049,7 +1049,7 @@ class WCStatsStoreTest {
             data = UnitTestUtils.getStringFromResourceFile(this.javaClass, "wc/wrong-visitor-stats-data.json")
         )
         val site = SiteModel().apply { id = defaultWeekVisitorStatsModel.localSiteId.value }
-        databaseRule.db.newVisitorStatsDao.insertOrUpdateStat(defaultWeekVisitorStatsModel)
+        databaseRule.db.newVisitorStatsDao.replaceStat(defaultWeekVisitorStatsModel)
 
         val defaultWeekVisitorStats = wcStatsStore.getNewVisitorStats(
             site, StatsGranularity.WEEKS, defaultWeekVisitorStatsModel.quantity,