fix multitasking calculation in detailed stats

Author: Razeeman

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

@@ -17,7 +17,6 @@ import com.example.util.simpletimetracker.domain.record.extension.hasMultitaskFi
 import com.example.util.simpletimetracker.domain.record.extension.hasNoComment
 import com.example.util.simpletimetracker.domain.record.extension.hasUntaggedItem
 import com.example.util.simpletimetracker.domain.record.extension.hasUntrackedFilter
-import com.example.util.simpletimetracker.domain.extension.orZero
 import com.example.util.simpletimetracker.domain.extension.toRange
 import com.example.util.simpletimetracker.domain.record.interactor.GetMultitaskRecordsInteractor
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
@@ -139,6 +138,11 @@ class RecordFilterInteractor @Inject constructor(
                     .map(RecordBase::toRange)
                 getUntrackedRecordsInteractor.get(range, records)
             }
+            hasMultitask -> {
+                val range = definedRanges.firstOrNull() ?: Range(0, 0)
+                val records = getAllRecords(range, runningRecords)
+                getMultitaskRecordsInteractor.get(records)
+            }
             typeIds.isNotEmpty() && definedRanges.isNotEmpty() -> {
                 val result = mutableMapOf<Long, Record>()
                 definedRanges
@@ -174,17 +178,12 @@ class RecordFilterInteractor @Inject constructor(
             }
             else -> interactor.getAll()
         }.let {
-            // For untracked filter running records are added separately.
-            if (hasUntracked) return@let it
-            val multitaskRecords = if (hasMultitask) {
-                // Need to calculate multitask on all records.
-                val range = definedRanges.firstOrNull() ?: Range(0, 0)
-                val records = getAllRecords(range, runningRecords)
-                getMultitaskRecordsInteractor.get(records)
+            // For these filter running records are added separately.
+            if (filters.hasUntrackedFilter() || filters.hasMultitaskFilter()) {
+                it
             } else {
-                emptyList()
+                it + runningRecords
             }
-            it + multitaskRecords + runningRecords
         }
 
         val duplicationIds: Map<Long, Boolean> = if (filters.hasDuplicationsFilter()) {
@@ -200,7 +199,7 @@ class RecordFilterInteractor @Inject constructor(
 
         fun RecordBase.selectedByActivity(): Boolean {
             if (typeIds.isEmpty()) return true
-            return this.typeIds.firstOrNull().orZero() in typeIds
+            return this.typeIds.any { it in typeIds }
         }
 
         fun RecordBase.filteredByActivity(): Boolean {

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

@@ -5,7 +5,9 @@ import com.example.util.simpletimetracker.domain.record.model.Record
 import com.example.util.simpletimetracker.domain.record.model.RecordBase
 import javax.inject.Inject
 
-class CalculateAdjacentActivitiesInteractor @Inject constructor() {
+class CalculateAdjacentActivitiesInteractor @Inject constructor(
+    private val getMultitaskRecordsInteractor: GetMultitaskRecordsInteractor,
+) {
 
     // TODO count multitask also
     // Doesn't count multitask activities.
@@ -47,34 +49,22 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
         }
     }
 
-    // TODO make more precise calculations?
     fun calculateMultitasking(
         typeId: Long,
         records: List<RecordBase>,
         maxCount: Int,
     ): List<CalculationResult> {
         val counts = mutableMapOf<Long, Long>()
 
-        val recordsSorted = records.sortedBy { it.timeStarted }
-        var currentRecord: RecordBase? = null
-        recordsSorted.forEach { record ->
-            val currentTimeStarted = currentRecord?.timeStarted
-            val currentTimeEnded = currentRecord?.timeEnded
-            if (currentTimeStarted != null &&
-                currentTimeEnded != null &&
-                // Find next records that was started after this one but before this one ends.
-                currentTimeStarted <= record.timeStarted &&
-                currentTimeEnded > record.timeStarted &&
-                // Cutoff short intersections.
-                currentTimeEnded - record.timeStarted > 1_000L
-            ) {
-                record.typeIds.firstOrNull()?.let { id ->
+        getMultitaskRecordsInteractor.get(records).forEach { record ->
+            if (typeId !in record.typeIds) return@forEach
+            if (record.duration <= SHORT_MULTITASK_CUTOFF_MS) return@forEach
+
+            record.typeIds.forEach { id ->
+                if (id != typeId) {
                     counts[id] = counts[id].orZero() + 1
                 }
             }
-            if (typeId in record.typeIds) {
-                currentRecord = record
-            }
         }
 
         return counts.keys
@@ -87,4 +77,8 @@ class CalculateAdjacentActivitiesInteractor @Inject constructor() {
         val typeId: Long,
         val count: Long,
     )
+
+    companion object {
+        private const val SHORT_MULTITASK_CUTOFF_MS = 1_000L
+    }
 }

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/multitaskRecord/MultitaskRecordAdapterDelegate.kt

@@ -1,7 +1,6 @@
 package com.example.util.simpletimetracker.feature_base_adapter.multitaskRecord
 
 import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
-import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemMultitaskRecordLayoutBinding as Binding
 import com.example.util.simpletimetracker.feature_base_adapter.multitaskRecord.MultitaskRecordViewData as ViewData
 

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/recordTypeSuggestion/RecordTypeSuggestionAdapterDelegate.kt

@@ -5,7 +5,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerBindi
 import com.example.util.simpletimetracker.feature_base_adapter.RecyclerAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
-import com.example.util.simpletimetracker.feature_base_adapter.recordTypeSuggestion.RecordTypeSuggestionViewData
 import com.example.util.simpletimetracker.feature_views.TransitionNames
 import com.example.util.simpletimetracker.feature_views.extension.layoutInflater
 import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemRecordTypeLayoutBinding as BaseBinding
@@ -15,7 +14,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.recordTypeSuggest
 // Wrapper around RecordType delegate.
 // Passes all calls to other delegate.
 fun createRecordTypeSuggestionAdapterDelegate(
-    type: RecordTypeSuggestionViewData.Type,
+    type: ViewData.Type,
     onItemClick: ((BaseViewData) -> Unit)? = null,
     onItemLongClick: ((BaseViewData, Pair<Any, String>) -> Unit)? = null,
     withTransition: Boolean = true,

features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterExcludeInteractorImpl.kt

@@ -31,7 +31,6 @@ class RecordsFilterExcludeInteractorImpl @Inject constructor(
         type: ExcludeType,
         currentFilters: List<RecordsFilter>,
     ): List<RecordsFilter> {
-        // TODO multitasking filter by Read doesn't work.
         // Shouldn't be possible
         if (id == UNTRACKED_ITEM_ID) return currentFilters
 

features/feature_records_filter/src/main/java/com/example/util/simpletimetracker/feature_records_filter/interactor/RecordsFilterViewDataInteractor.kt

@@ -465,7 +465,6 @@ class RecordsFilterViewDataInteractor @Inject constructor(
                             it.copy(type = CategoryFilteredType)
                         }
                     }
-
                 } else {
                     result += HintViewData(resourceRepo.getString(R.string.change_record_type_categories_empty))
                 }