Use domain model for battery repo

#399
kylecorry31 · Sep 8, 2023 · 906cc51 · 906cc51
1 parent 71cb17d
commit 906cc51
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/battery/domain/BatteryReadingEntity.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/battery/domain/BatteryReadingEntity.kt
@@ -20,4 +20,15 @@ class BatteryReadingEntity(
         return BatteryReading(time, percent, capacity, isCharging)
     }
 
+    companion object {
+        fun from(reading: BatteryReading): BatteryReadingEntity {
+            return BatteryReadingEntity(
+                reading.percent,
+                reading.capacity,
+                reading.isCharging,
+                reading.time
+            )
+        }
+    }
+
 }
diff --git a/...java/com/kylecorry/trail_sense/tools/battery/infrastructure/commands/BatteryLogCommand.kt b/...java/com/kylecorry/trail_sense/tools/battery/infrastructure/commands/BatteryLogCommand.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.kylecorry.andromeda.battery.Battery
 import com.kylecorry.andromeda.battery.BatteryChargingStatus
 import com.kylecorry.trail_sense.shared.commands.CoroutineCommand
+import com.kylecorry.trail_sense.tools.battery.domain.BatteryReading
 import com.kylecorry.trail_sense.tools.battery.domain.BatteryReadingEntity
 import com.kylecorry.trail_sense.tools.battery.infrastructure.persistence.BatteryRepo
 import kotlinx.coroutines.Dispatchers
@@ -29,7 +30,7 @@ class BatteryLogCommand(private val context: Context) : CoroutineCommand {
         val charging = battery.chargingStatus == BatteryChargingStatus.Charging
         val time = Instant.now()
         val capacity = battery.capacity
-        val reading = BatteryReadingEntity(pct, capacity, charging, time)
+        val reading = BatteryReading(time, pct, capacity, charging)
         if (battery.hasValidReading) {
             batteryRepo.add(reading)
         }

diff --git a/...in/java/com/kylecorry/trail_sense/tools/battery/infrastructure/persistence/BatteryRepo.kt b/...in/java/com/kylecorry/trail_sense/tools/battery/infrastructure/persistence/BatteryRepo.kt
@@ -2,10 +2,13 @@ package com.kylecorry.trail_sense.tools.battery.infrastructure.persistence
 
 import android.content.Context
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.map
 import com.kylecorry.andromeda.preferences.FloatPreference
+import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.shared.database.AppDatabase
 import com.kylecorry.trail_sense.shared.extensions.onIO
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
+import com.kylecorry.trail_sense.tools.battery.domain.BatteryReading
 import com.kylecorry.trail_sense.tools.battery.domain.BatteryReadingEntity
 import java.time.Instant
 
@@ -15,13 +18,13 @@ class BatteryRepo private constructor(context: Context) : IBatteryRepo {
     private val prefs = PreferencesSubsystem.getInstance(context).preferences
     private var maxCapacityPref by FloatPreference(prefs, "pref_max_battery_capacity", 0f)
 
-    override fun get(): LiveData<List<BatteryReadingEntity>> {
-        return batteryDao.get()
+    override fun get(): LiveData<List<BatteryReading>> {
+        return batteryDao.get().map { it.map { reading -> reading.toBatteryReading() } }
     }
 
-    override suspend fun add(reading: BatteryReadingEntity) {
+    override suspend fun add(reading: BatteryReading) {
         onIO {
-            batteryDao.insert(reading)
+            batteryDao.insert(BatteryReadingEntity.from(reading))
 
             // Record the maximum capacity the battery has reached
             if (getMaxCapacity() < reading.capacity) {

diff --git a/...n/java/com/kylecorry/trail_sense/tools/battery/infrastructure/persistence/IBatteryRepo.kt b/...n/java/com/kylecorry/trail_sense/tools/battery/infrastructure/persistence/IBatteryRepo.kt
@@ -1,12 +1,12 @@
 package com.kylecorry.trail_sense.tools.battery.infrastructure.persistence
 
 import androidx.lifecycle.LiveData
-import com.kylecorry.trail_sense.tools.battery.domain.BatteryReadingEntity
+import com.kylecorry.trail_sense.tools.battery.domain.BatteryReading
 import java.time.Instant
 
 interface IBatteryRepo {
-    fun get(): LiveData<List<BatteryReadingEntity>>
-    suspend fun add(reading: BatteryReadingEntity)
+    fun get(): LiveData<List<BatteryReading>>
+    suspend fun add(reading: BatteryReading)
     suspend fun deleteBefore(time: Instant)
     fun getMaxCapacity(): Float
 }
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/FragmentToolBattery.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/battery/ui/FragmentToolBattery.kt
@@ -147,7 +147,7 @@ class FragmentToolBattery : BoundFragment<FragmentToolBatteryBinding>() {
 
         observe(batteryRepo.get()) { allReadings ->
             readings =
-                allReadings.sortedBy { it.time }.map { it.toBatteryReading() } + listOfNotNull(
+                allReadings.sortedBy { it.time } + listOfNotNull(
                     if (battery.hasValidReading)
                         BatteryReading(
                             Instant.now(),