[FIX/#185] 유료결제뷰 대응 API 수정

build-logic/convention/src/main/java/kr/genti/convention/Constants.kt

@@ -9,7 +9,7 @@ object Constants {
     const val minSdk = 28
     const val targetSdk = 34
 
-    const val versionCode = 20
+    const val versionCode = 21
     const val versionName = "2.1.0"
 
     const val jvmVersion = "17"

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

@@ -22,7 +22,7 @@ interface CreateDataSource {
 
     suspend fun postToVerify(request: KeyRequestDto): BaseResponse<Boolean>
 
-    suspend fun getPromptExample(): BaseResponse<List<PromptExampleDto>>
+    suspend fun getPromptExample(type: String): BaseResponse<List<PromptExampleDto>>
 
     suspend fun postToValidatePurchase(request: PurchaseValidRequestDto): BaseResponse<Boolean>
 }

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

@@ -35,8 +35,8 @@ constructor(
     override suspend fun postToVerify(request: KeyRequestDto): BaseResponse<Boolean> =
         createService.postToVerify(request)
 
-    override suspend fun getPromptExample(): BaseResponse<List<PromptExampleDto>> =
-        createService.getPromptExample()
+    override suspend fun getPromptExample(type: String): BaseResponse<List<PromptExampleDto>> =
+        createService.getPromptExample(type)
 
     override suspend fun postToValidatePurchase(request: PurchaseValidRequestDto): BaseResponse<Boolean> =
         createService.postToValidatePurchase(request)

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

@@ -51,9 +51,9 @@ constructor(
             createDataSource.postToVerify(request.toDto()).response
         }
 
-    override suspend fun getPromptExample(): Result<List<PromptExampleModel>> =
+    override suspend fun getPromptExample(type: String): Result<List<PromptExampleModel>> =
         runCatching {
-            createDataSource.getPromptExample().response.map { it.toModel() }
+            createDataSource.getPromptExample(type).response.map { it.toModel() }
         }
 
     override suspend fun postToValidatePurchase(request: PurchaseValidRequestModel): Result<Boolean> =

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

@@ -11,6 +11,7 @@ import kr.genti.data.dto.response.S3PresignedUrlDto
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.Path
 
 interface CreateService {
     @POST("api/v1/presigned-url")
@@ -43,8 +44,10 @@ interface CreateService {
         @Body request: KeyRequestDto,
     ): BaseResponse<Boolean>
 
-    @GET("api/v1/users/examples/with-picture-square")
-    suspend fun getPromptExample(): BaseResponse<List<PromptExampleDto>>
+    @GET("api/v1/users/examples/with-picture-square/{type}")
+    suspend fun getPromptExample(
+        @Path("type") type: String
+    ): BaseResponse<List<PromptExampleDto>>
 
     @POST("api/v1/users/in-app-purchases/google/receipt-validation")
     suspend fun postToValidatePurchase(

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

@@ -21,7 +21,7 @@ interface CreateRepository {
 
     suspend fun postToVerify(request: KeyRequestModel): Result<Boolean>
 
-    suspend fun getPromptExample(): Result<List<PromptExampleModel>>
+    suspend fun getPromptExample(type: String): Result<List<PromptExampleModel>>
 
     suspend fun postToValidatePurchase(request: PurchaseValidRequestModel): Result<Boolean>
 }

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

@@ -73,10 +73,6 @@ constructor(
     private var firstImageS3KeyList = listOf<KeyRequestModel>()
     private var secondImageS3KeyList = listOf<KeyRequestModel>()
 
-    init {
-        // getExamplePrompt()
-    }
-
     fun modCurrentPercent(amount: Int) {
         _currentPercent.value += amount
     }
@@ -116,11 +112,16 @@ constructor(
         _totalGeneratingState.value = UiState.Empty
     }
 
-    private fun getExamplePrompt() {
+    fun getExamplePrompt() {
         _getExampleState.value = UiState.Loading
+        val currentType = when {
+            !isCreatingParentPic -> TYPE_FREE_ONE
+            selectedNumber.value == PictureNumber.ONE -> TYPE_PAID_ONE
+            else -> TYPE_PAID_TWO
+        }
         viewModelScope.launch {
             runCatching {
-                createRepository.getPromptExample()
+                createRepository.getPromptExample(currentType)
             }.onSuccess {
                 _getExampleState.value = UiState.Success(it.getOrThrow())
             }.onFailure {
@@ -265,5 +266,9 @@ constructor(
     companion object {
         const val VALIDATION_FALSE = "VALIDATION_FALSE"
         const val SERVER_ERROR = "SERVER_ERROR"
+
+        const val TYPE_FREE_ONE = "FREE_ONE"
+        const val TYPE_PAID_ONE = "PAID_ONE"
+        const val TYPE_PAID_TWO = "PAID_TWO"
     }
 }

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

@@ -49,6 +49,7 @@ class DefineFragment() : BaseFragment<FragmentDefineBinding>(R.layout.fragment_d
 
     private fun initView() {
         binding.vm = viewModel
+        viewModel.getExamplePrompt()
     }
 
     private fun initCreateBtnListener() {
@@ -118,19 +119,17 @@ class DefineFragment() : BaseFragment<FragmentDefineBinding>(R.layout.fragment_d
     }
 
     private fun observeGetExampleState() {
-        viewModel.getExampleState
-            .flowWithLifecycle(lifecycle)
-            .onEach { state ->
-                when (state) {
-                    is UiState.Success -> {
-                        adapter.submitList(state.data)
-                        binding.dotIndicator.setViewPager(binding.vpCreateRandom)
-                    }
-
-                    is UiState.Failure -> toast(stringOf(R.string.error_msg))
-                    else -> return@onEach
+        viewModel.getExampleState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                is UiState.Success -> {
+                    adapter.submitList(state.data)
+                    binding.dotIndicator.setViewPager(binding.vpCreateRandom)
                 }
-            }.launchIn(lifecycleScope)
+
+                is UiState.Failure -> toast(stringOf(R.string.error_msg))
+                else -> return@onEach
+            }
+        }.launchIn(lifecycleScope)
     }
 
 }

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

@@ -154,7 +154,7 @@
     <string name="profile_tv_list_title">내가 만든 사진</string>
     <string name="profile_tv_empty">아직 내가 만든 사진이 없어요.</string>
     <string name="profile_tv_empty_guide">세상에 하나뿐인 나만의 사진을 만들어보세요!</string>
-    <string name="profile_image_download_success">사진이 저장되었어요\n친구들에게 공유해보세요!</string>
+    <string name="profile_image_download_success">사진이 저장되었어요</string>
 
     <string name="setting_tv_title">설정</string>
     <string name="setting_btn_terms_of_service">이용 약관</string>