refactor: update TrainingPeaksUserDTO structure and enhance deserialization tests

Author: costa-alex

boot/src/main/kotlin/io/github/costaalex/workoutrelay/infrastructure/platform/trainingpeaks/user/TrainingPeaksUserDTO.kt

@@ -1,19 +1,27 @@
 package io.github.costaalex.workoutrelay.infrastructure.platform.trainingpeaks.user
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
-class TrainingPeaksUserDTO(
-    var userId: String?,
-    val accountStatus: TPUserAccountStatusDTO,
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class TrainingPeaksUserDTO(
+    val user: TPUserDTO,
 ) {
 
-    @JsonProperty("user")
-    private fun mapUserId(map: Map<*, *>) {
-        userId = (map["userId"] as Number).toLong().toString()
-    }
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class TPUserDTO(
+        val userId: Long,
+        val settings: TPUserSettingsDTO,
+    )
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class TPUserSettingsDTO(
+        val account: TPUserAccountDTO,
+    )
 
-    class TPUserAccountStatusDTO(
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    data class TPUserAccountDTO(
         val isAthlete: Boolean,
-        val isPremium: Boolean = false,
+        val isPremium: Boolean,
+        val premiumTrial: Boolean = false,
     )
 }

boot/src/main/kotlin/io/github/costaalex/workoutrelay/infrastructure/platform/trainingpeaks/user/TrainingPeaksUserRepository.kt

@@ -11,7 +11,16 @@ class TrainingPeaksUserRepository(
 ) {
     @Cacheable(key = "'singleton'")
     fun getUser(): TrainingPeaksUser {
-        val dto = trainingPeaksUserApiClient.getUser()
-        return TrainingPeaksUser(dto.userId!!, dto.accountStatus.isAthlete, dto.accountStatus.isPremium)
+        val dto =
+            trainingPeaksUserApiClient.getUser()
+
+        val account =
+            dto.user.settings.account
+
+        return TrainingPeaksUser(
+            userId = dto.user.userId.toString(),
+            isAthlete = account.isAthlete,
+            isPremium = account.isPremium,
+        )
     }
 }

boot/src/main/resources/application.yaml

@@ -26,7 +26,6 @@ spring:
     serialization:
       fail-on-empty-beans: false
   datasource:
-    # url: jdbc:sqlite:/data/tp2intervals.sqlite
     url: ${SPRING_DATASOURCE_URL:jdbc:sqlite:/data/workout-relay.sqlite}
     driver-class-name: org.sqlite.JDBC
   jpa:
@@ -48,13 +47,10 @@ management:
     web:
       exposure:
         include: health,info
-      cors:
-        allowed-origins: '*'
   endpoint:
     loggers:
       enabled: false
 
 logging:
   file:
-    # name: /data/tp2intervals.log
     name: ${LOGGING_FILE_NAME:/data/workout-relay.log}

boot/src/test/kotlin/io/github/costaalex/workoutrelay/infrastructure/platform/trainingpeaks/user/TrainingPeaksUserDTOTest.kt

@@ -13,49 +13,70 @@ class TrainingPeaksUserDTOTest {
         jacksonObjectMapper()
 
     @Test
-    fun `should default isPremium to false when missing`() {
+    fun `should deserialize premium account information`() {
         val json = """
             {
               "user": {
-                "userId": 12345
-              },
-              "accountStatus": {
-                "isAthlete": true
+                "userId": 3037421,
+                "settings": {
+                  "account": {
+                    "userType": 4,
+                    "isAthlete": true,
+                    "isPremium": true,
+                    "isCoached": false,
+                    "premiumTrial": false
+                  }
+                }
               }
             }
         """.trimIndent()
 
-        val user =
+        val dto =
             objectMapper.readValue<TrainingPeaksUserDTO>(
                 json
             )
 
-        assertEquals("12345", user.userId)
-        assertTrue(user.accountStatus.isAthlete)
-        assertFalse(user.accountStatus.isPremium)
+        val account =
+            dto.user.settings.account
+
+        assertEquals(
+            3037421L,
+            dto.user.userId,
+        )
+
+        assertTrue(account.isAthlete)
+        assertTrue(account.isPremium)
+        assertFalse(account.premiumTrial)
     }
 
     @Test
-    fun `should deserialize isPremium when present`() {
+    fun `should deserialize basic account information`() {
         val json = """
             {
               "user": {
-                "userId": 12345
-              },
-              "accountStatus": {
-                "isAthlete": true,
-                "isPremium": true
+                "userId": 3037421,
+                "settings": {
+                  "account": {
+                    "isAthlete": true,
+                    "isPremium": false,
+                    "premiumTrial": false
+                  }
+                }
               }
             }
         """.trimIndent()
 
-        val user =
+        val dto =
             objectMapper.readValue<TrainingPeaksUserDTO>(
                 json
             )
 
-        assertEquals("12345", user.userId)
-        assertTrue(user.accountStatus.isAthlete)
-        assertTrue(user.accountStatus.isPremium)
+        assertTrue(
+            dto.user.settings.account.isAthlete
+        )
+
+        assertFalse(
+            dto.user.settings.account.isPremium
+        )
     }
 }