fix: CartActivity 버그 수정

app/src/main/java/woowacourse/shopping/view/cart/CartActivity.kt

@@ -19,17 +19,17 @@ class CartActivity : AppCompatActivity(), CartContract.View {
 
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
+ setUpPresenter()
  setUpBinding()
  setContentView(binding.root)
  setUpActionBar()
- setUpPresenter()
- binding.presenter = presenter
- binding.lifecycleOwner = this
  presenter.fetchProducts()
  }
 
  private fun setUpBinding() {
  binding = ActivityCartBinding.inflate(layoutInflater)
+ binding.lifecycleOwner = this
+ binding.presenter = presenter
  }
 
  private fun setUpActionBar() {
@@ -86,7 +86,6 @@ class CartActivity : AppCompatActivity(), CartContract.View {
  }
 
  companion object {
- private const val TITLE = "Cart"
  fun newIntent(context: Context): Intent = Intent(context, CartActivity::class.java)
  }
 }

app/src/main/java/woowacourse/shopping/view/cart/CartContract.kt

@@ -23,6 +23,6 @@ interface CartContract {
  fun fetchPrevPage()
  fun updateCartProductCount(id: Int, count: Int)
  fun selectProduct(product: CartProductModel)
- fun selectAll(isChecked: Boolean)
+ fun selectAll()
  }
 }

app/src/main/java/woowacourse/shopping/view/cart/CartPresenter.kt

@@ -1,5 +1,6 @@
 package woowacourse.shopping.view.cart
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import woowacourse.shopping.domain.*
@@ -62,10 +63,11 @@ class CartPresenter(
  cartItems.add(CartViewItem.CartProductItem(it))
  }
  cartItems.add(CartViewItem.PaginationItem(cartPagination.status))
+ _isCheckedAll.value = getIsCheckedAll()
  }
 
  private fun getIsCheckedAll() =
- cartSystem.selectedProducts.containsAll(convertItemsToCartProduct(cartItems))
+ cartSystem.selectedProducts.containsAll(convertItemsToCartProducts(cartItems))
 
  private fun getNextCartProductModel(): CartProductModel? {
  val product = cartPagination.currentLastItem() ?: return null
@@ -75,29 +77,40 @@ class CartPresenter(
  )
  }
 
