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

app/src/main/java/woowacourse/shopping/data/repository/DefaultCartRepository.kt

@@ -1,5 +1,6 @@
 package woowacourse.shopping.data.repository
 
+import android.util.Log
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -39,28 +40,41 @@ class DefaultCartRepository(private val service: CartService) : CartRepository {
         onSuccess: (CartProduct) -> Unit,
         onFailed: () -> Unit,
     ) {
-        getAllCartProducts(
-            onSuccess = { cartProducts ->
-                val cartProduct = cartProducts.find { it.product.id == productId } ?: run {
-                    onFailed()
-                    return@getAllCartProducts
+        service.findCartProductByProductId(productId).enqueue(object : Callback<CartGetResponse> {
+            override fun onResponse(
+                call: Call<CartGetResponse>,
+                response: Response<CartGetResponse>,
+            ) {
+                Log.d("buna", response.code().toString())
+                if (response.isSuccessful && response.body() != null) {
+                    onSuccess(response.body()!!.toDomain())
+                    return
                 }
-                onSuccess(cartProduct)
-            },
-            onFailed = { onFailed() }
-        )
+                onFailed()
+            }
+
+            override fun onFailure(call: Call<CartGetResponse>, throwable: Throwable) {
+                onFailed()
+            }
+        })
     }
 
     override fun saveCartProductByProductId(
         productId: ProductId,
-        onSuccess: () -> Unit,
+        onSuccess: (cartItemId: Int) -> Unit,
         onFailed: (Throwable) -> Unit,
     ) {
         service.saveCartProduct(requestBody = CartAddRequest(productId))
             .enqueue(object : Callback<Unit> {
                 override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
+                    Log.d("buna", response.code().toString())
                     if (response.isSuccessful && response.body() != null) {
-                        onSuccess()
+                        val header = response.headers()["location"]
+                        val cartItemId = header?.substringAfterLast("/")?.toIntOrNull() ?: run {
+                            onFailed(Throwable(response.message()))
+                            return
+                        }
+                        onSuccess(cartItemId)
                         return
                     }
                     onFailed(Throwable(response.message()))
@@ -129,13 +143,12 @@ class DefaultCartRepository(private val service: CartService) : CartRepository {
                 updateProductCountById(cartProduct.id, updatedCount, onSuccess, onFailed)
             },
             onFailed = {
-                saveCartProductByProductId(productId, onSuccess, onFailed)
-                findCartProductByProductId(
+                saveCartProductByProductId(
                     productId = productId,
-                    onSuccess = { newCartProduct ->
-                        updateProductCountById(newCartProduct.id, addCount, onSuccess, onFailed)
+                    onSuccess = { cartItemId ->
+                        updateProductCountById(cartItemId, addCount, onSuccess, onFailed)
                     },
-                    onFailed = {}
+                    onFailed = onFailed
                 )
             })
     }

app/src/main/java/woowacourse/shopping/ui/shopping/ShoppingActivity.kt

@@ -56,7 +56,7 @@ class ShoppingActivity : AppCompatActivity(), View,
 
     private fun initShoppingToolbar() {
         val cart = binding.shoppingToolBar.findItemActionView(R.id.cart)
-        cart?.setOnClickListener { presenter.navigateToCart() }
+        cart?.setOnClickListener { presenter.inquiryCart() }
 
         binding.shoppingToolBar.setOnMenuItemClickListener { item ->
             if (item?.itemId == R.id.order_list) presenter.inquiryOrders()

app/src/main/java/woowacourse/shopping/ui/shopping/ShoppingContract.kt

@@ -27,7 +27,7 @@ interface ShoppingContract {
         fun addCartProduct(product: ProductModel, addCount: Int = 1)
         fun updateCartCount(cartProduct: CartProductModel, changedCount: Int)
         fun increaseCartCount(product: ProductModel, addCount: Int)
-        fun navigateToCart()
+        fun inquiryCart()
         fun inquiryProductDetail(cartProduct: CartProductModel)
         fun inquiryRecentProductDetail(recentProduct: RecentProductModel)
         fun inquiryOrders()

app/src/main/java/woowacourse/shopping/ui/shopping/ShoppingPresenter.kt

@@ -19,6 +19,7 @@ import woowacourse.shopping.model.mapper.toDomain
 import woowacourse.shopping.model.mapper.toUi
 import woowacourse.shopping.ui.shopping.ShoppingContract.Presenter
 import woowacourse.shopping.ui.shopping.ShoppingContract.View
+import woowacourse.shopping.util.collection.DistinctList
 
 class ShoppingPresenter(
     private val view: View,
@@ -30,10 +31,13 @@ class ShoppingPresenter(
     sizePerPage: Int = 20,
 ) : Presenter {
     private var cart = Cart()
+    private val products: DistinctList<Product> = DistinctList()
     private var currentPage: Page = LoadMore(sizePerPage = sizePerPage)
+    private val cartProductCount: ProductCountModel
+        get() = ProductCountModel(cart.productCountInCart)
 
     override fun fetchAll() {
-        fetchAllCartProducts()
+        loadProducts(currentPage)
         fetchRecentProducts()
     }
 
@@ -43,36 +47,10 @@ class ShoppingPresenter(
 
     override fun loadMoreProducts() {
         currentPage = currentPage.next()
+        loadProducts(currentPage)
         updateCartView()
     }
 
-    override fun addCartProduct(product: ProductModel, addCount: Int) {
-        cartRepository.saveCartProductByProductId(
-            productId = product.toDomain().id,
-            onSuccess = ::fetchAllCartProducts,
-            onFailed = { view.showCartProductSaveFailed() })
-    }
-
-    override fun updateCartCount(cartProduct: CartProductModel, changedCount: Int) {
-        cartRepository.updateProductCountById(
-            cartProductId = cartProduct.toDomain().id,
-            count = ProductCount(changedCount),
-            onSuccess = ::fetchAllCartProducts,
-            onFailed = { view.showCartCountChangedFailed() })
-    }
-
-    override fun increaseCartCount(product: ProductModel, addCount: Int) {
-        cartRepository.increaseProductCountByProductId(
-            productId = product.id,
-            addCount = ProductCount(addCount),
-            onSuccess = ::fetchAllCartProducts,
-            onFailed = { view.showCartCountChangedFailed() })
-    }
-
-    override fun navigateToCart() {
-        view.navigateToCart()
-    }
-
     override fun inquiryProductDetail(cartProduct: CartProductModel) {
         val recentProduct = RecentProduct(product = cartProduct.product.toDomain())
         view.navigateToProductDetail(cartProduct.product)
@@ -83,57 +61,82 @@ class ShoppingPresenter(
         view.navigateToProductDetail(recentProduct.product)
     }
 
+    override fun inquiryCart() {
+        view.navigateToCart()
+    }
+
     override fun inquiryOrders() {
         view.navigateToOrderList()
     }
 
-    private fun fetchAllCartProducts() {
-        productRepository.getProductsByPage(
-            page = currentPage.getPageForCheckHasNext(),
-            onSuccess = { products -> transformCountedCartProduct(products, ::updateCart) },
-            onFailed = { view.showProductLoadFailed() }
+    override fun addCartProduct(product: ProductModel, addCount: Int) {
+        cartRepository.saveCartProductByProductId(
+            product.toDomain().id,
+            onSuccess = { loadProducts(currentPage) },
+            onFailed = { view.showCartProductSaveFailed() },
         )
     }
 
-    private fun transformCountedCartProduct(
-        products: List<Product>,
-        onSuccess: (List<CartProduct>) -> Unit,
-    ) {
-        cartRepository.getAllCartProducts(
-            onSuccess = { fetchedCartProducts ->
-                val countedCartProduct = products.map { product ->
-                    fetchedCartProducts.find { it.productId == product.id } ?: CartProduct(
-                        product = product,
-                        selectedCount = ProductCount(0)
-                    )
+    override fun updateCartCount(cartProduct: CartProductModel, changedCount: Int) {
+        cartRepository.updateProductCountById(
+            cartProduct.toDomain().id,
+            ProductCount(changedCount),
+            onSuccess = { loadProducts(currentPage) },
+            onFailed = { view.showCartCountChangedFailed() },
+        )
+    }
+
+    override fun increaseCartCount(product: ProductModel, addCount: Int) {
+        cartRepository.increaseProductCountByProductId(
+            product.id,
+            ProductCount(addCount),
+            onSuccess = {},
+            onFailed = { view.showCartCountChangedFailed() },
+        )
+        loadProducts(currentPage)
+    }
+
+    private fun loadProducts(page: Page) {
+        productRepository.getProductsByPage(
+            page = page.getPageForCheckHasNext(),
+            onSuccess = { fetchedProducts ->
+                products.addAll(fetchedProducts)
+                loadCartProducts { fetchedCartProducts ->
+                    updateCart(transformCartProducts(products, fetchedCartProducts))
                 }
-                onSuccess(countedCartProduct)
             },
             onFailed = { view.showProductLoadFailed() },
         )
     }
 
+    private fun transformCartProducts(
+        products: List<Product>,
+        cartProducts: List<CartProduct>,
+    ): List<CartProduct> = products.map { product ->
+        cartProducts.find { it.productId == product.id } ?: CartProduct(
+            product = product,
+            selectedCount = ProductCount(0),
+        )
+    }
+
+    private fun loadCartProducts(onLoaded: (List<CartProduct>) -> Unit) {
+        cartRepository.getAllCartProducts(
+            onSuccess = { cartProducts -> onLoaded(cartProducts) },
+            onFailed = {},
+        )
+    }
+
     private fun updateCart(newCartProducts: List<CartProduct>) {
         cart = cart.update(newCartProducts)
         updateCartView()
     }
 
     private fun updateCartView() {
-        updateCartProductCount()
         view.updateProducts(currentPage.takeItems(cart).toUi())
+        view.updateCartBadge(cartProductCount)
         view.updateLoadMoreVisible()
     }
 
-    private fun updateCartProductCount() {
-        cartRepository.getAllCartProducts(
-            onSuccess = {
-                view.updateCartBadge(ProductCountModel(Cart(it).productCountInCart))
-            },
-            onFailed = {
-                view.updateCartBadge(ProductCountModel(0))
-            })
-    }
-
     private fun View.updateLoadMoreVisible() {
         if (currentPage.hasNext(cart)) showLoadMoreButton() else hideLoadMoreButton()
     }

app/src/main/java/woowacourse/shopping/util/collection/DistinctList.kt

@@ -0,0 +1,21 @@
+package woowacourse.shopping.util.collection
+
+class DistinctList<E> : ArrayList<E>() {
+
+    override fun addAll(elements: Collection<E>): Boolean {
+        val temp = mutableListOf<E>()
+        elements.forEach { element ->
+            if (!contains(element)) {
+                temp.add(element)
+            }
+        }
+        return super.addAll(temp)
+    }
+
+    override fun add(element: E): Boolean {
+        if (!contains(element)) {
+            return super.add(element)
+        }
+        return false
+    }
+}

app/src/test/java/woowacourse/shopping/ui/shopping/ShoppingPresenterTest.kt

@@ -110,7 +110,7 @@ internal class ShoppingPresenterTest {
         /* ... */
 
         // when
-        presenter.navigateToCart()
+        presenter.inquiryCart()
 
         // then
         verify(exactly = 1) { view.navigateToCart() }
@@ -122,7 +122,7 @@ internal class ShoppingPresenterTest {
         /* ... */
 
         // when
-        presenter.navigateToCart()
+        presenter.inquiryCart()
 
         // then
         verify(exactly = 1) { view.navigateToCart() }

domain/src/main/java/woowacourse/shopping/domain/repository/CartRepository.kt

@@ -18,7 +18,7 @@ interface CartRepository {
 
     fun saveCartProductByProductId(
         productId: ProductId,
-        onSuccess: () -> Unit, onFailed: (Throwable) -> Unit,
+        onSuccess: (cartItemId: Int) -> Unit, onFailed: (Throwable) -> Unit,
     )
 
     fun updateProductCountById(