Merge pull request #17016 from wordpress-mobile/fix/stats-refresh-date-range-problem

Fix stats cached data conflict

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/TotalLikesDetailUseCase.kt

@@ -54,7 +54,7 @@ class TotalLikesDetailUseCase @Inject constructor(
         val cachedData = visitsAndViewsStore.getVisits(
                 site,
                 DAYS,
-                LimitMode.Top(TotalStatsMapper.DAY_COUNT_TOTAL),
+                LimitMode.Top(TOTAL_LIKES_ITEMS_TO_LOAD),
                 selectedDate
         )
         if (cachedData != null) {
@@ -71,7 +71,7 @@ class TotalLikesDetailUseCase @Inject constructor(
         val response = visitsAndViewsStore.fetchVisits(
                 statsSiteProvider.siteModel,
                 DAYS,
-                LimitMode.Top(TotalStatsMapper.DAY_COUNT_TOTAL),
+                LimitMode.Top(TOTAL_LIKES_ITEMS_TO_LOAD),
                 selectedDate,
                 forced
         )
@@ -109,6 +109,10 @@ class TotalLikesDetailUseCase @Inject constructor(
 
     private fun buildTitle() = TitleWithMore(string.stats_view_total_likes)
 
+    companion object {
+        private const val TOTAL_LIKES_ITEMS_TO_LOAD = 15
+    }
+
     class TotalLikesGranularUseCaseFactory
     @Inject constructor(
         @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalLikesUseCase.kt

@@ -65,7 +65,7 @@ class TotalLikesUseCase @Inject constructor(
         val response = visitsAndViewsStore.fetchVisits(
                 statsSiteProvider.siteModel,
                 DAYS,
-                LimitMode.Top(TotalStatsMapper.DAY_COUNT_TOTAL),
+                LimitMode.Top(TOTAL_LIKES_ITEMS_TO_LOAD),
                 forced
         )
         val model = response.model
@@ -150,6 +150,10 @@ class TotalLikesUseCase @Inject constructor(
         )
     }
 
+    companion object {
+        private const val TOTAL_LIKES_ITEMS_TO_LOAD = 15
+    }
+
     class TotalLikesUseCaseFactory
     @Inject constructor(
         @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalStatsMapper.kt

@@ -128,6 +128,6 @@ class TotalStatsMapper @Inject constructor(
     companion object {
         private const val DAY_COUNT_FOR_CURRENT_WEEK = 7 // Last 7 days
         private const val DAY_COUNT_FOR_PREVIOUS_WEEK = 7 // Last 7 days before the current week
-        const val DAY_COUNT_TOTAL = DAY_COUNT_FOR_PREVIOUS_WEEK + DAY_COUNT_FOR_CURRENT_WEEK
+        private const val DAY_COUNT_TOTAL = DAY_COUNT_FOR_PREVIOUS_WEEK + DAY_COUNT_FOR_CURRENT_WEEK
     }
 }

WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalLikesUseCaseTest.kt

@@ -63,7 +63,7 @@ class TotalLikesUseCaseTest : BaseUnitTest() {
     private lateinit var useCase: TotalLikesUseCase
     private val periodData = PeriodData("2018-10-08", 10, 15, 20, 25, 30, 35)
     private val modelPeriod = "2018-10-10"
-    private val limitMode = Top(14)
+    private val limitMode = Top(15)
     private val model = VisitsAndViewsModel(modelPeriod, listOf(periodData))
 
     @InternalCoroutinesApi