- override fun selectAll(isChecked: Boolean) {
+ override fun selectAll() {
+ val isChecked = _isCheckedAll.value?.not() ?: true
+
  cartItems.filterIsInstance<CartViewItem.CartProductItem>().forEachIndexed { index, it ->
  it.product.isChecked = isChecked
  view.showChangedItem(index)
  }
 
  val products = if (isChecked) { // 전체 선택
- convertItemsToCartProduct(cartItems) - cartSystem.selectedProducts.toSet()
+ convertItemsToCartProducts(cartItems) - cartSystem.selectedProducts.toSet()
  } else { // 전체 해제
- convertItemsToCartProduct(cartItems).intersect(cartSystem.selectedProducts.toSet())
+ convertItemsToCartProducts(cartItems).intersect(cartSystem.selectedProducts.toSet())
  }
+ Log.d("PRODUCTS", products.toString())
+ var result: CartSystemResult? = _cartSystemResult.value
  products.forEach {
- _cartSystemResult.value = cartSystem.selectProduct(it)
+ result = cartSystem.selectProduct(it)
  }
+ _cartSystemResult.value = result
  _isCheckedAll.value = isChecked
  }
 
+ override fun selectProduct(product: CartProductModel) {
+ _cartSystemResult.value = cartSystem.selectProduct(product.toDomain())
+ _isCheckedAll.value = getIsCheckedAll()
+ }
+
  override fun fetchNextPage() {
  val items = cartPagination.nextItems()
  if (items.isNotEmpty()) {
  changeListItems(items)
  view.showChangedItems()
  }
+ _isCheckedAll.value = getIsCheckedAll()
  }
 
  override fun fetchPrevPage() {
@@ -106,6 +119,7 @@ class CartPresenter(
  changeListItems(items)
  view.showChangedItems()
  }
+ _isCheckedAll.value = getIsCheckedAll()
  }
 
  private fun changeListItems(items: List<CartProduct>) {
@@ -116,8 +130,9 @@ class CartPresenter(
  }
 
  override fun updateCartProductCount(id: Int, count: Int) {
+ if (count !in COUNT_MIN..COUNT_MAX) return
  cartRepository.update(id, count)
- val cartProducts = convertItemsToCartProduct(cartItems)
+ val cartProducts = convertItemsToCartProducts(cartItems)
  cartProducts.find { it.id == id }?.let {
  val index = cartProducts.indexOf(it)
  (cartItems[index] as CartViewItem.CartProductItem).product.count = count
@@ -126,20 +141,18 @@ class CartPresenter(
  }
  }
 
- override fun selectProduct(product: CartProductModel) {
- _cartSystemResult.value = cartSystem.selectProduct(product.toDomain())
- _isCheckedAll.value = getIsCheckedAll()
- }
 
  private fun convertCartProductToModels(cartProducts: List<CartProduct>) =
  cartProducts.map {
  it.toUiModel(cartSystem.isSelectedProduct(it), productRepository.find(it.id))
  }.toMutableList()
 
- private fun convertItemsToCartProduct(items: List<CartViewItem>): List<CartProduct> =
+ private fun convertItemsToCartProducts(items: List<CartViewItem>): List<CartProduct> =
  items.filterIsInstance<CartViewItem.CartProductItem>().map { it.product.toDomain() }
 
  companion object {
  private const val PAGINATION_SIZE = 5
+ private const val COUNT_MIN = 1
+ private const val COUNT_MAX = 100
  }
 }

app/src/main/java/woowacourse/shopping/view/productdetail/ProductDetailActivity.kt

@@ -67,7 +67,6 @@ class ProductDetailActivity : AppCompatActivity(), ProductDetailContract.View {
  startLastViewedDetailActivity(lastViewedProduct)
  }
  }
- productDetailBinding.presenter = presenter
  Glide.with(productDetailBinding.root.context).load(product.imageUrl).into(productDetailBinding.imgProduct)
  productDetailBinding.btnPutInCart.setOnClickListener {
  dialog.show()
@@ -81,14 +80,11 @@ class ProductDetailActivity : AppCompatActivity(), ProductDetailContract.View {
  }
 
  private fun setUpDialogBinding(product: ProductModel) {
+ dialogBinding.lifecycleOwner = this
  dialogBinding.presenter = presenter
  dialogBinding.product = product
  }
 
- override fun updateCount(count: Int) {
- dialogBinding.textCount.text = count.toString()
- }
-
  private fun setUpResult(isAdd: Boolean) {
  if (isAdd) {
  setResult(RESULT_ADDED, intent)

app/src/main/java/woowacourse/shopping/view/productdetail/ProductDetailContract.kt

@@ -1,14 +1,15 @@
 package woowacourse.shopping.view.productdetail
 
+import androidx.lifecycle.LiveData
 import woowacourse.shopping.model.ProductModel
 
 interface ProductDetailContract {
  interface View {
  fun finishActivity(isAdd: Boolean)
- fun updateCount(count: Int)
  }
 
  interface Presenter {
+ val count: LiveData<Int>
  fun putInCart(product: ProductModel)
  fun updateRecentViewedProducts(id: Int)
  fun plusCount()

app/src/main/java/woowacourse/shopping/view/productdetail/ProductDetailPresenter.kt

@@ -1,5 +1,7 @@
 package woowacourse.shopping.view.productdetail
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import woowacourse.shopping.domain.CartRepository
 import woowacourse.shopping.domain.RecentViewedRepository
 import woowacourse.shopping.model.ProductModel
@@ -9,9 +11,12 @@ class ProductDetailPresenter(
  private val cartRepository: CartRepository,
  private val recentViewedRepository: RecentViewedRepository,
 ) : ProductDetailContract.Presenter {
- private var count = 1
+ private val _count: MutableLiveData<Int> = MutableLiveData<Int>(1)
+ override val count: LiveData<Int>
+ get() = _count
+
  override fun putInCart(product: ProductModel) {
- cartRepository.add(product.id, count)
+ if (_count.value != null) cartRepository.add(product.id, _count.value ?: 0)
  view.finishActivity(true)
  }
 
@@ -20,13 +25,11 @@ class ProductDetailPresenter(
  }
 
  override fun plusCount() {
- if (count < COUNT_MAX) count++
- view.updateCount(count)
+ if (_count.value in COUNT_MIN until COUNT_MAX) _count.value = _count.value?.plus(1)
  }
 
  override fun minusCount() {
- if (count > COUNT_MIN) count--
- view.updateCount(count)
+ if (_count.value in COUNT_MIN + 1..COUNT_MAX) _count.value = _count.value?.minus(1)
  }
 
  companion object {

app/src/main/res/layout/activity_cart.xml

@@ -51,7 +51,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:checked="@{presenter.isCheckedAll()}"
- android:onCheckedChanged="@{(view, checked) -> presenter.selectAll(checked)}"
+ android:onClick="@{() -> presenter.selectAll()}"
  android:minWidth="0dp"
  android:minHeight="0dp" />
 

app/src/main/res/layout/activity_product_detail.xml

@@ -13,10 +13,6 @@
  name="product"
  type="woowacourse.shopping.model.ProductModel" />
 
- <variable
- name="presenter"
- type="woowacourse.shopping.view.productdetail.ProductDetailContract.Presenter" />
-
  <variable
  name="last_viewed_product"
  type="woowacourse.shopping.model.ProductModel" />
@@ -77,7 +73,7 @@
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginEnd="18dp"
- android:text="@{String.format(@string/korean_won, PriceFormatter.INSTANCE.format(product.price))}"
+ android:text="@{@string/korean_won2(product.price)}"
  android:textColor="@color/black"
  android:textSize="20sp"
  app:layout_constraintEnd_toEndOf="parent"
@@ -124,7 +120,7 @@
  android:id="@+id/text_price_viewed_last"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:text="@{String.format(@string/korean_won, PriceFormatter.INSTANCE.format(last_viewed_product.price))}"
+ android:text="@{@string/korean_won2(last_viewed_product.price)}"
  android:textColor="@color/black"
  android:textSize="16sp"
  app:layout_constraintBottom_toBottomOf="@id/text_product_name_viewed_last"

app/src/main/res/layout/dialog_count.xml

@@ -9,7 +9,6 @@
  <variable
  name="product"
  type="woowacourse.shopping.model.ProductModel" />
- <import type="woowacourse.shopping.util.PriceFormatter" />
  </data>
 
  <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
@@ -41,7 +40,7 @@
  android:textSize="16sp"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@id/text_product_name_selected"
- android:text="@{String.format(@string/korean_won, PriceFormatter.INSTANCE.format(product.price))}"
+ android:text="@{@string/korean_won2(product.price)}"
  tools:text="99,900원" />
 
  <androidx.appcompat.widget.AppCompatButton
@@ -62,7 +61,7 @@
  android:layout_width="42dp"
  android:layout_height="0dp"
  android:gravity="center"
- android:text="1"
+ android:text="@{presenter.count.toString()}"
  android:textColor="@color/gray"
  android:textSize="22sp"
  app:layout_constraintBottom_toBottomOf="@id/btn_plus"

app/src/main/res/layout/item_cart.xml

@@ -32,7 +32,7 @@
  android:checked="@{cartProduct.checked}"
  android:minWidth="0dp"
  android:minHeight="0dp"
- android:onCheckedChanged="@{() -> onItemClick.onSelectProduct(cartProduct)}"
+ android:onClick="@{() -> onItemClick.onSelectProduct(cartProduct)}"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent" />
 

app/src/test/java/woowacourse/shopping/ProductListPresenterTest.kt

@@ -72,32 +72,32 @@ class ProductListPresenterTest {
  val itemsExpected = listOf<ProductListViewItem>(
  ProductListViewItem.RecentViewedItem(
  listOf(
- ProductModel(2, "헛개차", "", 10000),
- ProductModel(1, "현미밥", "", 10000),
- ProductModel(0, "락토핏", "", 10000)
+ ProductModel(2, "헛개차", "", 10000, 0),
+ ProductModel(1, "현미밥", "", 10000, 0),
+ ProductModel(0, "락토핏", "", 10000, 0)
  )
  )
  ) + listOf<ProductListViewItem>(
- ProductListViewItem.ProductItem(ProductModel(0, "락토핏", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(1, "현미밥", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(2, "헛개차", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(3, "키", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(4, "닭가슴살", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(5, "enffl", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(6, "뽀또", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(7, "둘리", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(8, "안녕", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(9, "9", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(10, "10", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(11, "11", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(12, "12", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(13, "13", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(14, "14", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(15, "15", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(16, "16", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(17, "17", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(18, "18", "", 10000)),
- ProductListViewItem.ProductItem(ProductModel(19, "19", "", 10000)),
+ ProductListViewItem.ProductItem(ProductModel(0, "락토핏", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(1, "현미밥", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(2, "헛개차", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(3, "키", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(4, "닭가슴살", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(5, "enffl", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(6, "뽀또", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(7, "둘리", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(8, "안녕", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(9, "9", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(10, "10", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(11, "11", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(12, "12", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(13, "13", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(14, "14", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(15, "15", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(16, "16", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(17, "17", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(18, "18", "", 10000, 0)),
+ ProductListViewItem.ProductItem(ProductModel(19, "19", "", 10000, 0)),
  ) + ProductListViewItem.ShowMoreItem()
  assertEquals(itemsExpected.subList(0, 21), items.captured.subList(0, 21))
  assertEquals(itemsExpected[itemsExpected.lastIndex].javaClass, items.captured[items.captured.lastIndex].javaClass)

domain/src/main/java/woowacourse/shopping/domain/CartSystem.kt

@@ -13,7 +13,7 @@ class CartSystem(
  }
 
  fun selectProduct(product: CartProduct): CartSystemResult {
- if (_selectedProducts.find { it.cartProduct.id  == product.id } == null){
+ if (_selectedProducts.find { it.cartProduct.id == product.id } == null) {
  val price = productRepository.find(product.id).price
  _selectedProducts.add(CartSystemProduct(product, price))
  totalPrice += price * product.count
@@ -24,7 +24,8 @@ class CartSystem(
  }
 
  private fun deselectProduct(id: Int): CartSystemResult {
- val product = _selectedProducts.find { it.cartProduct.id == id } ?: throw java.lang.IllegalArgumentException()
+ val product = _selectedProducts.find { it.cartProduct.id == id }
+ ?: throw java.lang.IllegalArgumentException()
  totalPrice -= product.price * product.cartProduct.count
  _selectedProducts.remove(product)
  println("Delete : $product | total: $totalPrice")
@@ -33,13 +34,14 @@ class CartSystem(
 
  fun updateProduct(id: Int, count: Int): CartSystemResult {
  val index = _selectedProducts.indexOfFirst { it.cartProduct.id == id }
- if (index != -1) {
- println("Before : ${_selectedProducts[index]}")
- val diff = count - _selectedProducts[index].cartProduct.count
- totalPrice += _selectedProducts[index].price * diff
- _selectedProducts[index] = CartSystemProduct(CartProduct(id, count), _selectedProducts[index].price)
- println("After : ${_selectedProducts[index]}")
- }
+ if (index == -1) return CartSystemResult(totalPrice.price, _selectedProducts.size)
+
+ println("Before : ${_selectedProducts[index]}")
+ val diff = count - _selectedProducts[index].cartProduct.count
+ totalPrice += _selectedProducts[index].price.price * diff
+ _selectedProducts[index] = CartSystemProduct(CartProduct(id, count), _selectedProducts[index].price)
+ println("After : ${_selectedProducts[index]}")
+
  return CartSystemResult(totalPrice.price, _selectedProducts.size)
  }