[FEAT/#68] 생성완료뷰 / 오류 신고 서버통신

data/src/main/java/kr/genti/data/dataSource/GenerateDataSource.kt

@@ -1,6 +1,7 @@
 package kr.genti.data.dataSource
 
 import kr.genti.data.dto.BaseResponse
+import kr.genti.data.dto.request.ReportRequestDto
 import kr.genti.data.dto.response.GenerateStatusDto
 import kr.genti.data.dto.response.PicturePagedListDto
 
@@ -13,4 +14,6 @@ interface GenerateDataSource {
         sortBy: String?,
         direction: String?,
     ): BaseResponse<PicturePagedListDto>
+
+    suspend fun postGenerateReport(request: ReportRequestDto): BaseResponse<Boolean>
 }

data/src/main/java/kr/genti/data/dataSourceImpl/GenerateDataSourceImpl.kt

@@ -2,6 +2,7 @@ package kr.genti.data.dataSourceImpl
 
 import kr.genti.data.dataSource.GenerateDataSource
 import kr.genti.data.dto.BaseResponse
+import kr.genti.data.dto.request.ReportRequestDto
 import kr.genti.data.dto.response.GenerateStatusDto
 import kr.genti.data.dto.response.PicturePagedListDto
 import kr.genti.data.service.GenerateService
@@ -20,4 +21,7 @@ data class GenerateDataSourceImpl
             sortBy: String?,
             direction: String?,
         ): BaseResponse<PicturePagedListDto> = generateService.getGeneratedPictureList(page, size, sortBy, direction)
+
+        override suspend fun postGenerateReport(request: ReportRequestDto): BaseResponse<Boolean> =
+            generateService.postGenerateReport(request)
     }

data/src/main/java/kr/genti/data/dto/request/CreateRequestDto.kt

@@ -2,6 +2,7 @@ package kr.genti.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kr.genti.data.dto.request.KeyRequestDto.Companion.toDto
 import kr.genti.domain.entity.request.CreateRequestModel
 import kr.genti.domain.enums.CameraAngle
 import kr.genti.domain.enums.PictureRatio
@@ -12,23 +13,25 @@ data class CreateRequestDto(
     @SerialName("prompt")
     val prompt: String,
     @SerialName("posePicture")
-    val posePicture: KeyDto?,
+    val posePicture: KeyRequestDto?,
     @SerialName("facePictureList")
-    val facePictureList: List<KeyDto>,
+    val facePictureList: List<KeyRequestDto>,
     @SerialName("cameraAngle")
     val cameraAngle: CameraAngle,
     @SerialName("shotCoverage")
     val shotCoverage: ShotCoverage,
     @SerialName("pictureRatio")
     val pictureRatio: PictureRatio,
-)
-
-fun CreateRequestModel.toDto() =
-    CreateRequestDto(
-        prompt,
-        posePicture?.toDto(),
-        facePictureList.map { it.toDto() },
-        cameraAngle,
-        shotCoverage,
-        pictureRatio,
-    )
+) {
+    companion object {
+        fun CreateRequestModel.toDto() =
+            CreateRequestDto(
+                prompt,
+                posePicture?.toDto(),
+                facePictureList.map { it.toDto() },
+                cameraAngle,
+                shotCoverage,
+                pictureRatio,
+            )
+    }
+}

data/src/main/java/kr/genti/data/dto/request/KeyDto.kt → data/src/main/java/kr/genti/data/dto/request/KeyRequestDto.kt

@@ -2,12 +2,14 @@ package kr.genti.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kr.genti.domain.entity.request.KeyModel
+import kr.genti.domain.entity.request.KeyRequestModel
 
 @Serializable
-data class KeyDto(
+data class KeyRequestDto(
     @SerialName("key")
     val key: String?,
-)
-
-fun KeyModel.toDto() = KeyDto(key)
+) {
+    companion object {
+        fun KeyRequestModel.toDto() = KeyRequestDto(key)
+    }
+}

data/src/main/java/kr/genti/data/dto/request/ReportRequestDto.kt

