Refactor edit task UI code to use domain model instead of DTO (#909)

Author: EdricChan03

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/edit/ui/compat/EditTaskFragment.kt

@@ -14,16 +14,15 @@ import androidx.lifecycle.lifecycleScope
 import com.edricchan.studybuddy.exts.android.showToast
 import com.edricchan.studybuddy.exts.datetime.format
 import com.edricchan.studybuddy.exts.datetime.toLocalDateTime
-import com.edricchan.studybuddy.exts.firebase.toLocalDateTime
 import com.edricchan.studybuddy.exts.firebase.toTimestamp
 import com.edricchan.studybuddy.exts.material.picker.setCalendarConstraints
 import com.edricchan.studybuddy.exts.material.picker.setSelection
 import com.edricchan.studybuddy.exts.material.picker.setStart
 import com.edricchan.studybuddy.exts.material.picker.showMaterialDatePicker
 import com.edricchan.studybuddy.exts.material.textfield.editTextStrValue
 import com.edricchan.studybuddy.features.tasks.R
-import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
 import com.edricchan.studybuddy.features.tasks.databinding.FragEditTaskBinding
+import com.edricchan.studybuddy.features.tasks.domain.model.TaskItem
 import com.edricchan.studybuddy.features.tasks.edit.vm.EditTaskViewModel
 import com.edricchan.studybuddy.features.tasks.edit.vm.EditTaskViewModel.TaskState
 import com.edricchan.studybuddy.ui.common.fragment.ViewBindingFragment
@@ -48,7 +47,7 @@ class EditTaskFragment : ViewBindingFragment<FragEditTaskBinding>(FragEditTaskBi
     lateinit var auth: FirebaseAuth
 
     private var taskInstant: Instant? = null
-    private lateinit var todoItem: TodoItem
+    private lateinit var taskItem: TaskItem
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -126,12 +125,12 @@ class EditTaskFragment : ViewBindingFragment<FragEditTaskBinding>(FragEditTaskBi
                     is TaskState.Success -> binding.apply {
                         progressBar.isVisible = false
                         scrollView.isVisible = true
-                        todoItem = state.item
-                        with(todoItem) {
-                            title?.let { textInputTitle.editText?.setText(it) }
+                        taskItem = state.item
+                        with(taskItem) {
+                            textInputTitle.editText?.setText(title)
                             content?.let { textInputContent.editText?.setText(it) }
-                            done?.let { checkboxMarkAsDone.isChecked = it }
-                            taskInstant = dueDate?.toInstant()
+                            checkboxMarkAsDone.isChecked = isCompleted
+                            taskInstant = dueDate
                             dueDate?.let {
                                 // We need to convert it to a LocalDateTime as Instants don't support
                                 // temporal units bigger than days - see the `Instant#isSupported` Javadocs
@@ -161,27 +160,27 @@ class EditTaskFragment : ViewBindingFragment<FragEditTaskBinding>(FragEditTaskBi
 
         override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
             if (menuItem.itemId == R.id.action_save) {
-                val taskItemUpdates = buildMap<TodoItem.Field, Any> {
+                val taskItemUpdates = buildMap<TaskItem.Field, Any> {
                     binding.also {
-                        if (it.textInputTitle.editTextStrValue != todoItem.title) {
-                            this[TodoItem.Field.Title] = it.textInputTitle.editTextStrValue
+                        if (it.textInputTitle.editTextStrValue != taskItem.title) {
+                            this[TaskItem.Field.Title] = it.textInputTitle.editTextStrValue
                         }
-                        if (it.textInputContent.editTextStrValue != todoItem.content) {
-                            this[TodoItem.Field.Content] = it.textInputContent.editTextStrValue
+                        if (it.textInputContent.editTextStrValue != taskItem.content) {
+                            this[TaskItem.Field.Content] = it.textInputContent.editTextStrValue
                         }
-                        this[TodoItem.Field.IsDone] = it.checkboxMarkAsDone.isChecked
-                        this[TodoItem.Field.Tags] = it.textInputTags.editTextStrValue.split(
+                        this[TaskItem.Field.IsCompleted] = it.checkboxMarkAsDone.isChecked
+                        this[TaskItem.Field.Tags] = it.textInputTags.editTextStrValue.split(
                             Regex("""\s*,\s*""")
                         ).filter(String::isNotBlank)
                     }
                     taskInstant?.let {
-                        if (todoItem.dueDate?.toInstant() != it) {
-                            this[TodoItem.Field.DueDate] = it.toTimestamp()
+                        if (taskItem.dueDate != it) {
+                            this[TaskItem.Field.DueDate] = it.toTimestamp()
                         }
                         // When taskInstant is set to null, this means that the user
                         // wants to clear the due-date of the item
                     } ?: run {
-                        this[TodoItem.Field.DueDate] = FieldValue.delete()
+                        this[TaskItem.Field.DueDate] = FieldValue.delete()
                     }
                 }
 

features/tasks/src/main/kotlin/com/edricchan/studybuddy/features/tasks/edit/vm/EditTaskViewModel.kt

@@ -5,9 +5,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
 import com.edricchan.studybuddy.core.compat.navigation.CompatDestination
-import com.edricchan.studybuddy.features.tasks.data.model.TodoItem
 import com.edricchan.studybuddy.features.tasks.data.repo.TaskRepository
-import com.edricchan.studybuddy.features.tasks.data.repo.update
+import com.edricchan.studybuddy.features.tasks.domain.model.TaskItem
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
@@ -22,13 +21,13 @@ class EditTaskViewModel @Inject constructor(
 ) : ViewModel() {
     sealed interface TaskState {
         data object Loading : TaskState
-        data class Success(val item: TodoItem) : TaskState
+        data class Success(val item: TaskItem) : TaskState
         data object DoesNotExist : TaskState
     }
 
     val taskId = savedStateHandle.toRoute<CompatDestination.Task.Edit>().taskId
 
-    val taskDetail = repo.observeTask(taskId)
+    val taskDetail = repo.observeTaskById(taskId)
         .map {
             if (it == null) return@map TaskState.DoesNotExist
             TaskState.Success(it)
@@ -39,14 +38,12 @@ class EditTaskViewModel @Inject constructor(
         )
 
     fun updateTask(
-        data: Map<TodoItem.Field, Any>,
+        data: Map<TaskItem.Field, Any>,
         onSuccess: () -> Unit,
         onFailure: (Throwable) -> Unit
     ) {
         viewModelScope.launch {
-            repo.runCatching {
-                repo.update(taskId, data)
-            }
+            repo.runCatching { updateTask(taskId, data) }
                 .onSuccess { onSuccess() }
                 .onFailure(onFailure)
         }