[MediaWiki-commits] [Gerrit] analytics...source[master]: Update PageviewDefinition fixing iOS bug

[Joal (Code Review)]

Joal has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/319374

Change subject: Update PageviewDefinition fixing iOS bug
......................................................................

Update PageviewDefinition fixing iOS bug

Bug: T148663

Change-Id: I6231b050ec87255eed5ac1aca47a975c8972d15e
---
M 
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
M refinery-core/src/test/resources/pageview_test_data.csv
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/74/319374/1

diff --git 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
index d75f8ad..fcfeeee 100644
--- 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
+++ 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java
@@ -168,7 +168,7 @@
         final String appUserAgent       = "WikipediaApp";
         final String appPageURIQuery    = "sections=0";
         final String iosAppPageURIQuery = "sections=all";
-        final String iosUserAgent       = "iPhone";
+        final Pattern iosUserAgentPattern = Pattern.compile("iPhone|iOS");
         final String iOsAppUserAgent    = "Wikipedia/5.0.";
 
         Webrequest wr = Webrequest.getInstance();
@@ -187,7 +187,7 @@
                     Utilities.stringContains(uriPath, uriPathAPI) &&
                     (Utilities.stringContains(uriQuery, appPageURIQuery)
                      || (Utilities.stringContains(uriQuery, iosAppPageURIQuery)
-                         && Utilities.stringContains(userAgent, iosUserAgent))
+                         && Utilities.patternIsFound(iosUserAgentPattern, 
userAgent))
                     )
                )
             ));
diff --git a/refinery-core/src/test/resources/pageview_test_data.csv 
b/refinery-core/src/test/resources/pageview_test_data.csv
index 036622e..8dc51e5 100644
--- a/refinery-core/src/test/resources/pageview_test_data.csv
+++ b/refinery-core/src/test/resources/pageview_test_data.csv
@@ -41,3 +41,4 @@
 Is AppPageview - analytics header tagged - Restbase URI - special 
chars,en.wikipedia,default,Special:CentralLogin/complete,true,false,174.62.175.83,-,en.wikipedia.org,/api/rest_v1/page/mobile-sections-lead/Special%3ACentralLogin%2Fcomplete,-,200,
 application/json,Wikipedia/5.0.2 (iPhone OS 8.2 
Phone),WMF-Last-Access=10-Jan-2016;pageview=1
 Is Pageview - 
Desktop,nl.wikimedia,default,Donaties,true,false,174.62.175.82,-,nl.wikimedia.org,
 /wiki/Donaties,-,200,text/html, turnip,
 Is Not Pageview - 
Desktop,nl8-blah.wikimedia,default,Donaties,false,false,174.62.175.82,-,nl8-blah.wikimedia.org,
 /wiki/Donaties,-,200,text/html, turnip,
+Is Pageview – App -  iOS – new 
version,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,174.62.175.83,-,en.wikipedia.org,
 
/w/api.php,?action=mobileview&format=json&page=Hachiko_–_Eine_wunderbare_Freundschaft&prop=text&sections=all,200,
 application/json,WikipediaApp/5.3.0.0 (iOS 10.0; Phone),
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/319374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6231b050ec87255eed5ac1aca47a975c8972d15e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal <j...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits