fixed bug when getting last 7 days stats from db

Jacob3075 · Dec 7, 2023 · 704987f · 704987f
1 parent 9fdefe9
commit 704987f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/core/common/src/main/java/com/jacob/wakatimeapp/core/common/data/local/dao/ApplicationDao.kt b/core/common/src/main/java/com/jacob/wakatimeapp/core/common/data/local/dao/ApplicationDao.kt
@@ -27,7 +27,7 @@ interface ApplicationDao {
             WHERE date BETWEEN :startDate AND :endDate
         """,
     )
-    suspend fun getStatsForRange(startDate: LocalDate, endDate: LocalDate): Map<DayEntity, List<ProjectPerDay>>
+    suspend fun getStatsForRange(startDate: LocalDate, endDate: LocalDate): Map<DayEntity, ProjectPerDay>
 
     @Query("SELECT * FROM ProjectPerDay WHERE name = :name")
     suspend fun getStatsForProject(name: String): List<ProjectPerDay>

diff --git a/core/common/src/main/java/com/jacob/wakatimeapp/core/common/data/mappers/EntityMappers.kt b/core/common/src/main/java/com/jacob/wakatimeapp/core/common/data/mappers/EntityMappers.kt
@@ -6,6 +6,7 @@ import com.jacob.wakatimeapp.core.common.data.local.entities.ProjectPerDay
 import com.jacob.wakatimeapp.core.models.DetailedDailyStats
 import com.jacob.wakatimeapp.core.models.project.DetailedProjectStatsForDay
 import com.jacob.wakatimeapp.core.models.project.Project
+import kotlin.collections.Map.Entry
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.datetime.LocalDate
@@ -20,6 +21,7 @@ fun List<ProjectPerDay>.toModel(): ImmutableList<Project> {
         )
     }.toImmutableList()
 }
+
 fun DetailedProjectStatsForDay.toEntity(dayId: LocalDate) = ProjectPerDay(
     projectPerDayId = 0,
     day = dayId,
@@ -41,9 +43,13 @@ fun DetailedDailyStats.toEntity() = DayEntity(
     machines = emptyList(),
 )
 
-fun Map<DayEntity, List<ProjectPerDay>>.toDayWithProjects() = map { (dayEntity, projectsPerDay) ->
+fun Map<DayEntity, ProjectPerDay>.toDayWithProjects() = entries.groupBy {
+    it.key.date
+}.values.map {
+    val dayEntity = (it.firstOrNull() ?: return@map null).key
+    val projects = it.map(Entry<DayEntity, ProjectPerDay>::value)
     DayWithProjects(
-        day = dayEntity,
-        projectsForDay = projectsPerDay,
+        dayEntity,
+        projects,
     )
-}
+}.filterNotNull()
diff --git a/home/src/main/java/com/jacob/wakatimeapp/home/domain/usecases/GetLast7DaysStatsUC.kt b/home/src/main/java/com/jacob/wakatimeapp/home/domain/usecases/GetLast7DaysStatsUC.kt
@@ -1,9 +1,12 @@
 package com.jacob.wakatimeapp.home.domain.usecases
 
-import arrow.core.raise.either
+import arrow.core.Either
 import com.jacob.wakatimeapp.core.common.data.local.WakaTimeAppDB
+import com.jacob.wakatimeapp.core.common.data.local.entities.DayWithProjects
 import com.jacob.wakatimeapp.core.common.utils.InstantProvider
+import com.jacob.wakatimeapp.core.models.Error
 import com.jacob.wakatimeapp.home.data.mappers.toLast7RangeDaysStats
+import com.jacob.wakatimeapp.home.domain.models.Last7DaysStats
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlinx.datetime.DateTimeUnit
@@ -15,13 +18,13 @@ internal class GetLast7DaysStatsUC @Inject constructor(
     private val wakaTimeAppDB: WakaTimeAppDB,
 ) {
 
-    suspend operator fun invoke() = either {
+    suspend operator fun invoke(): Either<Error, Last7DaysStats> {
         val today = instantProvider.date()
-        val lastWeek7Days = today.minus(DAYS_IN_WEEK, DateTimeUnit.DAY)
-        wakaTimeAppDB.getStatsForRange(lastWeek7Days, today).bind().toLast7RangeDaysStats()
+        val lastWeek7Days = today.minus(PREVIOUS_DAYS_IN_WEEK, DateTimeUnit.DAY)
+        return wakaTimeAppDB.getStatsForRange(lastWeek7Days, today).map(List<DayWithProjects>::toLast7RangeDaysStats)
     }
 
     companion object {
-        private const val DAYS_IN_WEEK = 7
+        private const val PREVIOUS_DAYS_IN_WEEK = 6
     }
 }