From f06774fa9c836112a74ea7e43cf204c20f365267 Mon Sep 17 00:00:00 2001 From: Irfan Omur Date: Sat, 2 Mar 2024 12:18:10 +0300 Subject: [PATCH 1/4] Revert "Fix incorrect date range on the traffic tab" This reverts commit e280ec1487b2227f7c4aab9df6e973dfd0c096d4. --- .../sections/traffic/TrafficOverviewUseCase.kt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt index d57dda1e8ce2..5f2fb3bcad0e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt @@ -24,7 +24,6 @@ import org.wordpress.android.ui.stats.refresh.utils.trackWithGranularity import org.wordpress.android.util.AppLog import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper import org.wordpress.android.viewmodel.ResourceProvider -import java.util.Calendar import java.util.Date import javax.inject.Inject import javax.inject.Named @@ -111,19 +110,9 @@ class TrafficOverviewUseCase( } private fun getLastDate(model: VisitsAndViewsModel?): Date? { - selectedDateProvider.getSelectedDate(statsGranularity)?.let { return dateWithoutHour(it) } - + selectedDateProvider.getSelectedDate(statsGranularity)?.let { return it } val lastDateString = model?.dates?.lastOrNull()?.period - return lastDateString?.let { dateWithoutHour(statsDateFormatter.parseStatsDate(statsGranularity, it)) } - } - - // Remove the hour and minute from the date to avoid fetching incorrect dates caused by timezone differences - private fun dateWithoutHour(date: Date): Date { - val calendar = Calendar.getInstance() - calendar.time = date - calendar.set(Calendar.HOUR_OF_DAY, 0) - calendar.set(Calendar.MINUTE, 0) - return calendar.time + return lastDateString?.let { statsDateFormatter.parseStatsDate(statsGranularity, it) } } override suspend fun fetchRemoteData(forced: Boolean): State { From fb4ac4072e000e1b97fcb9b429949747f03c85e7 Mon Sep 17 00:00:00 2001 From: Irfan Omur Date: Sat, 2 Mar 2024 12:45:36 +0300 Subject: [PATCH 2/4] Fix requesting incorrect dates from /visits endpoint --- .../refresh/lists/sections/traffic/TrafficOverviewUseCase.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt index 5f2fb3bcad0e..d8203224b26c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt @@ -170,7 +170,8 @@ class TrafficOverviewUseCase( granularity, LimitMode.Top(quantity), date, - forced + forced, + false ) } ?: visitsAndViewsStore.fetchVisits( statsSiteProvider.siteModel, From 97b3fc072c9725397cabd63d1299c0e8af91ca31 Mon Sep 17 00:00:00 2001 From: Irfan Omur Date: Sat, 2 Mar 2024 13:11:22 +0300 Subject: [PATCH 3/4] Update FluxC version to PR #2965 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 74233b3d1819..18bf9d38eb30 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ ext { automatticTracksVersion = '3.4.0' gutenbergMobileVersion = 'v1.114.0' wordPressAztecVersion = 'v2.0' - wordPressFluxCVersion = 'trunk-8b930418a49b0d0846ed56ebf8fd8adad5011901' + wordPressFluxCVersion = '2965-865ac5c30a89dca6e3595db5e2d87f52fa1a2aa2' wordPressLoginVersion = '1.14.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.13.0' From 5c357cd1c8af2fc71f97b8c1e97fcef47d4bfca0 Mon Sep 17 00:00:00 2001 From: Irfan Omur Date: Sun, 3 Mar 2024 11:12:32 +0300 Subject: [PATCH 4/4] Update FluxC version to trunk --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bad44af17b44..e724a7276289 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ ext { automatticTracksVersion = '3.4.0' gutenbergMobileVersion = 'v1.114.0' wordPressAztecVersion = 'v2.0' - wordPressFluxCVersion = '2965-865ac5c30a89dca6e3595db5e2d87f52fa1a2aa2' + wordPressFluxCVersion = 'trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968' wordPressLoginVersion = '1.14.1' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.13.0'