쇼핑몰 바로가기 기능 네이버 스토어 추가

android/app/build.gradle.kts

@@ -67,11 +67,11 @@ dependencies {
     // Android
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.10.0")
-    implementation("androidx.activity:activity-ktx:1.8.1")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("androidx.activity:activity-ktx:1.8.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.5")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.5")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
+    implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
 
     // Retrofit, Serialization
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
@@ -92,7 +92,7 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 
     // Navigation
-    val navVersion = "2.7.5"
+    val navVersion = "2.7.6"
     implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
     implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
 
@@ -111,7 +111,7 @@ dependencies {
     kapt("androidx.hilt:hilt-compiler:1.1.0")
 
     // Material chart
-    implementation("app.priceguard:materialchart:0.2.1")
+    implementation("app.priceguard:materialchart:0.2.2")
 }
 
 kapt {

android/app/src/main/java/app/priceguard/data/dto/add/ProductAddRequest.kt

@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProductAddRequest(
+    val shop: String,
     val productCode: String,
     val targetPrice: Int
 )

android/app/src/main/java/app/priceguard/data/dto/patch/PricePatchRequest.kt

@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PricePatchRequest(
+    val shop: String,
     val productCode: String,
     val targetPrice: Int
 )

android/app/src/main/java/app/priceguard/data/network/ProductAPI.kt

@@ -21,39 +21,42 @@ import retrofit2.http.Path
 
 interface ProductAPI {
 
-    @POST("verify")
+    @POST("v1/product/verify")
     suspend fun verifyLink(
         @Body productUrl: ProductVerifyRequest
     ): Response<ProductVerifyResponse>
 
-    @POST(".")
+    @POST("v1/product")
     suspend fun addProduct(
         @Body productAddRequest: ProductAddRequest
     ): Response<ProductAddResponse>
 
-    @GET("tracking")
+    @GET("product/tracking")
     suspend fun getProductList(): Response<ProductListResponse>
 
-    @GET("recommend")
+    @GET("product/recommend")
     suspend fun getRecommendedProductList(): Response<RecommendProductResponse>
 
-    @GET("{productCode}")
+    @GET("v1/product/{shop}/{productCode}")
     suspend fun getProductDetail(
+        @Path("shop") shop: String,
         @Path("productCode") productCode: String
     ): Response<ProductResponse>
 
-    @DELETE("{productCode}")
+    @DELETE("v1/product/{shop}/{productCode}")
     suspend fun deleteProduct(
+        @Path("shop") shop: String,
         @Path("productCode") productCode: String
     ): Response<ProductDeleteResponse>
 
-    @PATCH("targetPrice")
+    @PATCH("v1/product/targetPrice")
     suspend fun updateTargetPrice(
         @Body pricePatchRequest: PricePatchRequest
     ): Response<PricePatchResponse>
 
-    @PATCH("alert/{productCode}")
+    @PATCH("v1/product/alert/{shop}/{productCode}")
     suspend fun updateAlert(
+        @Path("shop") shop: String,
         @Path("productCode") productCode: String
     ): Response<AlertUpdateResponse>
 }

android/app/src/main/java/app/priceguard/data/repository/product/ProductRepository.kt

@@ -12,17 +12,17 @@ interface ProductRepository {
 
     suspend fun verifyLink(productUrl: String, isRenewed: Boolean = false): RepositoryResult<ProductVerifyResult, ProductErrorState>
 
-    suspend fun addProduct(productCode: String, targetPrice: Int, isRenewed: Boolean = false): RepositoryResult<ProductAddResult, ProductErrorState>
+    suspend fun addProduct(shop: String, productCode: String, targetPrice: Int, isRenewed: Boolean = false): RepositoryResult<ProductAddResult, ProductErrorState>
 
     suspend fun getProductList(isRenewed: Boolean = false): RepositoryResult<List<ProductData>, ProductErrorState>
 
     suspend fun getRecommendedProductList(isRenewed: Boolean = false): RepositoryResult<List<RecommendProductData>, ProductErrorState>
 
-    suspend fun getProductDetail(productCode: String, isRenewed: Boolean = false): RepositoryResult<ProductDetailResult, ProductErrorState>
+    suspend fun getProductDetail(shop: String, productCode: String, isRenewed: Boolean = false): RepositoryResult<ProductDetailResult, ProductErrorState>
 
-    suspend fun deleteProduct(productCode: String, isRenewed: Boolean = false): RepositoryResult<Boolean, ProductErrorState>
+    suspend fun deleteProduct(shop: String, productCode: String, isRenewed: Boolean = false): RepositoryResult<Boolean, ProductErrorState>
 
-    suspend fun updateTargetPrice(productCode: String, targetPrice: Int, isRenewed: Boolean = false): RepositoryResult<PricePatchResult, ProductErrorState>
+    suspend fun updateTargetPrice(shop: String, productCode: String, targetPrice: Int, isRenewed: Boolean = false): RepositoryResult<PricePatchResult, ProductErrorState>
 
-    suspend fun switchAlert(productCode: String, isRenewed: Boolean = false): RepositoryResult<Boolean, ProductErrorState>
+    suspend fun switchAlert(shop: String, productCode: String, isRenewed: Boolean = false): RepositoryResult<Boolean, ProductErrorState>
 }

android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt

@@ -105,12 +105,13 @@ class ProductRepositoryImpl @Inject constructor(
     }
 
     override suspend fun addProduct(
+        shop: String,
         productCode: String,
         targetPrice: Int,
         isRenewed: Boolean
     ): RepositoryResult<ProductAddResult, ProductErrorState> {
         val response = getApiResult {
-            productAPI.addProduct(ProductAddRequest(productCode, targetPrice))
+            productAPI.addProduct(ProductAddRequest(shop, productCode, targetPrice))
         }
         return when (response) {
             is APIResult.Success -> {
@@ -124,7 +125,7 @@ class ProductRepositoryImpl @Inject constructor(
 
             is APIResult.Error -> {
                 handleError(response.code, isRenewed) {
-                    addProduct(productCode, targetPrice, true)
+                    addProduct(shop, productCode, targetPrice, true)
                 }
             }
         }
@@ -190,11 +191,12 @@ class ProductRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getProductDetail(
+        shop: String,
         productCode: String,
         isRenewed: Boolean
     ): RepositoryResult<ProductDetailResult, ProductErrorState> {
         val response = getApiResult {
-            productAPI.getProductDetail(productCode)
+            productAPI.getProductDetail(shop, productCode)
         }
         return when (response) {
             is APIResult.Success -> {
@@ -216,36 +218,38 @@ class ProductRepositoryImpl @Inject constructor(
 
             is APIResult.Error -> {
                 handleError(response.code, isRenewed) {
-                    getProductDetail(productCode, true)
+                    getProductDetail(shop, productCode, true)
                 }
             }
         }
     }
 
     override suspend fun deleteProduct(
+        shop: String,
         productCode: String,
         isRenewed: Boolean
     ): RepositoryResult<Boolean, ProductErrorState> {
-        return when (val response = getApiResult { productAPI.deleteProduct(productCode) }) {
+        return when (val response = getApiResult { productAPI.deleteProduct(shop, productCode) }) {
             is APIResult.Success -> {
                 RepositoryResult.Success(true)
             }
 
             is APIResult.Error -> {
                 handleError(response.code, isRenewed) {
-                    deleteProduct(productCode, true)
+                    deleteProduct(shop, productCode, true)
                 }
             }
         }
     }
 
     override suspend fun updateTargetPrice(
+        shop: String,
         productCode: String,
         targetPrice: Int,
         isRenewed: Boolean
     ): RepositoryResult<PricePatchResult, ProductErrorState> {
         val response = getApiResult {
-            productAPI.updateTargetPrice(PricePatchRequest(productCode, targetPrice))
+            productAPI.updateTargetPrice(PricePatchRequest(shop, productCode, targetPrice))
         }
         return when (response) {
             is APIResult.Success -> {
@@ -259,21 +263,21 @@ class ProductRepositoryImpl @Inject constructor(
 
             is APIResult.Error -> {
                 handleError(response.code, isRenewed) {
-                    updateTargetPrice(productCode, targetPrice, true)
+                    updateTargetPrice(shop, productCode, targetPrice, true)
                 }
             }
         }
     }
 
-    override suspend fun switchAlert(productCode: String, isRenewed: Boolean): RepositoryResult<Boolean, ProductErrorState> {
-        return when (val response = getApiResult { productAPI.updateAlert(productCode) }) {
+    override suspend fun switchAlert(shop: String, productCode: String, isRenewed: Boolean): RepositoryResult<Boolean, ProductErrorState> {
+        return when (val response = getApiResult { productAPI.updateAlert(shop, productCode) }) {
             is APIResult.Success -> {
                 RepositoryResult.Success(true)
             }
 
             is APIResult.Error -> {
                 handleError(response.code, isRenewed) {
-                    deleteProduct(productCode, true)
+                    deleteProduct(shop, productCode, true)
                 }
             }
         }

android/app/src/main/java/app/priceguard/di/NetworkModule.kt

@@ -46,7 +46,7 @@ object NetworkModule {
             .build()
 
         return Retrofit.Builder()
-            .baseUrl("${BASE_URL}/product/")
+            .baseUrl("${BASE_URL}/")
             .addConverterFactory(json.asConverterFactory(MediaType.parse("application/json")!!))
             .client(interceptorClient)
             .build()

android/app/src/main/java/app/priceguard/service/PriceGuardFirebaseMessagingService.kt

@@ -33,15 +33,17 @@ class PriceGuardFirebaseMessagingService : FirebaseMessagingService() {
                 it.title ?: return,
                 it.body ?: return,
                 it.imageUrl ?: return,
+                message.data["shop"] ?: return,
                 message.data["productCode"] ?: return
             )
         }
     }
 
-    private fun sendNotification(title: String, body: String, imageUrl: Uri, data: String) {
+    private fun sendNotification(title: String, body: String, imageUrl: Uri, shop: String, code: String) {
         val intent = Intent(this, DetailActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        intent.putExtra("productCode", data)
+        intent.putExtra("productShop", shop)
+        intent.putExtra("productCode", code)
         intent.putExtra("directed", true)
 
         val requestCode = getRequestCode()

android/app/src/main/java/app/priceguard/service/UpdateAlarmWorker.kt

@@ -22,14 +22,15 @@ class UpdateAlarmWorker @AssistedInject constructor(
 ) : CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
-        val inputData = inputData.getString(ARGUMENT_KEY) ?: return Result.failure()
+        val productShop = inputData.getString(PRODUCT_SHOP) ?: return Result.failure()
+        val productCode = inputData.getString(PRODUCT_CODE) ?: return Result.failure()
 
-        return updateAlarm(inputData)
+        return updateAlarm(productShop, productCode)
     }
 
-    private suspend fun updateAlarm(productCode: String): Result {
+    private suspend fun updateAlarm(productShop: String, productCode: String): Result {
         return try {
-            when (productRepository.switchAlert(productCode)) {
+            when (productRepository.switchAlert(productShop, productCode)) {
                 is RepositoryResult.Error -> {
                     Result.failure()
                 }
@@ -45,9 +46,14 @@ class UpdateAlarmWorker @AssistedInject constructor(
     }
 
     companion object {
-        const val ARGUMENT_KEY = "productCode"
-        fun createWorkRequest(inputString: String): OneTimeWorkRequest {
-            val inputData = Data.Builder().putString(ARGUMENT_KEY, inputString).build()
+        const val PRODUCT_CODE = "productCode"
+        const val PRODUCT_SHOP = "productShop"
+
+        fun createWorkRequest(inputString: Pair<String, String>): OneTimeWorkRequest {
+            val inputData = Data.Builder()
+                .putString(PRODUCT_SHOP, inputString.first)
+                .putString(PRODUCT_CODE, inputString.second)
+                .build()
             val constraints = Constraints.Builder().build()
             return OneTimeWorkRequestBuilder<UpdateAlarmWorker>()
                 .setInputData(inputData)

android/app/src/main/java/app/priceguard/ui/additem/AddItemActivity.kt

@@ -34,13 +34,15 @@ class AddItemActivity : AppCompatActivity() {
                 bundle.putString("link", data)
                 navController.navigate(R.id.registerItemLinkFragment, bundle)
             }
-        } else if (intent.hasExtra("productCode") &&
+        } else if (intent.hasExtra("productShop") &&
+            intent.hasExtra("productCode") &&
             intent.hasExtra("productTitle") &&
             intent.hasExtra("productPrice") &&
             intent.hasExtra("isAdding")
         ) {
             val action =
                 RegisterItemLinkFragmentDirections.actionRegisterItemLinkFragmentToSetTargetPriceFragment(
+                    intent.getStringExtra("productShop") ?: "",
                     intent.getStringExtra("productCode") ?: "",
                     intent.getStringExtra("productTitle") ?: "",
                     intent.getIntExtra("productPrice", 0),

android/app/src/main/java/app/priceguard/ui/additem/confirm/ConfirmItemLinkFragment.kt

@@ -12,7 +12,7 @@
 
 class ConfirmItemLinkFragment : Fragment() {
 
     private var _binding: FragmentConfirmItemLinkBinding? = null
     private val binding get() = _binding!!
     private val confirmItemLinkViewModel: ConfirmItemLinkViewModel by viewModels()
 
@@ -54,6 +54,7 @@
         btnConfirmItemNext.setOnClickListener {
             val action =
                 ConfirmItemLinkFragmentDirections.actionConfirmItemLinkFragmentToSetTargetPriceFragment(
+                    arguments.getString("productShop") ?: "",
                     arguments.getString("productCode") ?: "",
                     arguments.getString("productName") ?: "",
                     arguments.getInt("productPrice"),

android/app/src/main/java/app/priceguard/ui/additem/link/RegisterItemLinkFragment.kt

@@ -26,7 +26,7 @@
     @Inject
     lateinit var tokenRepository: TokenRepository
 
     private var _binding: FragmentRegisterItemLinkBinding? = null
     private val binding get() = _binding!!
     private val registerItemLinkViewModel: RegisterItemLinkViewModel by viewModels()
 
@@ -98,6 +98,7 @@
                     is RegisterItemLinkViewModel.RegisterLinkEvent.SuccessVerification -> {
                         val action =
                             RegisterItemLinkFragmentDirections.actionRegisterItemLinkFragmentToConfirmItemLinkFragment(
+                                event.product.shop,
                                 event.product.productCode,
                                 event.product.productPrice,
                                 event.product.shop,

android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt

@@ -28,7 +28,7 @@
     @Inject
     lateinit var tokenRepository: TokenRepository
 
     private var _binding: FragmentSetTargetPriceBinding? = null
     private val binding get() = _binding!!
     private val setTargetPriceViewModel: SetTargetPriceViewModel by viewModels()
 
@@ -67,12 +67,13 @@
     private fun FragmentSetTargetPriceBinding.initView() {
         val arguments = requireArguments()
 
+        val productShop = arguments.getString("productShop") ?: ""
         val productCode = arguments.getString("productCode") ?: ""
         val title = arguments.getString("productTitle") ?: ""
         val price = arguments.getInt("productPrice")
         val targetPrice = arguments.getInt("productTargetPrice")
 
-        setTargetPriceViewModel.setProductInfo(productCode, title, price, targetPrice)
+        setTargetPriceViewModel.setProductInfo(productShop, productCode, title, price, targetPrice)
 
         tvSetPriceCurrentPrice.text =
             String.format(

android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceViewModel.kt

@@ -18,6 +18,7 @@ class SetTargetPriceViewModel @Inject constructor(private val productRepository:
     ViewModel() {
 
     data class SetTargetPriceState(
+        val productShop: String = "",
         val productCode: String = "",
         val targetPrice: Int = 0,
         val productName: String = "",
@@ -43,6 +44,7 @@ class SetTargetPriceViewModel @Inject constructor(private val productRepository:
         viewModelScope.launch {
             _state.value = state.value.copy(isReady = false)
             val response = productRepository.addProduct(
+                _state.value.productShop,
                 _state.value.productCode,
                 _state.value.targetPrice
             )
@@ -63,6 +65,7 @@ class SetTargetPriceViewModel @Inject constructor(private val productRepository:
         viewModelScope.launch {
             _state.value = state.value.copy(isReady = false)
             val response = productRepository.updateTargetPrice(
+                _state.value.productShop,
                 _state.value.productCode,
                 _state.value.targetPrice
             )
@@ -89,9 +92,10 @@ class SetTargetPriceViewModel @Inject constructor(private val productRepository:
         )
     }
 
-    fun setProductInfo(productCode: String, name: String, price: Int, targetPrice: Int) {
+    fun setProductInfo(productShop: String, productCode: String, name: String, price: Int, targetPrice: Int) {
         _state.value =
             state.value.copy(
+                productShop = productShop,
                 productCode = productCode,
                 productName = name,
                 productPrice = price,