use lowercase for device fields and fix tests

Topsort · Aug 13, 2024 · ec95e04 · ec95e04
1 parent cbbd05b
commit ec95e04
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/TopsortAnalytics/src/main/java/com/topsort/analytics/banners/BannerConfig.kt b/TopsortAnalytics/src/main/java/com/topsort/analytics/banners/BannerConfig.kt
@@ -18,7 +18,7 @@ sealed class BannerConfig private constructor() {
     data class LandingPage(
         val slotId: String,
         val ids: List<String>,
-        val device: Device = Device.MOBILE,
+        val device: Device = Device.mobile,
         val geoTargeting: String? = null
     ) : BannerConfig()
 
@@ -33,7 +33,7 @@ sealed class BannerConfig private constructor() {
     data class CategorySingle(
         val slotId: String,
         val category: String,
-        val device: Device = Device.MOBILE,
+        val device: Device = Device.mobile,
         val geoTargeting: String? = null
     ) : BannerConfig()
 
@@ -48,7 +48,7 @@ sealed class BannerConfig private constructor() {
     data class CategoryMultiple(
         val slotId: String,
         val categories: List<String>,
-        val device: Device = Device.MOBILE,
+        val device: Device = Device.mobile,
         val geoTargeting: String? = null,
     ) : BannerConfig()
 
@@ -63,7 +63,7 @@ sealed class BannerConfig private constructor() {
     data class CategoryDisjunctions(
         val slotId: String,
         val disjunctions: List<List<String>>,
-        val device: Device = Device.MOBILE,
+        val device: Device = Device.mobile,
         val geoTargeting: String? = null,
     ) : BannerConfig()
 
@@ -78,7 +78,7 @@ sealed class BannerConfig private constructor() {
     data class Keyword(
         val slotId: String,
         val keyword: String,
-        val device: Device = Device.MOBILE,
+        val device: Device = Device.mobile,
         val geoTargeting: String? = null,
     ) : BannerConfig()
 }
diff --git a/TopsortAnalytics/src/main/java/com/topsort/analytics/model/auctions/Auction.kt b/TopsortAnalytics/src/main/java/com/topsort/analytics/model/auctions/Auction.kt
@@ -88,7 +88,7 @@ data class Auction private constructor(
             slots: Int,
             slotId: String,
             ids: List<String>,
-            device: Device = Device.MOBILE,
+            device: Device = Device.mobile,
             geoTargeting: String? = null,
         ): Auction {
             return Auction(
@@ -106,7 +106,7 @@ data class Auction private constructor(
             slots: Int,
             slotId: String,
             category: String,
-            device: Device = Device.MOBILE,
+            device: Device = Device.mobile,
             geoTargeting: String? = null,
         ): Auction {
             return Auction(
@@ -124,7 +124,7 @@ data class Auction private constructor(
             slots: Int,
             slotId: String,
             categories: List<String>,
-            device: Device = Device.MOBILE,
+            device: Device = Device.mobile,
             geoTargeting: String? = null,
         ): Auction {
             return Auction(
@@ -142,7 +142,7 @@ data class Auction private constructor(
             slots: Int,
             slotId: String,
             disjunctions: List<List<String>>,
-            device: Device = Device.MOBILE,
+            device: Device = Device.mobile,
             geoTargeting: String? = null,
         ): Auction {
             return Auction(
@@ -160,7 +160,7 @@ data class Auction private constructor(
             slots: Int,
             slotId: String,
             keyword: String,
-            device: Device = Device.MOBILE,
+            device: Device = Device.mobile,
             geoTargeting: String? = null,
         ): Auction {
             return Auction(

diff --git a/TopsortAnalytics/src/main/java/com/topsort/analytics/model/auctions/Device.kt b/TopsortAnalytics/src/main/java/com/topsort/analytics/model/auctions/Device.kt
@@ -1,6 +1,7 @@
 package com.topsort.analytics.model.auctions
 
+@Suppress("EnumNaming")
 enum class Device {
-    DESKTOP,
-    MOBILE
+    desktop,
+    mobile
 }
diff --git a/TopsortAnalytics/src/test/java/com/topsort/analytics/banners/RunTest.kt b/TopsortAnalytics/src/test/java/com/topsort/analytics/banners/RunTest.kt
@@ -25,7 +25,7 @@ internal class RunTest {
         val bannerAuction = buildBannerAuction(bannerConfig);
         val json = JSONObject.wrap(bannerAuction)!!.toString()
         val expectedJson =
-            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"id\":\"$category\"},\"type\":\"banners\",\"device\":\"mobile\"}}"
+            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"id\":\"$category\"},\"type\":\"banners\",\"device\":\"mobile\"}"
         assertThat(json).isEqualTo(expectedJson)
     }
 
@@ -37,7 +37,7 @@ internal class RunTest {
         val bannerAuction = buildBannerAuction(bannerConfig);
         val json = JSONObject.wrap(bannerAuction)!!.toString()
         val expectedJson =
-            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"ids\":[\"${categories[0]}\",\"${categories[1]}\"]},\"type\":\"banners\",\"device\":\"mobile\"}}"
+            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"ids\":[\"${categories[0]}\",\"${categories[1]}\"]},\"type\":\"banners\",\"device\":\"mobile\"}"
         assertThat(json).isEqualTo(expectedJson)
     }
 
@@ -50,7 +50,7 @@ internal class RunTest {
         val bannerAuction = buildBannerAuction(bannerConfig);
         val json = JSONObject.wrap(bannerAuction)!!.toString()
         val expectedJson =
-            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"disjunctions\":[[\"${disjunctions[0][0]}\",\"${disjunctions[0][1]}\"],[\"${disjunctions[1][0]}\"]]},\"type\":\"banners\",\"device\":\"mobile\"}}"
+            "{\"slots\":1,\"slotId\":\"$slot\",\"category\":{\"disjunctions\":[[\"${disjunctions[0][0]}\",\"${disjunctions[0][1]}\"],[\"${disjunctions[1][0]}\"]]},\"type\":\"banners\",\"device\":\"mobile\"}"
         assertThat(json).isEqualTo(expectedJson)
     }
 }