[MERGE] #100 -> develop

[FEAT/#100] 판매뷰 / 판매 물품 확인 & 확정 API 구현
Orange-Co · Sep 1, 2024 · c17131f · c17131f
2 parents bc82159 + 5392c20
commit c17131f
Show file tree

Hide file tree

Showing 19 changed files with 262 additions and 32 deletions.
diff --git a/app/src/main/java/co/orange/ddanzi/di/module/RepositoryModule.kt b/app/src/main/java/co/orange/ddanzi/di/module/RepositoryModule.kt
@@ -10,6 +10,7 @@ import co.orange.data.repositoryImpl.ProfileRepositoryImpl
 import co.orange.data.repositoryImpl.SearchRepositoryImpl
 import co.orange.data.repositoryImpl.SellRepositoryImpl
 import co.orange.data.repositoryImpl.SettingRepositoryImpl
+import co.orange.data.repositoryImpl.UploadRepositoryImpl
 import co.orange.domain.repository.AuthRepository
 import co.orange.domain.repository.BuyRepository
 import co.orange.domain.repository.DeviceRepository
@@ -20,6 +21,7 @@ import co.orange.domain.repository.ProfileRepository
 import co.orange.domain.repository.SearchRepository
 import co.orange.domain.repository.SellRepository
 import co.orange.domain.repository.SettingRepository
+import co.orange.domain.repository.UploadRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -65,6 +67,10 @@ object RepositoryModule {
     @Singleton
     fun provideInterestRepository(interestRepositoryImpl: InterestRepositoryImpl): InterestRepository = interestRepositoryImpl
 
+    @Provides
+    @Singleton
+    fun provideUploadRepository(uploadRepositoryImpl: UploadRepositoryImpl): UploadRepository = uploadRepositoryImpl
+
     @Provides
     @Singleton
     fun provideIamportRepository(iamportRepositoryImpl: IamportRepositoryImpl): IamportRepository = iamportRepositoryImpl

diff --git a/app/src/main/java/co/orange/ddanzi/di/module/ServiceModule.kt b/app/src/main/java/co/orange/ddanzi/di/module/ServiceModule.kt
@@ -10,6 +10,7 @@ import co.orange.data.service.ProfileService
 import co.orange.data.service.SearchService
 import co.orange.data.service.SellService
 import co.orange.data.service.SettingService
+import co.orange.data.service.UploadService
 import co.orange.ddanzi.di.interceptor.RetrofitQualifier
 import dagger.Module
 import dagger.Provides
@@ -75,6 +76,12 @@ object ServiceModule {
         @RetrofitQualifier.JWT retrofit: Retrofit,
     ): InterestService = retrofit.create(InterestService::class.java)
 
+    @Provides
+    @Singleton
+    fun provideUploadService(
+        @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
+    ): UploadService = retrofit.create(UploadService::class.java)
+
     @Provides
     @Singleton
     fun provideIamportService(

diff --git a/data/src/main/java/co/orange/data/dataSource/SellDataSource.kt b/data/src/main/java/co/orange/data/dataSource/SellDataSource.kt
@@ -1,8 +1,15 @@
 package co.orange.data.dataSource
 
 import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.request.SellCheckRequestDto
+import co.orange.data.dto.response.SellCheckedProductDto
+import co.orange.data.dto.response.SellProductDto
 import co.orange.data.dto.response.SignedUrlDto
 
 interface SellDataSource {
     suspend fun getSignedUrl(fileName: String): BaseResponse<SignedUrlDto>
+
+    suspend fun postToCheckProduct(request: SellCheckRequestDto): BaseResponse<SellCheckedProductDto>
+
+    suspend fun getProductToSell(productId: String): BaseResponse<SellProductDto>
 }
diff --git a/data/src/main/java/co/orange/data/dataSourceImpl/SellDateSourceImpl.kt b/data/src/main/java/co/orange/data/dataSourceImpl/SellDateSourceImpl.kt
@@ -2,6 +2,9 @@ package co.orange.data.dataSourceImpl
 
 import co.orange.data.dataSource.SellDataSource
 import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.request.SellCheckRequestDto
+import co.orange.data.dto.response.SellCheckedProductDto
+import co.orange.data.dto.response.SellProductDto
 import co.orange.data.dto.response.SignedUrlDto
 import co.orange.data.service.SellService
 import javax.inject.Inject
@@ -12,4 +15,9 @@ data class SellDateSourceImpl
         private val sellService: SellService,
     ) : SellDataSource {
         override suspend fun getSignedUrl(fileName: String): BaseResponse<SignedUrlDto> = sellService.getSignedUrl(fileName)
+
+        override suspend fun postToCheckProduct(request: SellCheckRequestDto): BaseResponse<SellCheckedProductDto> =
+            sellService.postToCheckProduct(request)
+
+        override suspend fun getProductToSell(productId: String): BaseResponse<SellProductDto> = sellService.getProductToSell(productId)
     }
diff --git a/data/src/main/java/co/orange/data/dto/request/SellCheckRequestDto.kt b/data/src/main/java/co/orange/data/dto/request/SellCheckRequestDto.kt
@@ -0,0 +1,15 @@
+package co.orange.data.dto.request
+
+import co.orange.domain.entity.request.SellCheckRequestModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SellCheckRequestDto(
+    @SerialName("image_url")
+    val imageUrl: String,
+) {
+    companion object {
+        fun SellCheckRequestModel.toDto() = SellCheckRequestDto(imageUrl)
+    }
+}
diff --git a/data/src/main/java/co/orange/data/dto/response/SellCheckedProductDto.kt b/data/src/main/java/co/orange/data/dto/response/SellCheckedProductDto.kt
@@ -0,0 +1,15 @@
+package co.orange.data.dto.response
+
+import co.orange.domain.entity.response.SellCheckedProductModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SellCheckedProductDto(
+    @SerialName("productId")
+    val productId: String,
+    @SerialName("productName")
+    val productName: String,
+) {
+    fun toModel() = SellCheckedProductModel(productId, productName)
+}
diff --git a/data/src/main/java/co/orange/data/dto/response/SellProductDto.kt b/data/src/main/java/co/orange/data/dto/response/SellProductDto.kt
@@ -0,0 +1,21 @@
+package co.orange.data.dto.response
+
+import co.orange.domain.entity.response.SellProductModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SellProductDto(
+    @SerialName("productId")
+    val productId: String,
+    @SerialName("productName")
+    val productName: String,
+    @SerialName("originPrice")
+    val originPrice: Int,
+    @SerialName("salePrice")
+    val salePrice: Int,
+    @SerialName("isAddressExist")
+    val isAddressExist: Boolean,
+) {
+    fun toModel() = SellProductModel(productId, productName, originPrice, salePrice, isAddressExist)
+}
diff --git a/data/src/main/java/co/orange/data/repositoryImpl/SellRepositoryImpl.kt b/data/src/main/java/co/orange/data/repositoryImpl/SellRepositoryImpl.kt
@@ -1,6 +1,10 @@
 package co.orange.data.repositoryImpl
 
 import co.orange.data.dataSource.SellDataSource
+import co.orange.data.dto.request.SellCheckRequestDto.Companion.toDto
+import co.orange.domain.entity.request.SellCheckRequestModel
+import co.orange.domain.entity.response.SellCheckedProductModel
+import co.orange.domain.entity.response.SellProductModel
 import co.orange.domain.entity.response.SignedUrlModel
 import co.orange.domain.repository.SellRepository
 import javax.inject.Inject
@@ -14,4 +18,14 @@ class SellRepositoryImpl
             runCatching {
                 sellDataSource.getSignedUrl(fileName).data.toModel()
             }
+
+        override suspend fun postToCheckProduct(request: SellCheckRequestModel): Result<SellCheckedProductModel> =
+            runCatching {
+                sellDataSource.postToCheckProduct(request.toDto()).data.toModel()
+            }
+
+        override suspend fun getProductToSell(productId: String): Result<SellProductModel> =
+            runCatching {
+                sellDataSource.getProductToSell(productId).data.toModel()
+            }
     }
diff --git a/data/src/main/java/co/orange/data/service/SellService.kt b/data/src/main/java/co/orange/data/service/SellService.kt
@@ -1,13 +1,29 @@
 package co.orange.data.service
 
 import co.orange.data.dto.BaseResponse
+import co.orange.data.dto.request.SellCheckRequestDto
+import co.orange.data.dto.response.SellCheckedProductDto
+import co.orange.data.dto.response.SellProductDto
 import co.orange.data.dto.response.SignedUrlDto
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface SellService {
     @GET("/api/v1/item/signed-url")
     suspend fun getSignedUrl(
         @Query("fileName") fileName: String,
     ): BaseResponse<SignedUrlDto>
+
+    @POST("/api/v1/item/check")
+    suspend fun postToCheckProduct(
+        @Body request: SellCheckRequestDto,
+    ): BaseResponse<SellCheckedProductDto>
+
+    @GET("/api/v1/item/product/{id}")
+    suspend fun getProductToSell(
+        @Path("id") productId: String,
+    ): BaseResponse<SellProductDto>
 }
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/request/SellCheckRequestModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/request/SellCheckRequestModel.kt
@@ -0,0 +1,5 @@
+package co.orange.domain.entity.request
+
+data class SellCheckRequestModel(
+    val imageUrl: String,
+)
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/response/SellCheckedProductModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/response/SellCheckedProductModel.kt
@@ -0,0 +1,6 @@
+package co.orange.domain.entity.response
+
+data class SellCheckedProductModel(
+    val productId: String,
+    val productName: String,
+)
diff --git a/domain/src/main/kotlin/co/orange/domain/entity/response/SellProductModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/response/SellProductModel.kt
@@ -1,8 +1,9 @@
 package co.orange.domain.entity.response
 
 data class SellProductModel(
-    val productId: Long,
+    val productId: String,
     val productName: String,
     val originPrice: Int,
     val salePrice: Int,
+    val isAddressExist: Boolean,
 )
diff --git a/domain/src/main/kotlin/co/orange/domain/repository/SellRepository.kt b/domain/src/main/kotlin/co/orange/domain/repository/SellRepository.kt
@@ -1,7 +1,14 @@
 package co.orange.domain.repository
 
+import co.orange.domain.entity.request.SellCheckRequestModel
+import co.orange.domain.entity.response.SellCheckedProductModel
+import co.orange.domain.entity.response.SellProductModel
 import co.orange.domain.entity.response.SignedUrlModel
 
 interface SellRepository {
     suspend fun getSignedUrl(fileName: String): Result<SignedUrlModel>
+
+    suspend fun postToCheckProduct(request: SellCheckRequestModel): Result<SellCheckedProductModel>
+
+    suspend fun getProductToSell(productId: String): Result<SellProductModel>
 }
diff --git a/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellOnboardingActivity.kt b/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellOnboardingActivity.kt
@@ -7,10 +7,12 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.core.view.isVisible
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import co.orange.core.base.BaseActivity
 import co.orange.core.extension.setOnSingleClickListener
+import co.orange.core.extension.setStatusBarColorFromResource
 import co.orange.core.extension.stringOf
 import co.orange.core.extension.toast
 import co.orange.core.state.UiState
@@ -52,10 +54,7 @@ class SellOnboardingActivity :
             photoPickerResult.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         } else {
             galleryPickerResult.launch(
-                Intent(Intent.ACTION_PICK).apply {
-                    type = "image/*"
-                    putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-                },
+                Intent(Intent.ACTION_PICK).apply { type = "image/*" },
             )
         }
     }
