Fix timezone issue on traffic chart #20387

irfano · 2024-03-02T10:15:06Z

Fixes #20334

This fixes showing incorrect date range on the bar chart on TRAFFIC tab.

#20362 did not resolve the issue in cases where the site timezone is set to 0 and the device timezone is set to +14.
This

Reverts Fix incorrect date range on the traffic tab #20362: f06774f
Disables normalization of the timezone while fetching visits. Since we are displaying dates from the device locale, there's no need to normalize the timezone with the site zone. In other words, if the date is Mar 1 on my device but Mar 2 on the site timezone, we should fetch Mar 1. fb4ac40

Warning

Before Merging

Merge Make normalizing the timezone optional for the visits endpoint WordPress-FluxC-Android#2965
Update FluxC version to FluxC's trunk

before	after

To Test:

Log in to JP.
Change the device timezone to an edge, -14, or -12.
Open the Stats Traffic tab.
Tap "By day" and change it to "By week".
Verify that the date range of the date picker is the same as the one shown on the chart.
Change the device timezone to another edge, such as +12. Alternatively, you can change the date of the device.
Restart the app.
Repeat 3-5.

Regression Notes

Potential unintended areas of impact
- None
What I did to test those areas of impact (or what existing automated tests I relied on)
- N/A
What automated tests I added (or what prevented me from doing so)
- The issue was caused by a logic from 3rd party lib (FluxC). It's not possible to add automated tests in WPAndroid.

PR Submission Checklist:

I have completed the Regression Notes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing Checklist:

This reverts commit e280ec1.

dangermattic · 2024-03-02T10:15:59Z

	1 Warning
⚠️	This PR is assigned to the milestone 24.4. This milestone is due in less than 4 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2024-03-02T10:32:33Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20387-5c357cd
	Commit	`5c357cd`
	Direct Download	`wordpress-prototype-build-pr20387-5c357cd.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2024-03-02T10:33:18Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr20387-5c357cd
	Commit	`5c357cd`
	Direct Download	`jetpack-prototype-build-pr20387-5c357cd.apk`

Note: Google Login is not supported on these builds.

codecov · 2024-03-02T10:48:18Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 40.15%. Comparing base (1a67bc0) to head (5c357cd).
Report is 12 commits behind head on trunk.

Files	Patch %	Lines
...h/lists/sections/traffic/TrafficOverviewUseCase.kt	0.00%	4 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##            trunk   #20387   +/-   ##
=======================================
  Coverage   40.15%   40.15%           
=======================================
  Files        1476     1476           
  Lines       68275    68271    -4     
  Branches    11329    11329           
=======================================
  Hits        27417    27417           
+ Misses      38349    38345    -4     
  Partials     2509     2509

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

# Conflicts: # build.gradle

ravishanker

LGTM 👍

Please update the FluxC version before merging this.

wpmobilebot · 2024-03-03T08:19:48Z

Found 1 violations:

The PR caused some dependency changes (expand to see details)

-+--- org.wordpress:fluxc:{strictly trunk-8b930418a49b0d0846ed56ebf8fd8adad5011901} -> trunk-8b930418a49b0d0846ed56ebf8fd8adad5011901
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-8b930418a49b0d0846ed56ebf8fd8adad5011901
-|    +--- org.greenrobot:eventbus:3.3.1
-|    |    \--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-|    +--- androidx.security:security-crypto:1.0.0
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    \--- com.google.crypto.tink:tink-android:1.5.0
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0
-|    |    \--- org.apache.commons:commons-lang3:3.12.0
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
-|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.1 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
-|    |    +--- androidx.room:room-common:2.5.0
-|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
-|    |    +--- androidx.sqlite:sqlite:2.3.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
-|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
-|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.0
-|    |    +--- androidx.room:room-common:2.5.0 (*)
-|    |    +--- androidx.room:room-runtime:2.5.0 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.50
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:{strictly trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968} -> trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968
+|    +--- org.greenrobot:eventbus:3.3.1
+|    |    \--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|    +--- androidx.security:security-crypto:1.0.0
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    \--- com.google.crypto.tink:tink-android:1.5.0
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0
+|    |    \--- org.apache.commons:commons-lang3:3.12.0
+|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
+|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.1 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
+|    |    +--- androidx.room:room-common:2.5.0
+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
+|    |    +--- androidx.sqlite:sqlite:2.3.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
+|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
+|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
+|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.0
+|    |    +--- androidx.room:room-common:2.5.0 (*)
+|    |    +--- androidx.room:room-runtime:2.5.0 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.20 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.50
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
 \--- org.wordpress:login:1.14.1
-     \--- org.wordpress:fluxc:trunk-ed60798b4d96ec19863c74b0f525e2e20f4525db -> trunk-8b930418a49b0d0846ed56ebf8fd8adad5011901 (*)
+     \--- org.wordpress:fluxc:trunk-ed60798b4d96ec19863c74b0f525e2e20f4525db -> trunk-cef238b9f77fbbdc7aff16c7f1623b3d89091968 (*)

Please review and act accordingly

irfano added 3 commits March 2, 2024 12:18

Revert "Fix incorrect date range on the traffic tab"

f06774f

This reverts commit e280ec1.

Fix requesting incorrect dates from /visits endpoint

fb4ac40

Update FluxC version to PR #2965

97b3fc0

irfano added [Type] Bug Stats Traffic Tab labels Mar 2, 2024

irfano added this to the 24.4 milestone Mar 2, 2024

irfano mentioned this pull request Mar 2, 2024

Make normalizing the timezone optional for the visits endpoint wordpress-mobile/WordPress-FluxC-Android#2965

Merged

irfano requested review from aditi-bhatia, notandyvee and ravishanker March 2, 2024 10:16

Merge branch 'trunk' into fix/20334-fix-timezone-issue-on-traffic-chart

f5af7a4

# Conflicts: # build.gradle

ravishanker approved these changes Mar 3, 2024

View reviewed changes

Update FluxC version to trunk

5c357cd

irfano merged commit a25f785 into trunk Mar 3, 2024

irfano deleted the fix/20334-fix-timezone-issue-on-traffic-chart branch March 3, 2024 08:43

This was referenced Mar 5, 2024

Fix timezone issue with traffic charts #20415

Closed

Fix timezone issue with traffic charts #20416

Merged

irfano added the Stats label Mar 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix timezone issue on traffic chart #20387

Fix timezone issue on traffic chart #20387

Uh oh!

irfano commented Mar 2, 2024 •

edited

Loading

Uh oh!

dangermattic commented Mar 2, 2024

Uh oh!

wpmobilebot commented Mar 2, 2024 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 2, 2024 •

edited

Loading

Uh oh!

codecov bot commented Mar 2, 2024 •

edited

Loading

Uh oh!

ravishanker left a comment •

edited by irfano

Loading

Uh oh!

wpmobilebot commented Mar 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Fix timezone issue on traffic chart #20387

Fix timezone issue on traffic chart #20387

Uh oh!

Conversation

irfano commented Mar 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

To Test:

Regression Notes

PR Submission Checklist:

Testing Checklist:

Uh oh!

dangermattic commented Mar 2, 2024

Uh oh!

wpmobilebot commented Mar 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ravishanker left a comment • edited by irfano Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wpmobilebot commented Mar 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

irfano commented Mar 2, 2024 •

edited

Loading

wpmobilebot commented Mar 2, 2024 •

edited

Loading

wpmobilebot commented Mar 2, 2024 •

edited

Loading

codecov bot commented Mar 2, 2024 •

edited

Loading

ravishanker left a comment •

edited by irfano

Loading