change record refactor

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordFilterInteractor.kt

@@ -228,6 +228,7 @@ class RecordFilterInteractor @Inject constructor(
 
         fun RecordBase.selectedByTag(): Boolean {
             if (selectedTagItems.isEmpty()) return true
+            val tagIds = tags.map(RecordBase.Tag::tagId)
             return if (tagIds.isNotEmpty()) {
                 tagIds.any { tagId -> tagId in selectedTaggedIds }
             } else {
@@ -237,6 +238,7 @@ class RecordFilterInteractor @Inject constructor(
 
         fun RecordBase.filteredByTag(): Boolean {
             if (filteredTagItems.isEmpty()) return false
+            val tagIds = tags.map(RecordBase.Tag::tagId)
             return if (tagIds.isNotEmpty()) {
                 tagIds.any { tagId -> tagId in filteredTaggedIds }
             } else {

core/src/main/java/com/example/util/simpletimetracker/core/mapper/MultitaskRecordViewDataMapper.kt

@@ -27,7 +27,7 @@ class MultitaskRecordViewDataMapper @Inject constructor(
             recordViewDataMapper.map(
                 record = record,
                 recordType = recordTypes[record.typeId] ?: return@mapNotNull null,
-                recordTags = recordTags.filter { it.id in record.tagIds },
+                recordTags = recordTags,
                 isDarkTheme = isDarkTheme,
                 useMilitaryTime = useMilitaryTime,
                 useProportionalMinutes = useProportionalMinutes,

core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt

@@ -5,6 +5,7 @@ import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.extension.dropSeconds
 import com.example.util.simpletimetracker.domain.record.model.Record
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
@@ -34,13 +35,15 @@ class RecordViewDataMapper @Inject constructor(
         useProportionalMinutes: Boolean,
         showSeconds: Boolean,
     ): RecordViewData.Tracked {
+        val tagIds = record.tags.map(RecordBase.Tag::tagId)
+
         return RecordViewData.Tracked(
             id = record.id,
             timeStartedTimestamp = record.timeStarted,
             timeEndedTimestamp = record.timeEnded,
             name = recordType.name,
             tagName = recordTagFullNameMapper.getFullName(
-                tags = recordTags,
+                tags = recordTags.filter { it.id in tagIds },
                 tagData = record.tags,
             ),
             timeStarted = timeMapper.formatTime(
@@ -82,7 +85,7 @@ class RecordViewDataMapper @Inject constructor(
         return map(
             record = record,
             recordType = recordTypes[record.typeId] ?: return null,
-            recordTags = recordTags.filter { it.id in record.tagIds },
+            recordTags = recordTags,
             isDarkTheme = isDarkTheme,
             useMilitaryTime = useMilitaryTime,
             useProportionalMinutes = useProportionalMinutes,

core/src/main/java/com/example/util/simpletimetracker/core/mapper/RunningRecordViewDataMapper.kt

@@ -3,6 +3,7 @@ package com.example.util.simpletimetracker.core.mapper
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.interactor.GetCurrentRecordsDurationInteractor
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordType.extension.getDaily
@@ -37,12 +38,13 @@ class RunningRecordViewDataMapper @Inject constructor(
         totalDurationVisible: Boolean,
     ): RunningRecordViewData {
         val currentDuration = System.currentTimeMillis() - runningRecord.timeStarted
+        val tagIds = runningRecord.tags.map(RecordBase.Tag::tagId)
 
         return RunningRecordViewData(
             id = runningRecord.id,
             name = recordType.name,
             tagName = recordTagFullNameMapper.getFullName(
-                tags = recordTags,
+                tags = recordTags.filter { it.id in tagIds },
                 tagData = runningRecord.tags,
             ),
             timeStarted = timeMapper.formatTime(

data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/CsvRepoImpl.kt

@@ -32,6 +32,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.BufferedOutputStream
 import androidx.core.net.toUri
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 
 class CsvRepoImpl @Inject constructor(
     private val contentResolver: ContentResolver,
@@ -75,11 +76,12 @@ class CsvRepoImpl @Inject constructor(
             records
                 .sortedBy { it.timeStarted }
                 .forEach { record ->
+                    val tagIds = record.tags.map(RecordBase.Tag::tagId)
                     toCsvString(
                         record = record,
                         recordType = recordTypes[record.typeId],
                         categories = typeToCategories[record.typeId].orEmpty(),
-                        recordTags = recordTags.filter { it.id in record.tagIds },
+                        recordTags = recordTags.filter { it.id in tagIds },
                     )
                         ?.toByteArray()
                         ?.let { fileOutputStream?.write(it) }

data_local/src/main/java/com/example/util/simpletimetracker/data_local/file/IcsRepoImpl.kt

@@ -27,6 +27,7 @@ import java.util.Locale
 import java.util.TimeZone
 import javax.inject.Inject
 import androidx.core.net.toUri
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 
 class IcsRepoImpl @Inject constructor(
     private val contentResolver: ContentResolver,
@@ -80,11 +81,12 @@ class IcsRepoImpl @Inject constructor(
             records
                 .sortedBy { it.timeStarted }
                 .forEach { record ->
+                    val tagIds = record.tags.map(RecordBase.Tag::tagId)
                     toIcsString(
                         record = record,
                         recordType = recordTypes[record.typeId],
                         categories = typeToCategories[record.typeId].orEmpty(),
-                        recordTags = recordTags.filter { it.id in record.tagIds },
+                        recordTags = recordTags.filter { it.id in tagIds },
                     )
                         ?.toByteArray()
                         ?.let { fileOutputStream?.write(it) }

domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/GetDuplicatedRecordsInteractor.kt

@@ -51,7 +51,7 @@ class GetDuplicatedRecordsInteractor @Inject constructor() {
             if (duplications.size < 2) return@forEach
             // This record will not be counted as duplication.
             val originalRecord = duplications.firstOrNull {
-                it.tagIds.isNotEmpty() ||
+                it.tags.isNotEmpty() ||
                     it.comment.isNotEmpty()
             } ?: duplications.firstOrNull()
             duplications.forEach { record ->

domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/RemoveRunningRecordMediator.kt

@@ -4,6 +4,7 @@ import com.example.util.simpletimetracker.domain.notifications.interactor.Activi
 import com.example.util.simpletimetracker.domain.pomodoro.interactor.PomodoroStopInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.notifications.interactor.UpdateExternalViewsInteractor
+import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -39,7 +40,7 @@ class RemoveRunningRecordMediator @Inject constructor(
         }
         activityStartedStoppedBroadcastInteractor.onActivityStopped(
             typeId = runningRecord.id,
-            tagIds = runningRecord.tagIds,
+            tagIds = runningRecord.tags.map(RecordBase.Tag::tagId),
             comment = runningRecord.comment,
         )
         remove(

domain/src/main/java/com/example/util/simpletimetracker/domain/record/model/RecordBase.kt

@@ -8,7 +8,6 @@ sealed interface RecordBase {
     val tags: List<Tag>
 
     val duration: Long get() = timeEnded - timeStarted
-    val tagIds: List<Long> get() = tags.map { it.tagId } // TODO TAG not good, maps every time
 
     data class Tag(
         val tagId: Long,

domain/src/main/java/com/example/util/simpletimetracker/domain/statistics/interactor/StatisticsTagInteractor.kt

@@ -32,12 +32,12 @@ class StatisticsTagInteractor @Inject constructor(
 
         allRecords.forEach { record ->
             val isUntracked = record.typeIds.any { it == UNTRACKED_ITEM_ID }
-            record.tagIds.forEach { tagId ->
-                tags.getOrPut(tagId) { mutableListOf() }.add(record)
+            record.tags.forEach { tag ->
+                tags.getOrPut(tag.tagId) { mutableListOf() }.add(record)
             }
             if (isUntracked) {
                 tags.getOrPut(UNTRACKED_ITEM_ID) { mutableListOf() }.add(record)
-            } else if (addUncategorized && record.tagIds.isEmpty()) {
+            } else if (addUncategorized && record.tags.isEmpty()) {
                 tags.getOrPut(UNCATEGORIZED_ITEM_ID) { mutableListOf() }.add(record)
             }
         }