v0.2.0

- 새로고침 레이아웃 추가
- 가격 수정 기능 구현
- 상세페이지 트래킹 목록에 추가 기능 구현
- 서브모듈 연결
- 차트 ui 추가
- Ping API 구현
- Logger 미들웨어 추가
- 최신 refreshToken 무효화
- MongoDB 연동
- 상품 정보 Cache, 기간별 상품 가격 변동 조회
- 주기적으로 상품 조회, DB에 최신 정보 반영
- 상품 인기 순위 섞이는 버그 수정
- 상품 목록 API 응답 내용 수정
- MongoDB Schema 수정
- 추천/추적 상품 목록 조회 API에서 가격 그래프 데이터 및 최신 가격 정보 동기화

차트 레포 주소 : https://github.com/Taewan-P/material-android-chart

Co-Authored-By: EunhoKang <[email protected]>
Co-Authored-By: ootr47 <[email protected]>
Co-Authored-By: 손문기 <[email protected]>
Co-Authored-By: ByeongIk Choi <[email protected]>

.github/workflows/firebase-deploy.yml

@@ -10,6 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
     - name: Setup JDK
       uses: actions/setup-java@v3
       with:

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "android/materialchart"]
+	path = android/materialchart
+	url = https://github.com/Taewan-P/material-android-chart
+	branch = release

android/app/build.gradle.kts

