[feat] ToDo 생성 서버통신

app/src/main/java/com/example/howdroid/data/datasource/remote/ToDoDataSource.kt

@@ -1,5 +1,6 @@
 package com.example.howdroid.data.datasource.remote
 
+import com.example.howdroid.data.model.request.RequestAddToDoDto
 import com.example.howdroid.data.service.ToDoService
 import javax.inject.Inject
 
@@ -8,4 +9,7 @@ class ToDoDataSource @Inject constructor(
 ) {
     suspend fun checkToDo(toDoId: Long) =
         toDoService.checkToDo(toDoId)
+
+    suspend fun addToDo(requestAddToDoDto: RequestAddToDoDto) =
+        toDoService.addToDo(requestAddToDoDto)
 }

app/src/main/java/com/example/howdroid/data/model/request/RequestAddToDoDto.kt

@@ -0,0 +1,16 @@
+package com.example.howdroid.data.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestAddToDoDto(
+    @SerialName("priority")
+    val priority: String,
+    @SerialName("selectedDate")
+    val selectedDate: String,
+    @SerialName("todo")
+    val todo: String,
+    @SerialName("todoCategoryId")
+    val todoCategoryId: Int,
+)

app/src/main/java/com/example/howdroid/data/repository/ToDoRepositoryImpl.kt

@@ -1,6 +1,7 @@
 package com.example.howdroid.data.repository
 
 import com.example.howdroid.data.datasource.remote.ToDoDataSource
+import com.example.howdroid.data.model.request.RequestAddToDoDto
 import com.example.howdroid.domain.repository.ToDoRepository
 import javax.inject.Inject
 
@@ -9,4 +10,7 @@ class ToDoRepositoryImpl @Inject constructor(
 ) : ToDoRepository {
     override suspend fun checkToDo(toDoId: Long): Result<Unit> =
         runCatching { toDoDataSource.checkToDo(toDoId) }
+
+    override suspend fun addToDo(requestAddToDoDto: RequestAddToDoDto): Result<Unit> =
+        runCatching { toDoDataSource.addToDo(requestAddToDoDto) }
 }

app/src/main/java/com/example/howdroid/data/service/ToDoService.kt

@@ -1,11 +1,19 @@
 package com.example.howdroid.data.service
 
+import com.example.howdroid.data.model.request.RequestAddToDoDto
+import retrofit2.http.Body
 import retrofit2.http.PATCH
+import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface ToDoService {
     @PATCH("todo/check/{todoId}")
     suspend fun checkToDo(
         @Path("todoId") todoId: Long,
     )
+
+    @POST("todo/assign")
+    suspend fun addToDo(
+        @Body requestAddToDoDto: RequestAddToDoDto,
+    )
 }

app/src/main/java/com/example/howdroid/domain/repository/ToDoRepository.kt

@@ -1,6 +1,10 @@
 package com.example.howdroid.domain.repository
 
+import com.example.howdroid.data.model.request.RequestAddToDoDto
+
 interface ToDoRepository {
 
     suspend fun checkToDo(toDoId: Long): Result<Unit>
+
+    suspend fun addToDo(requestAddToDoDto: RequestAddToDoDto): Result<Unit>
 }

app/src/main/java/com/example/howdroid/presentation/AddToDoActivity.kt

@@ -9,18 +9,25 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.example.howdroid.R
 import com.example.howdroid.databinding.ActivityAddTodoBinding
+import com.example.howdroid.presentation.home.HomeFragment.Companion.CATEGORY_ID
+import com.example.howdroid.presentation.home.HomeFragment.Companion.SELECTED_DATE
 import com.example.howdroid.presentation.type.PriorityType
 import com.example.howdroid.util.UiState
 import com.example.howdroid.util.binding.BindingActivity
+import com.example.howdroid.util.extension.setOnSingleClickListener
 import com.example.howdroid.util.extension.setVisible
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlin.properties.Delegates
 
