allow deselect preselected tags

Author: Razeeman

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

@@ -75,6 +75,7 @@ class AddRunningRecordMediator @Inject constructor(
         timeStarted: StartTime = StartTime.TakeCurrent,
         updateNotificationSwitch: Boolean = true,
         checkDefaultDuration: Boolean = true,
+        useSelectedTags: Boolean = false,
     ) = coroutineScope {
         val currentTime = currentTimestampProvider.get()
         val actualTimeStarted = when (timeStarted) {
@@ -116,11 +117,15 @@ class AddRunningRecordMediator @Inject constructor(
                 is StartTime.Timestamp -> currentTime
             },
         )
-        val actualTags = getAllTags(
-            typeId = typeId,
-            currentTags = tags,
-            tagValuesFromRules = rulesResult.tags,
-        )
+        val actualTags = if (useSelectedTags) {
+            tags
+        } else {
+            getAllTags(
+                typeId = typeId,
+                currentTags = tags,
+                tagValuesFromRules = rulesResult.tags,
+            )
+        }
         activityStartedStoppedBroadcastInteractor.onActionActivityStarted(
             typeId = typeId,
             tagIds = actualTags.map { it.tagId },

domain/src/test/java/com/example/util/simpletimetracker/domain/mapper/AddRunningRecordMediatorTest.kt

@@ -155,6 +155,7 @@ class AddRunningRecordMediatorTest {
             timeStarted = eq(AddRunningRecordMediator.StartTime.TakeCurrent),
             updateNotificationSwitch = eq(true),
             checkDefaultDuration = eq(true),
+            useSelectedTags = eq(false),
         )
     }
 
@@ -186,6 +187,7 @@ class AddRunningRecordMediatorTest {
             timeStarted = any(),
             updateNotificationSwitch = any(),
             checkDefaultDuration = any(),
+            useSelectedTags = any(),
         )
     }
 
@@ -213,6 +215,7 @@ class AddRunningRecordMediatorTest {
             timeStarted = eq(AddRunningRecordMediator.StartTime.TakeCurrent),
             updateNotificationSwitch = eq(false),
             checkDefaultDuration = eq(true),
+            useSelectedTags = eq(false),
         )
     }
 
@@ -266,6 +269,36 @@ class AddRunningRecordMediatorTest {
         verify(pomodoroStartInteractor).checkAndStart(typeId)
     }
 
+    @Test
+    fun startTimerUseSelectedTags(): Unit = runBlocking {
+        val selectedTags = listOf(tag(tagId2, 2.5))
+
+        subject.startTimer(
+            typeId = typeId,
+            tags = selectedTags,
+            comment = "comment",
+            timeStarted = AddRunningRecordMediator.StartTime.TakeCurrent,
+            updateNotificationSwitch = true,
+            checkDefaultDuration = true,
+            useSelectedTags = true,
+        )
+
+        verify(recordTypeToDefaultTagInteractor, never()).getTags(any())
+        verify(activityStartedStoppedBroadcastInteractor).onActionActivityStarted(
+            typeId = typeId,
+            tagIds = selectedTags.map { it.tagId },
+            comment = "comment",
+        )
+        verify(runningRecordInteractor).add(
+            RunningRecord(
+                id = typeId,
+                timeStarted = currentTime,
+                comment = "comment",
+                tags = selectedTags,
+            ),
+        )
+    }
+
     @Test
     fun multitaskingEnabled(): Unit = runBlocking {
         // Given

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/interactor/ActivityStartStopFromBroadcastInteractor.kt

@@ -243,6 +243,7 @@ class ActivityStartStopFromBroadcastInteractor @Inject constructor(
             typeId = selectedTypeId,
             comment = "",
             tags = selectedTags,
+            useSelectedTags = true,
         )
     }
 

features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/viewModel/RecordTagSelectionViewModel.kt

@@ -148,6 +148,7 @@ class RecordTagSelectionViewModel @Inject constructor(
             typeId = extra.typeId,
             tags = newTags,
             comment = newComment,
+            useSelectedTags = true,
         )
         if (showAllTags) {
             addTagToTypeIfNotExistMediator.execute(
@@ -159,7 +160,6 @@ class RecordTagSelectionViewModel @Inject constructor(
     }
 
     // TODO TAG add check retroactive mode to loaded preselected tags?
-    // TODO TAG ability to deselect preselected tags
     private suspend fun initializeData() {
         if (initialDataLoaded) return
         newTags = loadPreselectedTagsInteractor.execute(extra.typeId)

features/feature_wear/src/main/java/com/example/util/simpletimetracker/feature_wear/WearDataRepo.kt

@@ -170,6 +170,7 @@ class WearDataRepo @Inject constructor(
                 )
             },
             comment = "",
+            useSelectedTags = true,
         )
         if (recordTypeInteractor.get(typeId)?.defaultDuration.orZero() > 0) {
             updateExternalViewsInteractor.get().onInstantRecordAdd()