CheoCharm#25 feat: 일기 작성 요청

data/src/main/java/com/cheocharm/data/repository/WriteRepositoryImpl.kt

@@ -4,6 +4,7 @@ import com.cheocharm.data.error.ErrorData
 import com.cheocharm.data.error.toDomain
 import com.cheocharm.data.source.WriteRemoteDataSource
 import com.cheocharm.domain.model.WriteDiaryRequest
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.domain.model.WriteImageRequest
 import com.cheocharm.domain.model.WriteImageResponse
 import com.cheocharm.domain.repository.WriteRepository
@@ -22,7 +23,7 @@ class WriteRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<Int> {
+    override suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<WriteDiaryResponse> {
         val result = writeRemoteDataSource.requestWriteDiary(request)
 
         return when (val exception = result.exceptionOrNull()) {

data/src/main/java/com/cheocharm/data/source/WriteRemoteDataSource.kt

@@ -1,11 +1,12 @@
 package com.cheocharm.data.source
 
 import com.cheocharm.domain.model.WriteDiaryRequest
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.domain.model.WriteImageRequest
 import com.cheocharm.domain.model.WriteImageResponse
 
 interface WriteRemoteDataSource {
     suspend fun requestWriteImages(request: WriteImageRequest): Result<WriteImageResponse>
 
-    suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<Int>
+    suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<WriteDiaryResponse>
 }

domain/src/main/java/com/cheocharm/domain/model/WriteDiaryRequest.kt

@@ -1,7 +1,7 @@
 package com.cheocharm.domain.model
 
 data class WriteDiaryRequest(
-    val id: Int,
+    val id: Long,
     val title: String,
     val content: String
 )

domain/src/main/java/com/cheocharm/domain/model/WriteDiaryResponse.kt

@@ -0,0 +1,3 @@
+package com.cheocharm.domain.model
+
+data class WriteDiaryResponse(val diaryId: Long)

domain/src/main/java/com/cheocharm/domain/model/WriteImageResponse.kt

@@ -1,5 +1,3 @@
 package com.cheocharm.domain.model
 
-data class WriteImageResponse(val statusCode: Int, val customCode: String, val data: Data) {
-    inner class Data(val diary: Long, val imageURLs: List<String>, message: String)
-}
+data class WriteImageResponse(val diaryId: Long, val imageURLs: List<String>)

domain/src/main/java/com/cheocharm/domain/repository/WriteRepository.kt

@@ -1,11 +1,12 @@
 package com.cheocharm.domain.repository
 
 import com.cheocharm.domain.model.WriteDiaryRequest
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.domain.model.WriteImageRequest
 import com.cheocharm.domain.model.WriteImageResponse
 
 interface WriteRepository {
     suspend fun requestWriteImages(request: WriteImageRequest): Result<WriteImageResponse>
 
-    suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<Int>
+    suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<WriteDiaryResponse>
 }

domain/src/main/java/com/cheocharm/domain/usecase/write/RequestWriteDiaryUseCase.kt

@@ -1,12 +1,13 @@
 package com.cheocharm.domain.usecase.write
 
 import com.cheocharm.domain.model.WriteDiaryRequest
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.domain.repository.WriteRepository
 import javax.inject.Inject
 
 class RequestWriteDiaryUseCase @Inject constructor(
     private val repository: WriteRepository
 ) {
-    suspend operator fun invoke(request: WriteDiaryRequest): Result<Int> =
+    suspend operator fun invoke(request: WriteDiaryRequest): Result<WriteDiaryResponse> =
         repository.requestWriteDiary(request)
 }

presentation/src/main/java/com/cheocharm/presentation/model/Result.kt

@@ -1,3 +1,3 @@
 package com.cheocharm.presentation.model
 
-data class Result(val isSuccessful: Boolean, val message: String? = null)
+data class Result<T>(val isSuccessful: Boolean, val message: String? = null, val data: T? = null)

presentation/src/main/java/com/cheocharm/presentation/ui/write/LocationViewModel.kt

@@ -16,8 +16,8 @@ import javax.inject.Inject
 class LocationViewModel @Inject constructor(
     private val requestWriteImagesUseCase: RequestWriteImagesUseCase
 ) : ViewModel() {
-    private val _result = MutableLiveData<Result>()
-    val result: LiveData<Result> = _result
+    private val _result = MutableLiveData<Result<Long>>()
+    val result: LiveData<Result<Long>> = _result
 
     fun uploadImages(
         groupId: Long,
@@ -36,7 +36,7 @@ class LocationViewModel @Inject constructor(
                     images
                 )
             ).onSuccess {
-                _result.value = Result(true)
+                _result.value = Result(true, data = it.diaryId)
             }.onFailure {
                 _result.value = Result(false, it.message)
             }

presentation/src/main/java/com/cheocharm/presentation/ui/write/WriteFragment.kt

@@ -19,12 +19,16 @@ import com.cheocharm.presentation.R
 import com.cheocharm.presentation.base.BaseFragment
 import com.cheocharm.presentation.databinding.FragmentWriteBinding
 import com.cheocharm.presentation.ui.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
 import jp.wasabeef.richeditor.RichEditor
 
+@AndroidEntryPoint
 class WriteFragment : BaseFragment<FragmentWriteBinding>(R.layout.fragment_write), MenuProvider {
     private val locationViewModel: LocationViewModel by navGraphViewModels(R.id.write)
+    private val writeViewModel: WriteViewModel by navGraphViewModels(R.id.write) { defaultViewModelProviderFactory }
 
     private lateinit var editor: RichEditor
+    private var diaryId: Long? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -43,6 +47,7 @@ class WriteFragment : BaseFragment<FragmentWriteBinding>(R.layout.fragment_write
         locationViewModel.result.observe(viewLifecycleOwner) {
             if (it.isSuccessful) {
                 Log.d(javaClass.name, "이미지 업로드 성공")
+                diaryId = it.data
             } else {
                 Log.e(javaClass.name, "이미지 업로드 실패: ${it.message}")
             }
@@ -102,6 +107,14 @@ class WriteFragment : BaseFragment<FragmentWriteBinding>(R.layout.fragment_write
         binding.btnWritePicture.setOnClickListener {
             // TODO: 사진 목록
         }
+
+        writeViewModel.result.observe(viewLifecycleOwner) {
+            if (it.isSuccessful) {
+                Toast.makeText(context, "일기 작성 성공", Toast.LENGTH_SHORT).show()
+            } else {
+                Toast.makeText(context, "일기 작성 실패", Toast.LENGTH_SHORT).show()
+            }
+        }
     }
 
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
@@ -111,8 +124,16 @@ class WriteFragment : BaseFragment<FragmentWriteBinding>(R.layout.fragment_write
     override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
         return when (menuItem.itemId) {
             R.id.menu_base_confirm -> {
-                // TODO: POST 요청 및 일기 상세 화면으로 이동
-                println(editor.html)
+                // TODO: 일기 작성 완료 화면으로 이동
+
+                diaryId?.let {
+                    writeViewModel.writeDiary(
+                        it,
+                        binding.etWriteTitle.text.toString(),
+                        editor.html ?: ""
+                    )
+                }
+
                 true
             }
             else -> false

remote/src/main/java/com/cheocharm/remote/api/WriteApi.kt

@@ -1,5 +1,6 @@
 package com.cheocharm.remote.api
 
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.remote.model.BaseResponse
 import com.cheocharm.remote.model.response.write.MyGroup
 import retrofit2.http.GET

remote/src/main/java/com/cheocharm/remote/model/request/WriteDiaryDto.kt

@@ -1,9 +1,7 @@
 package com.cheocharm.remote.model.request
 
-import com.google.gson.annotations.SerializedName
-
 data class WriteDiaryDto(
-    @SerializedName("diary_id") val id: Int,
+    val diaryId: Long,
     val title: String,
-    @SerializedName("html_content") val html: String
+    val content: String
 )

remote/src/main/java/com/cheocharm/remote/source/WriteRemoteDataSourceImpl.kt

@@ -3,6 +3,7 @@ package com.cheocharm.remote.source
 import com.cheocharm.data.error.ErrorData
 import com.cheocharm.data.source.WriteRemoteDataSource
 import com.cheocharm.domain.model.WriteDiaryRequest
+import com.cheocharm.domain.model.WriteDiaryResponse
 import com.cheocharm.domain.model.WriteImageRequest
 import com.cheocharm.remote.api.WriteApi
 import com.cheocharm.remote.mapper.toDto
@@ -40,7 +41,7 @@ class WriteRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<Int> {
+    override suspend fun requestWriteDiary(request: WriteDiaryRequest): Result<WriteDiaryResponse> {
         val result = runCatching { api.writeDiary(request.toDto()) }
 
         return when (val exception = result.exceptionOrNull()) {