Skip to content

Fix incorrect date range on the traffic tab #20362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2024
Merged

Fix incorrect date range on the traffic tab #20362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions ...a/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ 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
Expand Down Expand Up @@ -110,9 +111,19 @@ class TrafficOverviewUseCase(
}

private fun getLastDate(model: VisitsAndViewsModel?): Date? {
selectedDateProvider.getSelectedDate(statsGranularity)?.let { return it }
selectedDateProvider.getSelectedDate(statsGranularity)?.let { return dateWithoutHour(it) }

val lastDateString = model?.dates?.lastOrNull()?.period
return lastDateString?.let { statsDateFormatter.parseStatsDate(statsGranularity, it) }
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
}

override suspend fun fetchRemoteData(forced: Boolean): State<TrafficOverviewUiModel> {
Expand Down