Uncomplete subtasks after scheduling repeat

app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt

@@ -0,0 +1,52 @@
+package com.todoroo.astrid.repeats
+
+import com.google.ical.values.RRule
+import com.natpryce.makeiteasy.MakeItEasy.with
+import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.UninstallModules
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.tasks.data.TaskDao
+import org.tasks.injection.InjectingTestCase
+import org.tasks.injection.ProductionModule
+import org.tasks.makers.TaskMaker.COMPLETION_TIME
+import org.tasks.makers.TaskMaker.PARENT
+import org.tasks.makers.TaskMaker.RRULE
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTime
+import javax.inject.Inject
+
+@UninstallModules(ProductionModule::class)
+@HiltAndroidTest
+class RepeatWithSubtasksTests : InjectingTestCase() {
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var repeat: RepeatTaskHelper
+
+    @Test
+    fun uncompleteGrandchildren() = runBlocking {
+        val grandparent = taskDao.createNew(newTask(with(RRULE, RRule("RRULE:FREQ=DAILY"))))
+        val parent = taskDao.createNew(newTask(with(PARENT, grandparent)))
+        val child = taskDao.createNew(newTask(
+                with(PARENT, parent),
+                with(COMPLETION_TIME, DateTime())
+        ))
+
+        repeat.handleRepeat(taskDao.fetch(grandparent)!!)
+
+        assertFalse(taskDao.fetch(child)!!.isCompleted)
+    }
+
+    @Test
+    fun uncompleteGoogleTaskChildren() = runBlocking {
+        val parent = taskDao.createNew(newTask(with(RRULE, RRule("RRULE:FREQ=DAILY"))))
+        val child = taskDao.createNew(newTask(
+                with(PARENT, parent),
+                with(COMPLETION_TIME, DateTime())
+        ))
+
+        repeat.handleRepeat(taskDao.fetch(parent)!!)
+
+        assertFalse(taskDao.fetch(child)!!.isCompleted)
+    }
+}

app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.kt

@@ -13,6 +13,7 @@ import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.data.Task
 import com.todoroo.astrid.data.Task.Companion.createDueDate
 import com.todoroo.astrid.gcal.GCalHelper
+import com.todoroo.astrid.service.TaskCompleter
 import org.tasks.LocalBroadcastManager
 import org.tasks.date.DateTimeUtils.newDate
 import org.tasks.date.DateTimeUtils.newDateTime
@@ -27,7 +28,9 @@ class RepeatTaskHelper @Inject constructor(
         private val gcalHelper: GCalHelper,
         private val alarmService: AlarmService,
         private val taskDao: TaskDao,
-        private val localBroadcastManager: LocalBroadcastManager) {
+        private val localBroadcastManager: LocalBroadcastManager,
+        private val taskCompleter: TaskCompleter,
+) {
     suspend fun handleRepeat(task: Task) {
         val recurrence = task.sanitizedRecurrence()
         val repeatAfterCompletion = task.repeatAfterCompletion()
@@ -68,6 +71,7 @@ class RepeatTaskHelper @Inject constructor(
                             .takeIf { it > 0 }
                             ?: newDueDate - (computeNextDueDate(task, recurrence, repeatAfterCompletion) - newDueDate)
             alarmService.rescheduleAlarms(task.id, previousDueDate, newDueDate)
+            taskCompleter.completeChildren(task.id, 0L)
             localBroadcastManager.broadcastRepeat(task.id, previousDueDate, newDueDate)
         }
     }

app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt

@@ -20,13 +20,19 @@ class TaskCompleter @Inject internal constructor(
     suspend fun setComplete(item: Task, completed: Boolean) {
         val completionDate = if (completed) DateUtilities.now() else 0L
         setComplete(listOf(item), completionDate)
-        val tasks = googleTaskDao.getChildTasks(item.id)
+        completeChildren(item.id, completionDate)
-                .plus(taskDao.getChildren(item.id)
+    }
+
+    suspend fun completeChildren(id: Long, completionDate: Long) {
+        googleTaskDao
+                .getChildTasks(id)
+                .plus(taskDao.getChildren(id)
                         .takeIf { it.isNotEmpty() }
                         ?.let { taskDao.fetch(it) }
-                        ?: emptyList())
+                        ?: emptyList()
-                .filter { it.isCompleted != completed }
+                )
-        setComplete(tasks, completionDate)
+                .filter { it.isCompleted != completionDate > 0 }
+                .let { setComplete(it, completionDate)}
     }
 
     private suspend fun setComplete(tasks: List<Task>, completionDate: Long) {

app/src/test/java/com/todoroo/astrid/repeats/RepeatTaskHelperTest.kt

@@ -7,6 +7,7 @@ import com.todoroo.astrid.alarms.AlarmService
 import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.data.Task
 import com.todoroo.astrid.gcal.GCalHelper
+import com.todoroo.astrid.service.TaskCompleter
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -35,6 +36,7 @@ class RepeatTaskHelperTest {
     private lateinit var gCalHelper: GCalHelper
     private lateinit var helper: RepeatTaskHelper
     private lateinit var mocks: InOrder
+    private lateinit var taskCompleter: TaskCompleter
 
     @Before
     fun setUp() {
@@ -42,8 +44,9 @@ class RepeatTaskHelperTest {
         alarmService = Mockito.mock(AlarmService::class.java)
         gCalHelper = Mockito.mock(GCalHelper::class.java)
         localBroadcastManager = Mockito.mock(LocalBroadcastManager::class.java)
+        taskCompleter = Mockito.mock(TaskCompleter::class.java)
         mocks = Mockito.inOrder(alarmService, gCalHelper, localBroadcastManager)
-        helper = RepeatTaskHelper(gCalHelper, alarmService, taskDao, localBroadcastManager)
+        helper = RepeatTaskHelper(gCalHelper, alarmService, taskDao, localBroadcastManager, taskCompleter)
     }
 
     @After
@@ -190,14 +193,8 @@ class RepeatTaskHelperTest {
         freezeClock {
             repeatAndVerify(
                     task,
-                    Task.createDueDate(
+                    Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, DateTime().millis),
-                            Task.URGENCY_SPECIFIC_DAY,
+                    Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, DateTime().plusDays(1).millis)
-                            DateTime().millis
-                    ),
-                    Task.createDueDate(
-                            Task.URGENCY_SPECIFIC_DAY,
-                            DateTime().plusDays(1).millis
-                    )
             )
         }
     }