@@ -99,17 +98,33 @@ class SellOnboardingActivity :
             .onEach { state ->
                 when (state) {
                     is UiState.Success -> {
-//                        sellProductDialog = SellProductDialog()
-//                        sellProductDialog?.show(supportFragmentManager, SELL_PRODUCT_DIALOG)
+                        setLoadingScreen(false)
+                        sellProductDialog = SellProductDialog()
+                        sellProductDialog?.show(supportFragmentManager, SELL_PRODUCT_DIALOG)
                         viewModel.resetProductIdState()
                     }
 
-                    is UiState.Failure -> toast(stringOf(R.string.error_msg))
-                    else -> return@onEach
+                    is UiState.Failure -> {
+                        setLoadingScreen(false)
+                        toast(stringOf(R.string.error_msg))
+                    }
+
+                    is UiState.Loading -> setLoadingScreen(true)
+                    is UiState.Empty -> return@onEach
                 }
             }.launchIn(lifecycleScope)
     }
 
+    private fun setLoadingScreen(isLoading: Boolean) {
+        if (isLoading) {
+            setStatusBarColorFromResource(R.color.background_50)
+            binding.layoutLoading.isVisible = true
+        } else {
+            setStatusBarColorFromResource(R.color.white)
+            binding.layoutLoading.isVisible = false
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         sellProductDialog = null

diff --git a/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellOnboardingViewModel.kt b/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellOnboardingViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import co.orange.core.extension.getFileName
 import co.orange.core.state.UiState
+import co.orange.domain.entity.request.SellCheckRequestModel
 import co.orange.domain.repository.SellRepository
 import co.orange.domain.repository.UploadRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -27,6 +28,9 @@ class SellOnboardingViewModel
         private var selectedImageName = ""
         private var uploadedUrl = ""
 
+        var productId = ""
+        var productName = ""
+
         private val _isCheckedAgain = MutableSharedFlow<Boolean>()
         val isCheckedAgain: SharedFlow<Boolean> = _isCheckedAgain
 
@@ -63,14 +67,29 @@ class SellOnboardingViewModel
             viewModelScope.launch {
                 uploadRepository.putImageToCloud(url, selectedImageUri)
                     .onSuccess {
-                        // 성공 시 이미지 요청
+                        postToCheckProduct()
                     }.onFailure {
                         _changingImageState.value = UiState.Failure(it.message.toString())
                         _changingImageState.value = UiState.Empty
                     }
             }
         }
 
+        private fun postToCheckProduct() {
+            viewModelScope.launch {
+                sellRepository.postToCheckProduct(SellCheckRequestModel(uploadedUrl))
+                    .onSuccess {
+                        productId = it.productId
+                        productName = it.productName
+                        _changingImageState.value = UiState.Success(it.productId)
+                    }
+                    .onFailure {
+                        _changingImageState.value = UiState.Failure(it.message.toString())
+                        _changingImageState.value = UiState.Empty
+                    }
+            }
+        }
+
         fun resetProductIdState() {
             _changingImageState.value = UiState.Empty
         }

diff --git a/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellProductDialog.kt b/presentation/src/main/java/co/orange/presentation/sell/onboarding/SellProductDialog.kt
@@ -43,8 +43,7 @@ class SellProductDialog :
 
     private fun initConfirmBtnListener() {
         binding.btnSubmit.setOnSingleClickListener {
-            // TODO intent값 수정
-            SellProgressActivity.createIntent(requireContext(), -1).apply {
+            SellProgressActivity.createIntent(requireContext(), viewModel.productId).apply {
                 startActivity(this)
             }
             dismiss()
@@ -62,7 +61,7 @@ class SellProductDialog :
         with(binding) {
             // TODO
             // ivSellProduct.load()
-            tvSellProductName.text = "퓨퓨어 오일 퍼퓸 긴제목 텍스트트트트트트"
+            tvSellProductName.text = viewModel.productName
         }
     }
 }