Add Record Mapper

YuanLiou · Jun 23, 2023 · ec0506d · ec0506d
1 parent e8d429a
commit ec0506d
Show file tree

Hide file tree

Showing 10 changed files with 136 additions and 13 deletions.
diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/dao/WorkoutRecordDataSource.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/dao/WorkoutRecordDataSource.kt
@@ -10,6 +10,7 @@ interface WorkoutRecordDataSource {
     suspend fun insertRecordDetails(
         workoutRecordId: Long,
         createAt: String,
+        sportRecordTypeId: Long,
         weight: Double?,
         reps: Long?,
         time: String?,

diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/dao/WorkoutRecordDataSourceImpl.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/dao/WorkoutRecordDataSourceImpl.kt
@@ -32,6 +32,7 @@ class WorkoutRecordDataSourceImpl(
     override suspend fun insertRecordDetails(
         workoutRecordId: Long,
         createAt: String,
+        sportRecordTypeId: Long,
         weight: Double?,
         reps: Long?,
         time: String?,
@@ -42,6 +43,7 @@ class WorkoutRecordDataSourceImpl(
             workoutRecordId = workoutRecordId,
             createAt = createAt,
             lastModified = createAt,
+            sportRecordTypeId = sportRecordTypeId,
             weight = weight,
             reps = reps,
             time = time,

diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/mapper/RecordMapper.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/mapper/RecordMapper.kt
@@ -0,0 +1,64 @@
+package com.rayliu.commonmain.data.mapper
+
+import com.rayliu.commonmain.data.database.DateTimeConverter
+import com.rayliu.commonmain.data.database.RecordDetails
+import com.rayliu.commonmain.data.mapper.basic.Mapper
+import com.rayliu.commonmain.data.mapper.basic.NullableInputListMapper
+import com.rayliu.commonmain.domain.model.DistanceTimeRecord
+import com.rayliu.commonmain.domain.model.Record
+import com.rayliu.commonmain.domain.model.SportRecordType
+import com.rayliu.commonmain.domain.model.UnknownRecord
+import com.rayliu.commonmain.domain.model.WeightRepsRecord
+import com.rayliu.commonmain.domain.model.WeightTimeRecord
+import org.koin.core.annotation.Factory
+
+@Factory
+class RecordMapper(
+    private val sportRecordTypeMapper: SportRecordTypeMapper,
+    private val dateTimeConverter: DateTimeConverter
+) : Mapper<RecordDetails, Record> {
+    override fun map(input: RecordDetails): Record {
+        val type = sportRecordTypeMapper.map(input.sportRecordTypeId.toInt())
+        return when (type) {
+            SportRecordType.WEIGHT_REPS -> WeightRepsRecord(
+                id = input.id.toInt(),
+                workoutRecordId = input.workoutRecordId.toInt(),
+                createdAt = dateTimeConverter.toLocalDateTime(input.createAt),
+                lastModified = dateTimeConverter.toLocalDateTime(input.lastModified),
+                weight = input.weight?.toFloat() ?: 0f,
+                reps = input.reps?.toInt() ?: 0
+            )
+            SportRecordType.WEIGHT_TIME -> WeightTimeRecord(
+                id = input.id.toInt(),
+                workoutRecordId = input.workoutRecordId.toInt(),
+                createdAt = dateTimeConverter.toLocalDateTime(input.createAt),
+                lastModified = dateTimeConverter.toLocalDateTime(input.lastModified),
+                weight = input.weight?.toFloat() ?: 0f,
+                time = input.time.orEmpty()
+            )
+            SportRecordType.DISTANCE_TIME -> DistanceTimeRecord(
+                id = input.id.toInt(),
+                workoutRecordId = input.workoutRecordId.toInt(),
+                createdAt = dateTimeConverter.toLocalDateTime(input.createAt),
+                lastModified = dateTimeConverter.toLocalDateTime(input.lastModified),
+                distance = input.distance?.toFloat() ?: 0f,
+                time = input.time.orEmpty()
+            )
+            SportRecordType.UNKNOWN -> UnknownRecord(
+                id = input.id.toInt(),
+                workoutRecordId = input.workoutRecordId.toInt(),
+                createdAt = dateTimeConverter.toLocalDateTime(input.createAt),
+                lastModified = dateTimeConverter.toLocalDateTime(input.lastModified)
+            )
+        }
+    }
+}
+
+@Factory
+class RecordListMapper(
+    private val mapper: RecordMapper
+) : NullableInputListMapper<RecordDetails, Record> {
+    override fun map(input: List<RecordDetails>?): List<Record> {
+        return input?.map { mapper.map(it) }.orEmpty()
+    }
+}
diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/mapper/SportRecordTypeMapper.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/data/mapper/SportRecordTypeMapper.kt
@@ -1,15 +1,15 @@
 package com.rayliu.commonmain.data.mapper
 
 import com.rayliu.commonmain.data.mapper.basic.Mapper
-import com.rayliu.commonmain.domain.model.SportsRecordType
+import com.rayliu.commonmain.domain.model.SportRecordType
 import org.koin.core.annotation.Factory
 
 @Factory
-class SportRecordTypeMapper : Mapper<Int, SportsRecordType> {
-    override fun map(input: Int): SportsRecordType {
-        if (!SportsRecordType.map.containsKey(input)) {
-            return SportsRecordType.UNKNOWN
+class SportRecordTypeMapper : Mapper<Int, SportRecordType> {
+    override fun map(input: Int): SportRecordType {
+        if (!SportRecordType.map.containsKey(input)) {
+            return SportRecordType.UNKNOWN
         }
-        return SportsRecordType.map[input] ?: SportsRecordType.UNKNOWN
+        return SportRecordType.map[input] ?: SportRecordType.UNKNOWN
     }
 }
diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/Record.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/Record.kt
@@ -0,0 +1,44 @@
+package com.rayliu.commonmain.domain.model
+
+import kotlinx.datetime.LocalDateTime
+
+interface Record {
+    val id: Int
+    val workoutRecordId: Int
+    val createdAt: LocalDateTime
+    val lastModified: LocalDateTime
+}
+
+data class WeightRepsRecord(
+    override val id: Int,
+    override val workoutRecordId: Int,
+    override val createdAt: LocalDateTime,
+    override val lastModified: LocalDateTime,
+    val weight: Float,
+    val reps: Int
+) : Record
+
+data class WeightTimeRecord(
+    override val id: Int,
+    override val workoutRecordId: Int,
+    override val createdAt: LocalDateTime,
+    override val lastModified: LocalDateTime,
+    val weight: Float,
+    val time: String
+) : Record
+
+data class DistanceTimeRecord(
+    override val id: Int,
+    override val workoutRecordId: Int,
+    override val createdAt: LocalDateTime,
+    override val lastModified: LocalDateTime,
+    val distance: Float,
+    val time: String
+) : Record
+
+data class UnknownRecord(
+    override val id: Int,
+    override val workoutRecordId: Int,
+    override val createdAt: LocalDateTime,
+    override val lastModified: LocalDateTime
+) : Record
diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/SportRecord.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/SportRecord.kt
@@ -0,0 +1,11 @@
+package com.rayliu.commonmain.domain.model
+
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.datetime.LocalDateTime
+
+data class SportRecord(
+    val id: Int,
+    val workoutId: Int,
+    val records: ImmutableList<Record>,
+    val createdAt: LocalDateTime
+)
diff --git a/...mmonmain/domain/model/SportsRecordType.kt → ...ommonmain/domain/model/SportRecordType.kt b/...mmonmain/domain/model/SportsRecordType.kt → ...ommonmain/domain/model/SportRecordType.kt
@@ -1,12 +1,12 @@
 package com.rayliu.commonmain.domain.model
 
-enum class SportsRecordType(val id: Int) {
+enum class SportRecordType(val id: Int) {
     WEIGHT_REPS(0),
     WEIGHT_TIME(1),
     DISTANCE_TIME(2),
     UNKNOWN(-1);
 
     companion object {
-        val map = SportsRecordType.values().associateBy { it.id }
+        val map = SportRecordType.values().associateBy { it.id }
     }
 }
diff --git a/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/WorkoutInfo.kt b/shared/src/commonMain/kotlin/com/rayliu/commonmain/domain/model/WorkoutInfo.kt
@@ -6,7 +6,7 @@ data class WorkoutInfo(
     val id: Int,
     val name: String,
     val categoryId: Int,
-    val sportRecordType: SportsRecordType,
+    val sportRecordType: SportRecordType,
     val createdAt: LocalDateTime,
     val lastModified: LocalDateTime
 )
diff --git a/shared/src/commonMain/sqldelight/com/rayliu/commonmain/data/database/RecordDetails.sq b/shared/src/commonMain/sqldelight/com/rayliu/commonmain/data/database/RecordDetails.sq
@@ -3,6 +3,7 @@ CREATE TABLE RecordDetails (
     workoutRecordId INTEGER NOT NULL,
     createAt Text NOT NULL ,
     lastModified TEXT NOT NULL,
+    sportRecordTypeId INTEGER NOT NULL,
     weight REAL,
     reps INTEGER,
     time TEXT,
@@ -13,7 +14,7 @@ CREATE TABLE RecordDetails (
 insertNewRecord:
 INSERT OR REPLACE
 INTO RecordDetails
-VALUES (?, ?, ?, ?, ?, ?, ?, ?);
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);
 
 getRecordDetails:
 SELECT *

diff --git a/wear/src/main/java/com/rayliu/gymnote/wearos/workoutlist/WorkoutListScreen.kt b/wear/src/main/java/com/rayliu/gymnote/wearos/workoutlist/WorkoutListScreen.kt
@@ -16,7 +16,7 @@ import androidx.wear.compose.foundation.lazy.ScalingLazyColumn
 import androidx.wear.compose.foundation.lazy.ScalingLazyListState
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.compose.rotaryinput.rotaryWithScroll
-import com.rayliu.commonmain.domain.model.SportsRecordType
+import com.rayliu.commonmain.domain.model.SportRecordType
 import com.rayliu.commonmain.domain.model.WorkoutInfo
 import com.rayliu.gymnote.wearos.theme.GymNoteTheme
 import com.rayliu.gymnote.wearos.ui.OptionItem
@@ -90,7 +90,7 @@ private fun WorkoutListScreenPreview() {
                     id = 6278,
                     name = "Odessa Huber",
                     categoryId = 4839,
-                    sportRecordType = SportsRecordType.WEIGHT_REPS,
+                    sportRecordType = SportRecordType.WEIGHT_REPS,
                     createdAt = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()),
                     lastModified = Clock.System.now()
                         .toLocalDateTime(TimeZone.currentSystemDefault())
@@ -99,7 +99,7 @@ private fun WorkoutListScreenPreview() {
                     id = 4784,
                     name = "Blanca Willis",
                     categoryId = 7617,
-                    sportRecordType = SportsRecordType.WEIGHT_REPS,
+                    sportRecordType = SportRecordType.WEIGHT_REPS,
                     createdAt = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()),
                     lastModified = Clock.System.now()
                         .toLocalDateTime(TimeZone.currentSystemDefault())