[부나] 2단계 재화 미션 제출합니다.

README.md

@@ -1,9 +1,35 @@
 # android-shopping-order
 
 ## UI
-- [ ] 데이터가 로딩되기 전 상태에서는 스켈레톤 UI를 노출한다.
-- [ ] 메인 액티비티가 로딩되기 전에 서버를 선택한다.
+- [x] 데이터가 로딩되기 전 상태에서는 스켈레톤 UI를 노출한다.
+- [x] 메인 액티비티가 로딩되기 전에 서버를 선택한다.
 
 ## Domain
-- [ ] 사용자 인증 정보를 저장한다.
-- [ ] 서버를 선택하여 교체할 수 있다.
+- [x] 사용자 인증 정보를 저장한다.
+- [x] 서버를 선택하여 교체할 수 있다.
+- [x] 장바구니에 담은 상품을 주문할 수 있다.
+```gherkin
+Given 장바구니에서 주문할 상품을 선택한다.
+When 상품을 주문한다.
+Then 주문이 완료되면 성공 메시지를 보여준다.
+```
+- [x] 상품 주문시 포인트를 적용할 수 있다.
+```gherkin
+Given 장바구니에서 선택된 상품이 존재한다.
+And 포인트가 존재한다.
+When 상품을 주문한다.
+Then 포인트가 적용된 가격으로 주문한다.
+```
+- [x] 사용자 별로 주문 목록을 확인할 수 있다.
+```gherkin
+Given 사용자가 주문한 상품이 존재한다.
+When 주문 목록을 확인한다.
+Then 주문 목록을 보여준다.
+```
+- [x] 특정 주문의 상세 정보를 확인할 수 있다.
+```gherkin
+Given 주문한 목록이 존재한다.
+When 특정 주문을 조회한다.
+Then 특정 주문의 상세 정보를 보여준다.
+```
+- [x] 서버 통신을 Retrofit으로 리팩터링한다.

app/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("kotlin-kapt")
     id("kotlin-parcelize")
+    kotlin("plugin.serialization") version "1.8.21"
 }
 
 android {
@@ -28,13 +29,16 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
+
     kotlinOptions {
         jvmTarget = "11"
     }
+
     dataBinding {
         enable = true
     }
@@ -68,4 +72,11 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:4.11.0")
     implementation("com.squareup.okhttp3:mockwebserver:4.11.0")
     testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
+
+    // Retrofit
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
+
+    // kotlinx-serializable
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
 }

app/src/main/AndroidManifest.xml

@@ -15,6 +15,12 @@
         android:theme="@style/Theme.Shopping"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.orderdetail.OrderDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.orderhistory.OrderHistoryActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.serversetting.ServerSettingActivity"
             android:exported="true">
@@ -24,11 +30,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.order.OrderActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.cart.CartActivity"
             android:exported="true" />
         <activity
-            android:name=".ui.detail.ProductDetailActivity"
+            android:name=".ui.productdetail.ProductDetailActivity"
             android:exported="true" />
         <activity
             android:name=".ui.shopping.ShoppingActivity"

app/src/main/java/woowacourse/shopping/data/dao/recentproduct/RecentProductDao.kt

@@ -1,10 +1,10 @@
 package woowacourse.shopping.data.dao.recentproduct
 
-import woowacourse.shopping.data.model.DataRecentProduct
+import woowacourse.shopping.data.entity.RecentProductEntity
 
 interface RecentProductDao {
     fun getSize(): Int
-    fun getRecentProductsPartially(size: Int): List<DataRecentProduct>
-    fun addRecentProduct(item: DataRecentProduct)
-    fun removeLast()
+    fun getRecentProducts(size: Int): List<RecentProductEntity>
+    fun saveRecentProduct(item: RecentProductEntity)
+    fun deleteLast()
 }

app/src/main/java/woowacourse/shopping/data/dao/recentproduct/RecentProductDaoImpl.kt

@@ -5,9 +5,8 @@ import android.content.ContentValues
 import android.database.sqlite.SQLiteOpenHelper
 import android.provider.BaseColumns
 import woowacourse.shopping.data.database.contract.RecentProductContract