@@ -0,0 +1,17 @@
+package kr.genti.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kr.genti.domain.entity.request.ReportRequestModel
+
+@Serializable
+data class ReportRequestDto(
+    @SerialName("pictureGenerateResponseId")
+    val pictureGenerateResponseId: Long,
+    @SerialName("content")
+    val content: String,
+) {
+    companion object {
+        fun ReportRequestModel.toDto() = ReportRequestDto(pictureGenerateResponseId, content)
+    }
+}

data/src/main/java/kr/genti/data/dto/request/S3RequestDto.kt

@@ -11,6 +11,8 @@ data class S3RequestDto(
     val fileType: FileType,
     @SerialName("fileName")
     val fileName: String,
-)
-
-fun S3RequestModel.toDto() = S3RequestDto(fileType, fileName)
+) {
+    companion object {
+        fun S3RequestModel.toDto() = S3RequestDto(fileType, fileName)
+    }
+}

data/src/main/java/kr/genti/data/dto/request/TokenRequestDto.kt

@@ -8,6 +8,8 @@ import kr.genti.domain.entity.request.TokenRequestModel
 data class TokenRequestDto(
     @SerialName("userId")
     val userId: Long,
-)
-
-fun TokenRequestModel.toDto() = TokenRequestDto(userId)
+) {
+    companion object {
+        fun TokenRequestModel.toDto() = TokenRequestDto(userId)
+    }
+}

data/src/main/java/kr/genti/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package kr.genti.data.repositoryImpl
 
 import kr.genti.data.dataSource.AuthDataSource
-import kr.genti.data.dto.request.toDto
+import kr.genti.data.dto.request.TokenRequestDto.Companion.toDto
 import kr.genti.domain.entity.request.TokenRequestModel
 import kr.genti.domain.entity.response.AuthTokenModel
 import kr.genti.domain.repository.AuthRepository

data/src/main/java/kr/genti/data/repositoryImpl/CreateRepositoryImpl.kt

@@ -1,7 +1,8 @@
 package kr.genti.data.repositoryImpl
 
 import kr.genti.data.dataSource.CreateDataSource
-import kr.genti.data.dto.request.toDto
+import kr.genti.data.dto.request.CreateRequestDto.Companion.toDto
+import kr.genti.data.dto.request.S3RequestDto.Companion.toDto
 import kr.genti.domain.entity.request.CreateRequestModel
 import kr.genti.domain.entity.request.S3RequestModel
 import kr.genti.domain.entity.response.S3PresignedUrlModel

data/src/main/java/kr/genti/data/repositoryImpl/GenerateRepositoryImpl.kt

@@ -1,6 +1,8 @@
 package kr.genti.data.repositoryImpl
 
 import kr.genti.data.dataSource.GenerateDataSource
+import kr.genti.data.dto.request.ReportRequestDto.Companion.toDto
+import kr.genti.domain.entity.request.ReportRequestModel
 import kr.genti.domain.entity.response.GenerateStatusModel
 import kr.genti.domain.entity.response.PicturePagedListModel
 import kr.genti.domain.repository.GenerateRepository
@@ -30,4 +32,9 @@ class GenerateRepositoryImpl
                     direction,
                 ).response.toModel()
             }
+
+        override suspend fun postGenerateReport(request: ReportRequestModel): Result<Boolean> =
+            runCatching {
+                generateDataSource.postGenerateReport(request.toDto()).response
+            }
     }

data/src/main/java/kr/genti/data/service/GenerateService.kt

@@ -1,9 +1,12 @@
 package kr.genti.data.service
 
 import kr.genti.data.dto.BaseResponse
+import kr.genti.data.dto.request.ReportRequestDto
 import kr.genti.data.dto.response.GenerateStatusDto
 import kr.genti.data.dto.response.PicturePagedListDto
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
 import retrofit2.http.Query
 
 interface GenerateService {
@@ -17,4 +20,9 @@ interface GenerateService {
         @Query("sortBy") sortBy: String?,
         @Query("direction") direction: String?,
     ): BaseResponse<PicturePagedListDto>
+
+    @POST("/api/users/reports")
+    suspend fun postGenerateReport(
+        @Body request: ReportRequestDto,
+    ): BaseResponse<Boolean>
 }