+@AndroidEntryPoint
 class AddToDoActivity : BindingActivity<ActivityAddTodoBinding>(R.layout.activity_add_todo) {
 
     private val addToDoViewModel: AddToDoViewModel by viewModels()
-
     private val errorMessageTextView by lazy { binding.tvAddTodoErrorMessage }
+    lateinit var selectedDate: String
+    var categoryId by Delegates.notNull<Int>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -29,6 +36,20 @@ class AddToDoActivity : BindingActivity<ActivityAddTodoBinding>(R.layout.activit
         setTextChangeListeners()
         setPriorityType()
         observePriorityType()
+        postAddToDo()
+    }
+
+    private fun postAddToDo() {
+        selectedDate = intent.extras?.getString(SELECTED_DATE).toString()
+        categoryId = intent.extras?.getInt(CATEGORY_ID) ?: 0
+
+        binding.btnAddTodoDone.setOnSingleClickListener {
+            addToDoViewModel.addTodo(
+                selectedDate,
+                binding.etAddTodo.text.toString(),
+                categoryId,
+            )
+        }
     }
 
     private fun observePriorityType() {

app/src/main/java/com/example/howdroid/presentation/AddToDoViewModel.kt

@@ -3,13 +3,22 @@ package com.example.howdroid.presentation
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.howdroid.data.model.request.RequestAddToDoDto
+import com.example.howdroid.domain.repository.ToDoRepository
 import com.example.howdroid.presentation.signup.SignUpViewModel
 import com.example.howdroid.presentation.type.PriorityType
 import com.example.howdroid.util.UiState
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-class AddToDoViewModel : ViewModel() {
+@HiltViewModel
+class AddToDoViewModel @Inject constructor(
+    private val toDoRepository: ToDoRepository,
+) : ViewModel() {
     private val _priorityType = MutableStateFlow<PriorityType?>(null)
     val priorityType get() = _priorityType.asStateFlow()
 
@@ -19,6 +28,19 @@ class AddToDoViewModel : ViewModel() {
     private val _isButtonEnabled = MutableLiveData<Boolean>()
     val isButtonEnabled: LiveData<Boolean> = _isButtonEnabled
 
+    fun addTodo(selectedDate: String, todo: String, todoCategoryId: Int) {
+        viewModelScope.launch {
+            toDoRepository.addToDo(
+                RequestAddToDoDto(
+                    _priorityType.value?.typeString.toString(),
+                    selectedDate,
+                    todo,
+                    todoCategoryId,
+                ),
+            )
+        }
+    }
+
     fun setSelectedPriorityType(priorityType: PriorityType) {
         _priorityType.value = priorityType
         checkButtonEnabled()

app/src/main/java/com/example/howdroid/presentation/home/HomeFragment.kt

@@ -33,8 +33,10 @@ class HomeFragment :
     private val homeViewModel by viewModels<HomeViewModel>()
     private val outerAdapter by lazy {
         HomeTodoOuterAdapter(
-            moveToAddToDo = {
-                findNavController().navigate(R.id.navigation_addToDo)
+            moveToAddToDo = { categoryId ->
+                val bundle = putDataToBundle()
+                bundle.putInt(CATEGORY_ID, categoryId)
+                findNavController().navigate(R.id.navigation_addToDo, bundle)
             },
             onInnerItemClick = this,
             onInnerToDoCheck = this,
@@ -91,15 +93,18 @@ class HomeFragment :
 
     private fun showPutFailTagBottomFragment() {
         val bottomSheetFragment = PutFailTagBottomSheetFragment()
-            .apply {
-                val bundle = Bundle()
-                bundle.putString(SELECTED_DATE, homeViewModel.selectedDate.value)
-                arguments = bundle
-            }
+            .apply { putDataToBundle() }
         bottomSheetFragment.show(childFragmentManager, bottomSheetFragment.tag)
         binding.clHomeAddCategory.setVisible(GONE)
     }
 
+    private fun putDataToBundle(): Bundle {
+        val bundle = Bundle()
+        bundle.putString(SELECTED_DATE, homeViewModel.selectedDate.value)
+        arguments = bundle
+        return bundle
+    }
+
     private fun showAddCategory() {
         with(binding) {
             tvHomeAddCategoty.setOnSingleClickListener {
@@ -176,5 +181,6 @@ class HomeFragment :
     companion object {
         const val TAG = "homeBottomSheetFragmentTag"
         const val SELECTED_DATE = "selectedDate"
+        const val CATEGORY_ID = "categoryId"
     }
 }

app/src/main/java/com/example/howdroid/presentation/home/HomeTodoOuterAdapter.kt

@@ -12,7 +12,7 @@ import com.example.howdroid.util.extension.setOnSingleClickListener
 class HomeTodoOuterAdapter(
     private val onInnerItemClick: TodoOptionClickListener,
     private val onInnerToDoCheck: TodoCheckClickListener,
-    private val moveToAddToDo: (Unit) -> Unit,
+    private val moveToAddToDo: (Int) -> Unit,
 ) :
     ListAdapter<Home.TodoCategoryData, HomeTodoOuterAdapter.HomeTodoOuterViewHolder>(
         ItemDiffCallback<Home.TodoCategoryData>(
@@ -51,7 +51,7 @@ class HomeTodoOuterAdapter(
                 home.todoData,
             )
             binding.tvHomeCategoryAdd.setOnSingleClickListener {
-                moveToAddToDo(Unit)
+                moveToAddToDo(home.todoCategoryId)
             }
         }
     }

app/src/main/java/com/example/howdroid/presentation/type/PriorityType.kt

@@ -1,5 +1,15 @@
 package com.example.howdroid.presentation.type
 
-enum class PriorityType {
-    MOST_IMPORTANT, IMPORTANT, NOT_IMPORTANT
+enum class PriorityType(
+    val typeString: String,
+) {
+    MOST_IMPORTANT(
+        "매우중요",
+    ),
+    IMPORTANT(
+        "중요",
+    ),
+    NOT_IMPORTANT(
+        "중요하지 않음",
+    ),
 }

app/src/main/res/values/strings.xml

@@ -53,6 +53,9 @@
     <string name="add_todo_hint">15자 이하로 입력해 주세요</string>
     <string name="add_todo_priority_title">우선 순위를 정해볼까요?</string>
     <string name="add_todo_done">완료</string>
+    <string name="add_todo_most_important">매우중요</string>
+    <string name="add_todo_important">중요</string>
+    <string name="add_todo_not_important">중요하지 않음</string>
 
     <!--  chart  -->
     <string name="chart_statistic_title">통계</string>