-import woowacourse.shopping.data.model.DataPrice
-import woowacourse.shopping.data.model.DataRecentProduct
-import woowacourse.shopping.data.model.Product
+import woowacourse.shopping.data.entity.ProductEntity
+import woowacourse.shopping.data.entity.RecentProductEntity
 
 class RecentProductDaoImpl(private val database: SQLiteOpenHelper) : RecentProductDao {
 
@@ -23,8 +22,8 @@ class RecentProductDaoImpl(private val database: SQLiteOpenHelper) : RecentProdu
     }
 
     @SuppressLint("Range")
-    override fun getRecentProductsPartially(size: Int): List<DataRecentProduct> {
-        val products = mutableListOf<DataRecentProduct>()
+    override fun getRecentProducts(size: Int): List<RecentProductEntity> {
+        val products = mutableListOf<RecentProductEntity>()
         val db = database.writableDatabase
         val cursor = db.rawQuery(GET_PARTIALLY_QUERY, arrayOf(size.toString()))
         while (cursor.moveToNext()) {
@@ -33,27 +32,28 @@ class RecentProductDaoImpl(private val database: SQLiteOpenHelper) : RecentProdu
                 cursor.getInt(cursor.getColumnIndex(RecentProductContract.COLUMN_PRODUCT_ID))
             val name: String =
                 cursor.getString(cursor.getColumnIndex(RecentProductContract.COLUMN_NAME))
-            val price: DataPrice =
-                DataPrice(cursor.getInt(cursor.getColumnIndex(RecentProductContract.COLUMN_PRICE)))
+            val price =
+                cursor.getInt(cursor.getColumnIndex(RecentProductContract.COLUMN_PRICE))
             val imageUrl: String =
                 cursor.getString(cursor.getColumnIndex(RecentProductContract.COLUMN_IMAGE_URL))
-            products.add(DataRecentProduct(id, Product(productId, name, price, imageUrl)))
+            products.add(RecentProductEntity(id, ProductEntity(productId, name, price, imageUrl)))
         }
         cursor.close()
         return products
     }
 
-    override fun addRecentProduct(item: DataRecentProduct) {
+    override fun saveRecentProduct(item: RecentProductEntity) {
         val contentValues = ContentValues().apply {
             put(RecentProductContract.COLUMN_NAME, item.product.name)
-            put(RecentProductContract.COLUMN_PRICE, item.product.price.value)
+            put(RecentProductContract.COLUMN_PRODUCT_ID, item.product.id)
+            put(RecentProductContract.COLUMN_PRICE, item.product.price)
             put(RecentProductContract.COLUMN_IMAGE_URL, item.product.imageUrl)
         }
 
         database.writableDatabase.insert(RecentProductContract.TABLE_NAME, null, contentValues)
     }
 
-    override fun removeLast() {
+    override fun deleteLast() {
         val db = database.writableDatabase
         db.rawQuery(REMOVE_LAST_QUERY, null).close()
     }

app/src/main/java/woowacourse/shopping/data/database/ShoppingDatabase.kt

@@ -6,9 +6,9 @@ import android.database.sqlite.SQLiteOpenHelper
 import woowacourse.shopping.data.database.contract.RecentProductContract
 
 const val DATABASE_NAME = "ShoppingDatabase.db"
-const val DATABASE_VERSION = 12
+const val DATABASE_VERSION = 13
 
-class ShoppingDatabase(context: Context) :
+class ShoppingDatabase private constructor(context: Context) :
     SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
     override fun onCreate(db: SQLiteDatabase?) {
         db?.execSQL(RecentProductContract.CREATE_TABLE_QUERY)
@@ -18,4 +18,17 @@ class ShoppingDatabase(context: Context) :
         db?.execSQL(RecentProductContract.DELETE_TABLE_QUERY)
         onCreate(db)
     }
+
+    companion object {
+        private var database: ShoppingDatabase? = null
+
+        fun get(context: Context): ShoppingDatabase {
+            if (database == null) {
+                synchronized(this) {
+                    if (database == null) database = ShoppingDatabase(context)
+                }
+            }
+            return database!!
+        }
+    }
 }

app/src/main/java/woowacourse/shopping/data/dto/CartDto.kt

@@ -0,0 +1,26 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CartGetResponse(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("quantity")
+    val quantity: Int,
+    @SerialName("product")
+    val product: ProductItemResponse,
+)
+
+@Serializable
+data class CartAddRequest(
+    @SerialName("productId")
+    val productId: Int,
+)
+
+@Serializable
+data class CartPatchRequest(
+    @SerialName("quantity")
+    val quantity: Int,
+)

app/src/main/java/woowacourse/shopping/data/dto/OrderDto.kt

@@ -0,0 +1,48 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OrdersResponse(
+    @SerialName("pageInfo")
+    val pageInfo: PageInfoResponse,
+    @SerialName("orders")
+    val orders: List<OrderResponse> = listOf(),
+)
+
+@Serializable
+data class OrderResponse(
+    @SerialName("orderId")
+    val orderId: Int,
+    @SerialName("orderedProducts")
+    val orderedProducts: List<OrderProductResponse> = listOf(),
+    @SerialName("payment")
+    val payment: PaymentResponse,
+)
+
+@Serializable
+data class OrderProductResponse(
+    @SerialName("name")
+    val name: String,
+    @SerialName("price")
+    val price: Int,
+    @SerialName("quantity")
+    val quantity: Int,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+)
+
+@Serializable
+data class OrderPostRequest(
+    @SerialName("orderItems")
+    val orderItems: List<OrderItem>,
+    @SerialName("payment")
+    val payment: PaymentRequest,
+)
+
+@Serializable
+data class OrderItem(
+    @SerialName("cartItemId")
+    val cartItemId: Int,
+)

app/src/main/java/woowacourse/shopping/data/dto/PageInfoResponse.kt

@@ -0,0 +1,16 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PageInfoResponse(
+    @SerialName("page")
+    val page: Int,
+    @SerialName("size")
+    val size: Int,
+    @SerialName("totalElements")
+    val totalElements: Int,
+    @SerialName("totalPages")
+    val totalPages: Int,
+)

app/src/main/java/woowacourse/shopping/data/dto/PaymentDto.kt

@@ -0,0 +1,24 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PaymentResponse(
+    @SerialName("originalPayment")
+    val originalPayment: Int = 0,
+    @SerialName("finalPayment")
+    val finalPayment: Int = 0,
+    @SerialName("point")
+    val point: Int = 0,
+)
+
+@Serializable
+data class PaymentRequest(
+    @SerialName("originalPayment")
+    val originalPayment: Int,
+    @SerialName("finalPayment")
+    val finalPayment: Int,
+    @SerialName("point")
+    val usedPoint: Int,
+)

app/src/main/java/woowacourse/shopping/data/dto/PointDto.kt

@@ -0,0 +1,10 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PointResponse(
+    @SerialName("availablePoint")
+    val availablePoint: Int = 0,
+)

app/src/main/java/woowacourse/shopping/data/dto/ProductDto.kt

@@ -0,0 +1,54 @@
+package woowacourse.shopping.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ProductsResponse(
+    @SerialName("pageInfo")
+    val pageInfo: PageInfoResponse,
+    @SerialName("products")
+    val products: List<ProductItemResponse> = listOf(),
+)
+
+@Serializable
+data class ProductItemResponse(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+    @SerialName("name")
+    val name: String,
+    @SerialName("price")
+    val price: Int,
+)
+
+@Serializable
+data class ProductPostRequest(
+    @SerialName("name")
+    val name: String,
+    @SerialName("price")
+    val price: Int,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+)
+
+@Serializable
+data class ProductPutRequest(
+    @SerialName("name")
+    val name: String,
+    @SerialName("price")
+    val price: Int,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+)
+
+@Serializable
+data class ProductDeleteRequest(
+    @SerialName("name")
+    val name: String,
+    @SerialName("price")
+    val price: Int,
+    @SerialName("imageUrl")
+    val imageUrl: String,
+)