WTA #71: Updated models.

Jacob3075 · Dec 23, 2022 · c35dca0 · c35dca0
1 parent ef051e1
commit c35dca0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
diff --git a/core/models/src/main/java/com/jacob/wakatimeapp/core/models/Stats.kt b/core/models/src/main/java/com/jacob/wakatimeapp/core/models/Stats.kt
@@ -1,5 +1,6 @@
 package com.jacob.wakatimeapp.core.models
 
+@Deprecated("Too vague, totalTime and range properties can be derived from dailyStats property")
 data class Stats(
     val totalTime: Time,
     val dailyStats: List<DailyStats>,

diff --git a/core/models/src/main/java/com/jacob/wakatimeapp/core/models/StatsRange.kt b/core/models/src/main/java/com/jacob/wakatimeapp/core/models/StatsRange.kt
@@ -1,10 +1,16 @@
 package com.jacob.wakatimeapp.core.models
 
 import kotlinx.datetime.LocalDate
+import kotlinx.datetime.toLocalDateTime
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class StatsRange(
     val startDate: LocalDate,
     val endDate: LocalDate,
-)
+) {
+    constructor(startDate: String, endDate: String) : this(
+        startDate = startDate.toLocalDateTime().date,
+        endDate = endDate.toLocalDateTime().date,
+    )
+}
diff --git a/details/src/main/java/com/jacob/wakatimeapp/details/domain/models/ProjectStats.kt b/details/src/main/java/com/jacob/wakatimeapp/details/domain/models/ProjectStats.kt
@@ -0,0 +1,14 @@
+package com.jacob.wakatimeapp.details.domain.models
+
+import com.jacob.wakatimeapp.core.models.StatsRange
+import com.jacob.wakatimeapp.core.models.Time
+import kotlinx.datetime.LocalDate
+
+data class ProjectStats(
+    val totalTime: Time,
+    val dailyProjectStats: Map<LocalDate, Time>,
+    val range: StatsRange,
+    val languages: List<String>,
+    val operatingSystems: List<String>,
+    val editors: List<String>,
+)
diff --git a/...rc/main/java/com/jacob/wakatimeapp/home/data/network/mappers/GetStatsForRangeResMapper.kt b/...rc/main/java/com/jacob/wakatimeapp/home/data/network/mappers/GetStatsForRangeResMapper.kt
@@ -17,12 +17,7 @@ import kotlinx.datetime.toLocalDate
 fun GetStatsForRangeResDTO.toModel() = Stats(
     totalTime = Time.createFrom(cumulativeTotal.digital, cumulativeTotal.decimal),
     dailyStats = getDailyStatsFromDto(data),
-    range = StatsRange(
-        startDate = start.takeWhile { it != 'T' }
-            .toLocalDate(),
-        endDate = end.takeWhile { it != 'T' }
-            .toLocalDate(),
-    ),
+    range = StatsRange(startDate = start, endDate = end),
 )
 
 private fun getDailyStatsFromDto(data: List<Data>) = data.map {

diff --git a/.../src/main/java/com/jacob/wakatimeapp/home/data/network/mappers/GetWeeklyStatsResMapper.kt b/.../src/main/java/com/jacob/wakatimeapp/home/data/network/mappers/GetWeeklyStatsResMapper.kt
@@ -17,10 +17,7 @@ import kotlinx.datetime.toLocalDate
 fun GetLast7DaysStatsResDTO.toModel() = WeeklyStats(
     totalTime = Time.createFrom(cumulativeTotal.digital, cumulativeTotal.decimal),
     dailyStats = getDailyStatsFromDto(data),
-    range = StatsRange(
-        startDate = start.takeWhile { it != 'T' }.toLocalDate(),
-        endDate = end.takeWhile { it != 'T' }.toLocalDate(),
-    ),
+    range = StatsRange(startDate = start, endDate = end),
 )
 
 private fun getDailyStatsFromDto(data: List<Data>) = data.map {

diff --git a/login/src/main/java/com/jacob/wakatimeapp/login/data/mappers/UserDetailsMapper.kt b/login/src/main/java/com/jacob/wakatimeapp/login/data/mappers/UserDetailsMapper.kt
@@ -2,7 +2,7 @@ package com.jacob.wakatimeapp.login.data.mappers // ktlint-disable filename
 
 import com.jacob.wakatimeapp.core.models.UserDetails
 import com.jacob.wakatimeapp.login.data.dtos.GetUserDetailsResDTO
-import kotlinx.datetime.toLocalDate
+import kotlinx.datetime.toLocalDateTime
 
 fun GetUserDetailsResDTO.toModel() = UserDetails(
     bio = data.bio,
@@ -15,7 +15,7 @@ fun GetUserDetailsResDTO.toModel() = UserDetails(
     lastProject = data.lastProject,
     fullName = data.fullName,
     durationsSliceBy = data.durationsSliceBy,
-    createdAt = data.createdAt.takeWhile { it != 'T' }.toLocalDate(),
+    createdAt = data.createdAt.toLocalDateTime().date,
     dateFormat = data.dateFormat,
     photoUrl = "${data.photoUrl}?s=420",
 )