domain/src/main/kotlin/kr/genti/domain/entity/request/CreateRequestModel.kt

@@ -6,8 +6,8 @@ import kr.genti.domain.enums.ShotCoverage
 
 data class CreateRequestModel(
     val prompt: String,
-    val posePicture: KeyModel?,
-    val facePictureList: List<KeyModel>,
+    val posePicture: KeyRequestModel?,
+    val facePictureList: List<KeyRequestModel>,
     val cameraAngle: CameraAngle,
     val shotCoverage: ShotCoverage,
     val pictureRatio: PictureRatio,

domain/src/main/kotlin/kr/genti/domain/entity/request/KeyModel.kt → domain/src/main/kotlin/kr/genti/domain/entity/request/KeyRequestModel.kt

@@ -1,5 +1,5 @@
 package kr.genti.domain.entity.request
 
-data class KeyModel(
+data class KeyRequestModel(
     val key: String?,
 )

domain/src/main/kotlin/kr/genti/domain/entity/request/ReportRequestModel.kt

@@ -0,0 +1,6 @@
+package kr.genti.domain.entity.request
+
+data class ReportRequestModel(
+    val pictureGenerateResponseId: Long,
+    val content: String,
+)

domain/src/main/kotlin/kr/genti/domain/repository/GenerateRepository.kt

@@ -1,5 +1,6 @@
 package kr.genti.domain.repository
 
+import kr.genti.domain.entity.request.ReportRequestModel
 import kr.genti.domain.entity.response.GenerateStatusModel
 import kr.genti.domain.entity.response.PicturePagedListModel
 
@@ -12,4 +13,6 @@ interface GenerateRepository {
         sortBy: String?,
         direction: String?,
     ): Result<PicturePagedListModel>
+
+    suspend fun postGenerateReport(request: ReportRequestModel): Result<Boolean>
 }

presentation/src/main/java/kr/genti/presentation/main/create/CreateViewModel.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kr.genti.core.state.UiState
 import kr.genti.domain.entity.request.CreateRequestModel
-import kr.genti.domain.entity.request.KeyModel
+import kr.genti.domain.entity.request.KeyRequestModel
 import kr.genti.domain.entity.request.S3RequestModel
 import kr.genti.domain.entity.response.ImageFileModel
 import kr.genti.domain.entity.response.ImageFileModel.Companion.emptyImageFileModel
@@ -51,8 +51,8 @@ class CreateViewModel
         val totalGeneratingState: StateFlow<UiState<Boolean>> = _totalGeneratingState
 
         private var uploadCheckList = mutableListOf(false, false, false, true)
-        private var plusImageS3Key = KeyModel(null)
-        private var imageS3KeyList = listOf<KeyModel>()
+        private var plusImageS3Key = KeyRequestModel(null)
+        private var imageS3KeyList = listOf<KeyRequestModel>()
 
         fun modCurrentPercent(amount: Int) {
             _currentPercent.value += amount
@@ -99,7 +99,7 @@ class CreateViewModel
                         ),
                     )
                         .onSuccess { uriModel ->
-                            plusImageS3Key = KeyModel(uriModel.s3Key)
+                            plusImageS3Key = KeyRequestModel(uriModel.s3Key)
                             postSingleImage(uriModel)
                         }.onFailure {
                             _totalGeneratingState.value = UiState.Failure(it.message.toString())
@@ -117,7 +117,7 @@ class CreateViewModel
                         S3RequestModel(FileType.USER_UPLOADED_IMAGE, imageList[2].name),
                     ),
                 ).onSuccess { uriList ->
-                    imageS3KeyList = uriList.map { KeyModel(it.s3Key) }
+                    imageS3KeyList = uriList.map { KeyRequestModel(it.s3Key) }
                     postMultiImage(uriList)
                 }.onFailure {
                     _totalGeneratingState.value = UiState.Failure(it.message.toString())
@@ -129,7 +129,7 @@ class CreateViewModel
             viewModelScope.launch {
                 uploadRepository.uploadImage(s3urlModel.url, plusImage.url)
                     .onSuccess {
-                        plusImageS3Key = KeyModel(s3urlModel.s3Key)
+                        plusImageS3Key = KeyRequestModel(s3urlModel.s3Key)
                         uploadCheckList[3] = true
                         checkAllUploadFinished()
                     }.onFailure {

presentation/src/main/java/kr/genti/presentation/main/feed/FeedFragment.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kr.genti.core.base.BaseFragment
@@ -91,13 +92,14 @@ class FeedFragment() : BaseFragment<FragmentFeedBinding>(R.layout.fragment_feed)
     }
 
     private fun observeGetExampleItemsState() {
-        viewModel.getExampleItemsState.flowWithLifecycle(lifecycle).onEach { state ->
-            when (state) {
-                is UiState.Success -> adapter.addItemList(state.data)
-                is UiState.Failure -> toast(stringOf(R.string.error_msg))
-                else -> return@onEach
-            }
-        }.launchIn(lifecycleScope)
+        viewModel.getExampleItemsState.flowWithLifecycle(lifecycle).distinctUntilChanged()
+            .onEach { state ->
+                when (state) {
+                    is UiState.Success -> adapter.addItemList(state.data)
+                    is UiState.Failure -> toast(stringOf(R.string.error_msg))
+                    else -> return@onEach
+                }
+            }.launchIn(lifecycleScope)
     }
 
     override fun onDestroyView() {

presentation/src/main/java/kr/genti/presentation/main/profile/ProfileFragment.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kr.genti.core.base.BaseFragment
@@ -116,7 +117,7 @@ class ProfileFragment() : BaseFragment<FragmentProfileBinding>(R.layout.fragment
     }
 
     private fun observePictureListPageState() {
-        viewModel.getPictureListState.flowWithLifecycle(lifecycle).onEach { state ->
+        viewModel.getPictureListState.flowWithLifecycle(lifecycle).distinctUntilChanged().onEach { state ->
             when (state) {
                 is UiState.Success -> {
                     setLayoutEmpty(false)

presentation/src/main/java/kr/genti/presentation/result/finished/FinishedErrorDialog.kt

@@ -7,10 +7,16 @@ import android.view.View
 import android.view.WindowManager
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kr.genti.core.base.BaseDialog
 import kr.genti.core.extension.hideKeyboard
 import kr.genti.core.extension.setGusianBlur
 import kr.genti.core.extension.setOnSingleClickListener
+import kr.genti.core.extension.stringOf
+import kr.genti.core.extension.toast
 import kr.genti.presentation.R
 import kr.genti.presentation.databinding.DialogFinishedErrorBinding
 
@@ -36,9 +42,11 @@ class FinishedErrorDialog :
     ) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.vm = viewModel
         initExitBtnListener()
         initSubmitBtnListener()
         setHideKeyboard(view)
+        observeReportResult()
     }
 
     private fun initExitBtnListener() {
@@ -51,13 +59,7 @@ class FinishedErrorDialog :
 
     private fun initSubmitBtnListener() {
         binding.btnSubmit.setOnSingleClickListener {
-            // TODO: 서버통신
-            requireContext().hideKeyboard(requireView())
-            with(binding) {
-                layoutErrorInput.isVisible = false
-                layoutErrorOutput.isVisible = true
-                viewOutside.setOnSingleClickListener { dismiss() }
-            }
+            viewModel.postGenerateReport()
         }
     }
 
@@ -71,6 +73,21 @@ class FinishedErrorDialog :
         }
     }
 
+    private fun observeReportResult() {
+        viewModel.postReportResult.flowWithLifecycle(lifecycle).onEach { result ->
+            if (result) {
+                requireContext().hideKeyboard(requireView())
+                with(binding) {
+                    layoutErrorInput.isVisible = false
+                    layoutErrorOutput.isVisible = true
+                    viewOutside.setOnSingleClickListener { dismiss() }
+                }
+            } else {
+                toast(stringOf(R.string.error_msg))
+            }
+        }.launchIn(lifecycleScope)
+    }
+
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         requireActivity().window.decorView.rootView.setGusianBlur(null)