Make focus settings strings

mozilla · Apr 24, 2018 · 7294a37 · 7294a37
1 parent 9f6c57c
commit 7294a37
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 30 deletions.
diff --git a/src/main/scala/com/mozilla/telemetry/pings/FocusEvent.scala b/src/main/scala/com/mozilla/telemetry/pings/FocusEvent.scala
@@ -24,18 +24,32 @@ import scala.util.{Try, Success, Failure}
 
 
 case class FocusSettings(
-    pref_privacy_block_ads: Option[Boolean],
+    pref_privacy_block_ads: Option[String],
     pref_locale: Option[String],
-    pref_privacy_block_social: Option[Boolean],
-    pref_secure: Option[Boolean],
-    pref_privacy_block_analytics: Option[Boolean],
+    pref_privacy_block_social: Option[String],
+    pref_secure: Option[String],
+    pref_privacy_block_analytics: Option[String],
     pref_search_engine: Option[String],
-    pref_privacy_block_other: Option[Boolean],
-    pref_default_browser: Option[Boolean],
-    pref_performance_block_webfonts: Option[Boolean],
-    pref_performance_block_images: Option[Boolean],
-    pref_autocomplete_installed: Option[Boolean],
-    pref_autocomplete_custom: Option[Boolean])
+    pref_privacy_block_other: Option[String],
+    pref_default_browser: Option[String],
+    pref_performance_block_webfonts: Option[String],
+    pref_performance_block_images: Option[String],
+    pref_autocomplete_installed: Option[String],
+    pref_autocomplete_custom: Option[String]){
+
+  def asBool(param: Option[String]): Option[Boolean] = param.map(_ == "true")
+
+  def blockAds: Option[Boolean] = asBool(pref_privacy_block_ads)
+  def blockSocial: Option[Boolean] = asBool(pref_privacy_block_social)
+  def secure: Option[Boolean] = asBool(pref_secure)
+  def blockAnalytics: Option[Boolean] = asBool(pref_privacy_block_analytics)
+  def blockOther: Option[Boolean] = asBool(pref_privacy_block_other)
+  def defaultBrowser: Option[Boolean] = asBool(pref_default_browser)
+  def blockWebfonts: Option[Boolean] = asBool(pref_performance_block_webfonts)
+  def blockImages: Option[Boolean] = asBool(pref_performance_block_images)
+  def autocompleteInstalled: Option[Boolean] = asBool(pref_autocomplete_installed)
+  def autocompleteCustom: Option[Boolean] = asBool(pref_autocomplete_custom)
+}
 
 
 case class FocusEventPing(
@@ -79,18 +93,18 @@ case class FocusEventPing(
         ("country" -> meta.geoCountry) ~
         ("city" -> meta.geoCity) ~
         ("user_properties" ->
-          ("pref_privacy_block_ads" -> settings.pref_privacy_block_ads) ~
+          ("pref_privacy_block_ads" -> settings.blockAds) ~
           ("pref_locale" -> settings.pref_locale) ~
-          ("pref_privacy_block_social" -> settings.pref_privacy_block_social) ~
-          ("pref_secure" -> settings.pref_secure) ~
-          ("pref_privacy_block_analytics" -> settings.pref_privacy_block_analytics) ~
+          ("pref_privacy_block_social" -> settings.blockSocial) ~
+          ("pref_secure" -> settings.secure) ~
+          ("pref_privacy_block_analytics" -> settings.blockAnalytics) ~
           ("pref_search_engine" -> settings.pref_search_engine) ~
-          ("pref_privacy_block_other" -> settings.pref_privacy_block_other) ~
-          ("pref_default_browser" -> settings.pref_default_browser) ~
-          ("pref_performance_block_webfonts" -> settings.pref_performance_block_webfonts) ~
-          ("pref_performance_block_images" -> settings.pref_performance_block_images) ~
-          ("pref_autocomplete_installed" -> settings.pref_autocomplete_installed) ~
-          ("pref_autocomplete_custom" -> settings.pref_autocomplete_custom))
+          ("pref_privacy_block_other" -> settings.blockOther) ~
+          ("pref_default_browser" -> settings.defaultBrowser) ~
+          ("pref_performance_block_webfonts" -> settings.blockWebfonts) ~
+          ("pref_performance_block_images" -> settings.blockImages) ~
+          ("pref_autocomplete_installed" -> settings.autocompleteInstalled) ~
+          ("pref_autocomplete_custom" -> settings.autocompleteCustom))
       }
 
     compact(render(eventsList))

diff --git a/src/test/scala/com/mozilla/telemetry/TestUtils.scala b/src/test/scala/com/mozilla/telemetry/TestUtils.scala
@@ -223,18 +223,18 @@ object TestUtils {
       |  "created":1506024685632,
       |  "tz":-180,
       |  "settings":{
-      |    "pref_privacy_block_ads": true,
+      |    "pref_privacy_block_ads": "true",
       |    "pref_locale": "",
-      |    "pref_privacy_block_social": true,
-      |    "pref_secure": true,
-      |    "pref_privacy_block_analytics": true,
+      |    "pref_privacy_block_social": "true",
+      |    "pref_secure": "true",
+      |    "pref_privacy_block_analytics": "true",
       |    "pref_search_engine": "custom",
-      |    "pref_privacy_block_other": false,
-      |    "pref_default_browser": true,
-      |    "pref_performance_block_webfonts": false,
-      |    "pref_performance_block_images": false,
-      |    "pref_autocomplete_installed": true,
-      |    "pref_autocomplete_custom": false},
+      |    "pref_privacy_block_other": "false",
+      |    "pref_default_browser": "true",
+      |    "pref_performance_block_webfonts": "false",
+      |    "pref_performance_block_images": "false",
+      |    "pref_autocomplete_installed": "true",
+      |    "pref_autocomplete_custom": "false"},
       |  "events":[
       |    [
       |      176078022,