fix: use device model and type

- Changed the device `name` to `type` as described in the specifications - Removed the device `version` - Added resolution to the device `type` as described in the speficiations
SRGSSR · Nov 7, 2024 · 4bb5955 · 4bb5955
1 parent 447e4df
commit 4bb5955
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/kotlin/ch/srgssr/pillarbox/monitoring/event/model/EventRequest.kt b/src/main/kotlin/ch/srgssr/pillarbox/monitoring/event/model/EventRequest.kt
@@ -96,8 +96,8 @@ private class DataDeserializer : JsonDeserializer<Any?>() {
     node.set<ObjectNode>(
       "device",
       ObjectNode(ctxt.nodeFactory).apply {
-        put("name", userAgent.getValueOrNull(UserAgent.DEVICE_NAME))
-        put("version", userAgent.getValueOrNull(UserAgent.DEVICE_VERSION))
+        put("model", userAgent.getValueOrNull(UserAgent.DEVICE_NAME))
+        put("type", userAgent.getValueOrNull(UserAgent.DEVICE_CLASS))
       },
     )
 

diff --git a/src/test/kotlin/ch/srgssr/pillarbox/monitoring/event/model/EventRequestTest.kt b/src/test/kotlin/ch/srgssr/pillarbox/monitoring/event/model/EventRequestTest.kt
@@ -39,7 +39,8 @@ class EventRequestTest(
       browserNode["version"] shouldBe "129"
 
       val deviceNode = dataNode["device"] as Map<*, *>
-      deviceNode["name"] shouldBe "Apple Macintosh"
+      deviceNode["model"] shouldBe "Apple Macintosh"
+      deviceNode["type"] shouldBe "Desktop"
 
       val osNode = dataNode["os"] as Map<*, *>
       osNode["name"] shouldBe "Mac OS"
@@ -75,7 +76,8 @@ class EventRequestTest(
       browserNode["version"] shouldBe "0.1"
 
       val deviceNode = dataNode["device"] as Map<*, *>
-      deviceNode["name"] shouldBe "Apple BOT"
+      deviceNode["model"] shouldBe "Apple BOT"
+      deviceNode["type"] shouldBe "Robot"
 
       val osNode = dataNode["os"] as Map<*, *>
       osNode["name"] shouldBe "Cloud"