remove default types repeating by repeat button on main tab

Author: Razeeman

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

@@ -7,6 +7,8 @@ import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteracto
 import com.example.util.simpletimetracker.domain.record.interactor.RecordInteractor
 import com.example.util.simpletimetracker.domain.record.interactor.RunningRecordInteractor
 import com.example.util.simpletimetracker.domain.record.model.RepeatButtonType
+import com.example.util.simpletimetracker.domain.recordType.interactor.RecordTypeInteractor
+import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.notification.SnackBarParams
 import com.example.util.simpletimetracker.navigation.params.notification.ToastParams
@@ -15,6 +17,7 @@ import javax.inject.Inject
 // Repeats previous record, if any.
 class RecordRepeatInteractor @Inject constructor(
     private val recordInteractor: RecordInteractor,
+    private val recordTypeInteractor: RecordTypeInteractor,
     private val runningRecordInteractor: RunningRecordInteractor,
     private val addRunningRecordMediator: AddRunningRecordMediator,
     private val prefsInteractor: PrefsInteractor,
@@ -48,15 +51,22 @@ class RecordRepeatInteractor @Inject constructor(
         messageShower: (messageResId: Int) -> Unit,
     ): ActionResult {
         val type = prefsInteractor.getRepeatButtonType()
+        val defaultTypeIds = recordTypeInteractor.getAll()
+            .filter { it.defaultDuration != 0L }
+            .map(RecordType::id)
 
         // TODO repeat several records?
         val prevRecord = recordInteractor.getPrev(
             timeStarted = System.currentTimeMillis(),
+            ignoreTypeIds = defaultTypeIds,
         ).let {
             when (type) {
                 is RepeatButtonType.RepeatLast -> it
                 is RepeatButtonType.RepeatBeforeLast -> if (it != null) {
-                    recordInteractor.getPrev(timeStarted = it.timeEnded - 1)
+                    recordInteractor.getPrev(
+                        timeStarted = it.timeEnded - 1,
+                        ignoreTypeIds = defaultTypeIds,
+                    )
                 } else {
                     null
                 }

data_local/src/main/java/com/example/util/simpletimetracker/data_local/record/RecordDao.kt

@@ -50,8 +50,10 @@ interface RecordDao {
     suspend fun getFromRangeByType(typesIds: List<Long>, start: Long, end: Long): List<RecordWithRecordTagsDBO>
 
     @Transaction
-    @Query("SELECT * FROM records WHERE time_ended <= :timeStarted ORDER BY time_ended DESC LIMIT 1")
-    suspend fun getPrev(timeStarted: Long): RecordWithRecordTagsDBO?
+    @Query("SELECT * FROM records " +
+        "WHERE time_ended <= :timeStarted AND type_id NOT IN (:ignoreTypeIds) " +
+        "ORDER BY time_ended DESC LIMIT 1")
+    suspend fun getPrev(timeStarted: Long, ignoreTypeIds: List<Long>): RecordWithRecordTagsDBO?
 
     @Transaction
     @Query("SELECT * FROM records WHERE time_started >= :timeEnded ORDER BY time_started ASC LIMIT 1")

data_local/src/main/java/com/example/util/simpletimetracker/data_local/record/RecordRepoImpl.kt

@@ -106,9 +106,12 @@ class RecordRepoImpl @Inject constructor(
         )
     }
 
-    override suspend fun getPrev(timeStarted: Long): Record? = withContext(Dispatchers.IO) {
+    override suspend fun getPrev(
+        timeStarted: Long,
+        ignoreTypeIds: List<Long>,
+    ): Record? = withContext(Dispatchers.IO) {
         logDataAccess("getPrev")
-        recordDao.getPrev(timeStarted)?.let(::mapItem)
+        recordDao.getPrev(timeStarted, ignoreTypeIds)?.let(::mapItem)
     }
 
     override suspend fun getNext(timeEnded: Long): Record? = withContext(Dispatchers.IO) {

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

@@ -45,8 +45,11 @@ class RecordInteractor @Inject constructor(
         return recordRepo.get(id)
     }
 
-    suspend fun getPrev(timeStarted: Long): Record? {
-        return recordRepo.getPrev(timeStarted)
+    suspend fun getPrev(
+        timeStarted: Long,
+        ignoreTypeIds: List<Long> = emptyList(),
+    ): Record? {
+        return recordRepo.getPrev(timeStarted, ignoreTypeIds)
     }
 
     // Can return several records ended at the same time.

domain/src/main/java/com/example/util/simpletimetracker/domain/record/repo/RecordRepo.kt

@@ -25,7 +25,7 @@ interface RecordRepo {
 
     suspend fun getFromRangeByType(typeIds: List<Long>, range: Range): List<Record>
 
-    suspend fun getPrev(timeStarted: Long): Record?
+    suspend fun getPrev(timeStarted: Long, ignoreTypeIds: List<Long> = emptyList()): Record?
 
     suspend fun getNext(timeEnded: Long): Record?