@@ -21,6 +21,8 @@ android {
         targetSdk = 34
         versionCode = 2
         versionName = "0.1.1"
+        versionCode = 3
+        versionName = "0.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -67,7 +69,7 @@ dependencies {
     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.0")
+    implementation("androidx.activity:activity-ktx:1.8.1")
     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")
@@ -100,6 +102,12 @@ dependencies {
 
     // Glide
     implementation("com.github.bumptech.glide:glide:4.16.0")
+
+    // Pull to Refresh
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+
+    // Material chart
+    implementation(project(":materialchart"))
 }
 
 kapt {

android/app/src/main/java/app/priceguard/data/dto/PriceDataDTO.kt

@@ -0,0 +1,10 @@
+package app.priceguard.data.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PriceDataDTO(
+    val time: Float? = null,
+    val price: Int? = null,
+    val isSoldOut: Boolean? = null
+)

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

@@ -0,0 +1,9 @@
+package app.priceguard.data.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PricePatchRequest(
+    val productCode: String,
+    val targetPrice: Int
+)

android/app/src/main/java/app/priceguard/data/dto/PricePatchResponse.kt

@@ -0,0 +1,9 @@
+package app.priceguard.data.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PricePatchResponse(
+    val statusCode: Int,
+    val message: String
+)

android/app/src/main/java/app/priceguard/data/dto/ProductDTO.kt

@@ -1,16 +1,17 @@
 package app.priceguard.data.dto
 
+import app.priceguard.data.graph.ProductChartData
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProductDTO(
-    val productName: String?,
-    val productCode: String?,
-    val shop: String?,
-    val shopUrl: String?,
-    val imageUrl: String?,
-    val targetPrice: Int?,
-    val price: Int?
+    val productName: String? = null,
+    val productCode: String? = null,
+    val shop: String? = null,
+    val imageUrl: String? = null,
+    val targetPrice: Int? = null,
+    val price: Int? = null,
+    val priceData: List<PriceDataDTO>? = null
 )
 
 data class ProductData(
@@ -19,5 +20,6 @@ data class ProductData(
     val shop: String,
     val imageUrl: String,
     val targetPrice: Int,
-    val price: Int
+    val price: Int,
+    val priceData: List<ProductChartData>
 )

android/app/src/main/java/app/priceguard/data/dto/ProductDeleteResponse.kt

@@ -7,11 +7,3 @@ data class ProductDeleteResponse(
     val statusCode: Int,
     val message: String
 )
-
-enum class ProductDeleteState {
-    SUCCESS,
-    NOT_FOUND,
-    INVALID_REQUEST,
-    UNAUTHORIZED,
-    UNDEFINED_ERROR
-}

android/app/src/main/java/app/priceguard/data/dto/ProductErrorState.kt

@@ -0,0 +1,9 @@
+package app.priceguard.data.dto
+
+enum class ProductErrorState {
+    PERMISSION_DENIED,
+    INVALID_REQUEST,
+    NOT_FOUND,
+    EXIST,
+    UNDEFINED_ERROR
+}

android/app/src/main/java/app/priceguard/data/dto/ProductListResponse.kt

@@ -6,17 +6,5 @@ import kotlinx.serialization.Serializable
 data class ProductListResponse(
     val statusCode: Int,
     val message: String,
-    val trackingList: List<ProductDTO>?
+    val trackingList: List<ProductDTO>? = null
 )
-
-data class ProductListResult(
-    val productListState: ProductListState,
-    val trackingList: List<ProductData>
-)
-
-enum class ProductListState {
-    SUCCESS,
-    PERMISSION_DENIED,
-    NOT_FOUND,
-    UNDEFINED_ERROR
-}

android/app/src/main/java/app/priceguard/data/dto/ProductResponse.kt

@@ -1,5 +1,6 @@
 package app.priceguard.data.dto
 
+import app.priceguard.data.graph.ProductChartData
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -14,25 +15,19 @@ data class ProductResponse(
     val shopUrl: String? = null,
     val targetPrice: Int? = null,
     val lowestPrice: Int? = null,
-    val price: Int? = null
+    val price: Int? = null,
+    val priceData: List<PriceDataDTO>? = null
 )
 
 data class ProductDetailResult(
-    val state: ProductDetailState,
-    val productName: String? = null,
-    val productCode: String? = null,
-    val shop: String? = null,
-    val imageUrl: String? = null,
-    val rank: Int? = null,
-    val shopUrl: String? = null,
-    val targetPrice: Int? = null,
-    val lowestPrice: Int? = null,
-    val price: Int? = null
+    val productName: String,
+    val productCode: String,
+    val shop: String,
+    val imageUrl: String,
+    val rank: Int,
+    val shopUrl: String,
+    val targetPrice: Int,
+    val lowestPrice: Int,
+    val price: Int,
+    val priceData: List<ProductChartData>
 )
-
-enum class ProductDetailState {
-    SUCCESS,
-    PERMISSION_DENIED,
-    NOT_FOUND,
-    UNDEFINED_ERROR
-}

android/app/src/main/java/app/priceguard/data/dto/ProductVerifyDTO.kt

@@ -4,9 +4,9 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class ProductVerifyDTO(
-    val productName: String?,
-    val productCode: String?,
-    val productPrice: Int?,
-    val shop: String?,
-    val imageUrl: String?
+    val productName: String? = null,
+    val productCode: String? = null,
+    val productPrice: Int? = null,
+    val shop: String? = null,
+    val imageUrl: String? = null
 )

android/app/src/main/java/app/priceguard/data/dto/ProductVerifyResponse.kt

@@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable
 data class ProductVerifyResponse(
     val statusCode: Int,
     val message: String,
-    val productName: String?,
-    val productCode: String?,
-    val productPrice: Int?,
-    val shop: String?,
-    val imageUrl: String?
+    val productName: String? = null,
+    val productCode: String? = null,
+    val productPrice: Int? = null,
+    val shop: String? = null,
+    val imageUrl: String? = null
 )

android/app/src/main/java/app/priceguard/data/dto/RecommendProductDTO.kt

@@ -1,15 +1,17 @@
 package app.priceguard.data.dto
 
+import app.priceguard.data.graph.ProductChartData
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RecommendProductDTO(
-    val productName: String?,
-    val productCode: String?,
-    val shop: String?,
-    val imageUrl: String?,
-    val price: Int?,
-    val rank: Int?
+    val productName: String? = null,
+    val productCode: String? = null,
+    val shop: String? = null,
+    val imageUrl: String? = null,
+    val price: Int? = null,
+    val rank: Int? = null,
+    val priceData: List<PriceDataDTO>? = null
 )
 
 data class RecommendProductData(
@@ -18,5 +20,6 @@ data class RecommendProductData(
     val shop: String,
     val imageUrl: String,
     val price: Int,
-    val rank: Int
+    val rank: Int,
+    val priceData: List<ProductChartData>
 )

android/app/src/main/java/app/priceguard/data/dto/RecommendProductResponse.kt

@@ -6,18 +6,5 @@ import kotlinx.serialization.Serializable
 data class RecommendProductResponse(
     val statusCode: Int,
     val message: String,
-    val recommendList: List<RecommendProductDTO>?
+    val recommendList: List<RecommendProductDTO>? = null
 )
-
-data class RecommendProductResult(
-    val productListState: RecommendProductState,
-    val recommendList: List<RecommendProductData>
-)
-
-enum class RecommendProductState {
-    SUCCESS,
-    WRONG_REQUEST,
-    PERMISSION_DENIED,
-    NOT_FOUND,
-    UNDEFINED_ERROR
-}

android/app/src/main/java/app/priceguard/data/graph/GraphDataConverter.kt

@@ -0,0 +1,24 @@
+package app.priceguard.data.graph
+
+import app.priceguard.data.dto.PriceDataDTO
+
+class GraphDataConverter {
+
+    // TODO: 기간별로 데이터 필터링을 통해 해당 기간에 발생한 가격 변동만 추적하도록 구조 변경.
+    fun toDataset(priceData: List<PriceDataDTO>?): List<ProductChartData> {
+        priceData ?: return listOf()
+        if (priceData.isEmpty()) {
+            return listOf()
+        }
+        val dataList = mutableListOf<ProductChartData>()
+        priceData.forEach { dto ->
+            dto.time ?: return@forEach
+            dto.price ?: return@forEach
+            dto.isSoldOut ?: return@forEach
+            dataList.add(ProductChartData(dto.time / 1000, dto.price.toFloat(), dto.isSoldOut.not()))
+        }
+        val currentTime = (System.currentTimeMillis() / 1000).toFloat()
+        dataList.add(ProductChartData(currentTime, dataList.last().y, dataList.last().valid))
+        return dataList.toList().sortedBy { it.x }.filter { it.x <= currentTime }
+    }
+}

android/app/src/main/java/app/priceguard/data/graph/ProductChartData.kt

@@ -0,0 +1,9 @@
+package app.priceguard.data.graph
+
+import app.priceguard.materialchart.data.ChartData
+
+data class ProductChartData(
+    override val x: Float,
+    override val y: Float,
+    override val valid: Boolean
+) : ChartData

android/app/src/main/java/app/priceguard/data/graph/ProductChartDataset.kt

@@ -0,0 +1,15 @@
+package app.priceguard.data.graph
+
+import app.priceguard.materialchart.data.ChartData
+import app.priceguard.materialchart.data.ChartDataset
+import app.priceguard.materialchart.data.GraphMode
+import app.priceguard.materialchart.data.GridLine
+
+data class ProductChartDataset(
+    override val showXAxis: Boolean,
+    override val showYAxis: Boolean,
+    override val isInteractive: Boolean,
+    override val graphMode: GraphMode,
+    override val data: List<ChartData>,
+    override val gridLines: List<GridLine>
+) : ChartDataset

android/app/src/main/java/app/priceguard/data/graph/ProductChartGridLine.kt

@@ -0,0 +1,8 @@
+package app.priceguard.data.graph
+
+import app.priceguard.materialchart.data.GridLine
+
+data class ProductChartGridLine(
+    override val name: String,
+    override val value: Float
+) : GridLine

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

@@ -1,5 +1,7 @@
 package app.priceguard.data.network
 
+import app.priceguard.data.dto.PricePatchRequest
+import app.priceguard.data.dto.PricePatchResponse
 import app.priceguard.data.dto.ProductAddRequest
 import app.priceguard.data.dto.ProductAddResponse
 import app.priceguard.data.dto.ProductDeleteResponse
@@ -46,6 +48,6 @@ interface ProductAPI {
 
     @PATCH("targetPrice")
     suspend fun updateTargetPrice(
-        @Body productAddRequest: ProductAddRequest
-    ): Response<ProductResponse>
+        @Body pricePatchRequest: PricePatchRequest
+    ): Response<PricePatchResponse>
 }

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

@@ -0,0 +1,10 @@
+package app.priceguard.data.network
+
+import app.priceguard.data.dto.ProductErrorState
+
+sealed class ProductRepositoryResult<out T> {
+
+    data class Success<out T>(val data: T) : ProductRepositoryResult<T>()
+
+    data class Error(val productErrorState: ProductErrorState) : ProductRepositoryResult<Nothing>()
+}