[둘리] 1, 2단계 쇼핑 장바구니 제출합니다.

app/src/main/java/woowacourse/shopping/model/CartPageStatus.kt

@@ -1,6 +1,6 @@
 package woowacourse.shopping.model
 
-class CartPageStatus(
+data class CartPageStatus(
  val isPrevEnabled: Boolean,
  val isNextEnabled: Boolean,
  val count: Int

app/src/main/java/woowacourse/shopping/model/NextPagination.kt

@@ -1,6 +1,5 @@
 package woowacourse.shopping.model
 
-
 interface NextPagination<T> {
  val isNextEnabled: Boolean
  get() = nextItemExist()

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

@@ -5,13 +5,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import woowacourse.shopping.data.CartDbRepository
 import woowacourse.shopping.data.ProductMockRepository
 import woowacourse.shopping.databinding.ActivityCartBinding
-import woowacourse.shopping.model.CartPageStatus
-import woowacourse.shopping.model.CartProductModel
-import woowacourse.shopping.model.ProductModel
 
 class CartActivity : AppCompatActivity(), CartContract.View {
  private lateinit var binding: ActivityCartBinding
@@ -40,19 +36,22 @@ class CartActivity : AppCompatActivity(), CartContract.View {
  }
 
  override fun showProducts(items: List<CartViewItem>) {
- binding.recyclerCart.adapter = CartAdapter(items, object : CartAdapter.OnItemClick {
- override fun onRemoveClick(id: Int) {
- presenter.removeProduct(id)
- }
+ binding.recyclerCart.adapter = CartAdapter(
+ items,
+ object : CartAdapter.OnItemClick {
+ override fun onRemoveClick(id: Int) {
+ presenter.removeProduct(id)
+ }
 
- override fun onNextClick() {
- presenter.fetchNextPage()
- }
+  override fun onNextClick() {
+  presenter.fetchNextPage()
+  }
 
- override fun onPrevClick() {
- presenter.fetchPrevPage()
+ override fun onPrevClick() {
+ presenter.fetchPrevPage()
+ }
  }
- })
+ )
  }
 
  override fun showOtherPage() {

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

@@ -2,9 +2,6 @@ package woowacourse.shopping.view.cart
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import woowacourse.shopping.model.CartPageStatus
-import woowacourse.shopping.model.CartProductModel
-import woowacourse.shopping.model.ProductModel
 
 class CartAdapter(
  private val items: List<CartViewItem>,

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

@@ -1,8 +1,5 @@
 package woowacourse.shopping.view.cart
 
-import woowacourse.shopping.model.CartPageStatus
-import woowacourse.shopping.model.CartProductModel
-
 interface CartContract {
  interface View {
  fun showProducts(items: List<CartViewItem>)

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

@@ -8,9 +8,6 @@ import com.bumptech.glide.Glide
 import woowacourse.shopping.R
 import woowacourse.shopping.databinding.ItemCartBinding
 import woowacourse.shopping.databinding.ItemCartPaginationBinding
-import woowacourse.shopping.model.CartPageStatus
-import woowacourse.shopping.model.CartProductModel
-import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 
 sealed class CartItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
@@ -67,4 +64,3 @@ sealed class CartItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  }
  }
 }
-

app/src/main/java/woowacourse/shopping/model/CartPagination.kt → app/src/main/java/woowacourse/shopping/view/cart/CartPagination.kt

@@ -1,10 +1,10 @@
-package woowacourse.shopping.model
+package woowacourse.shopping.view.cart
 
-import woowacourse.shopping.model.NextPagination
-import woowacourse.shopping.model.PrevPagination
 import woowacourse.shopping.domain.CartProduct
 import woowacourse.shopping.domain.CartRepository
 import woowacourse.shopping.model.CartPageStatus
+import woowacourse.shopping.model.NextPagination
+import woowacourse.shopping.model.PrevPagination
 
 class CartPagination(private val rangeSize: Int, private val cartRepository: CartRepository) :
  NextPagination<CartProduct>, PrevPagination<CartProduct> {

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

@@ -3,7 +3,6 @@ package woowacourse.shopping.view.cart
 import woowacourse.shopping.domain.CartProduct
 import woowacourse.shopping.domain.CartRepository
 import woowacourse.shopping.domain.ProductRepository
-import woowacourse.shopping.model.CartPagination
 import woowacourse.shopping.model.toUiModel
 
 class CartPresenter(
@@ -16,9 +15,8 @@ class CartPresenter(
  private val currentCartProducts =
  convertToCartProductModels(cartPagination.nextItems()).toMutableList()
  private val cartItems =
- (currentCartProducts.map { CartViewItem.CartProductItem(it) } + CartViewItem.PaginationItem(
- cartPagination.status
- )).toMutableList()
+ (currentCartProducts.map { CartViewItem.CartProductItem(it) }
+ + CartViewItem.PaginationItem(cartPagination.status)).toMutableList()
 
  override fun fetchProducts() {
  view.showProducts(cartItems)

app/src/main/java/woowacourse/shopping/view/productlist/ProductListActivity.kt

@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
@@ -21,7 +20,7 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  private lateinit var binding: ActivityProductListBinding
  private lateinit var presenter: ProductListContract.Presenter
  private val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
- if(it.resultCode == RESULT_VIEWED) {
+ if (it.resultCode == RESULT_VIEWED) {
  val id = it.data?.getIntExtra("id", -1)
  presenter.updateRecentViewed(id ?: -1)
  }

app/src/main/java/woowacourse/shopping/view/productlist/ProductListContract.kt

@@ -1,7 +1,5 @@
 package woowacourse.shopping.view.productlist
 
-import woowacourse.shopping.model.ProductModel
-
 interface ProductListContract {
  interface View {
  fun showProducts(items: List<ProductListViewItem>)

app/src/main/java/woowacourse/shopping/model/ProductListPagination.kt → app/src/main/java/woowacourse/shopping/view/productlist/ProductListPagination.kt

@@ -1,8 +1,8 @@
-package woowacourse.shopping.model
+package woowacourse.shopping.view.productlist
 
-import woowacourse.shopping.model.NextPagination
 import woowacourse.shopping.domain.Product
 import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.model.NextPagination
 
 class ProductListPagination(
  private val rangeSize: Int,

app/src/main/java/woowacourse/shopping/view/productlist/ProductListPresenter.kt

@@ -1,9 +1,7 @@
 package woowacourse.shopping.view.productlist
 
-import android.util.Log
 import woowacourse.shopping.domain.ProductRepository
 import woowacourse.shopping.domain.RecentViewedRepository
-import woowacourse.shopping.model.ProductListPagination
 import woowacourse.shopping.model.toUiModel
 
 class ProductListPresenter(
@@ -25,7 +23,7 @@ class ProductListPresenter(
  // 상품 리스트
  productsListItems.addAll(products.map { ProductListViewItem.ProductItem(it) })
  // 더보기
- if(productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
+ if (productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
  view.showProducts(productsListItems)
  }
 
@@ -36,7 +34,7 @@ class ProductListPresenter(
  // RecyclerView Items 수정
  productsListItems.removeLast()
  productsListItems.addAll(nextProducts.map { ProductListViewItem.ProductItem(it) })
- if(productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
+ if (productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
  // Notify
  view.notifyAddProducts(mark, PAGINATION_SIZE)
  }
@@ -49,7 +47,7 @@ class ProductListPresenter(
  view.notifyRecentViewedChanged()
  }
 
- private fun convertIdToProductModel(id: Int) =  productRepository.find(id).toUiModel()
+ private fun convertIdToProductModel(id: Int) = productRepository.find(id).toUiModel()
 
  private fun isExistRecentViewed(): Boolean = productsListItems[0] is ProductListViewItem.RecentViewedItem
 

app/src/main/java/woowacourse/shopping/view/productlist/ProductListViewItem.kt

@@ -1,7 +1,5 @@
 package woowacourse.shopping.view.productlist
 
-import woowacourse.shopping.model.CartPageStatus
-import woowacourse.shopping.model.CartProductModel
 import woowacourse.shopping.model.ProductModel
 
 sealed interface ProductListViewItem {

app/src/main/java/woowacourse/shopping/view/productlist/ProductViewHolder.kt

@@ -9,7 +9,6 @@ import woowacourse.shopping.R
 import woowacourse.shopping.databinding.ItemProductBinding
 import woowacourse.shopping.databinding.ItemRecentViewedBinding
 import woowacourse.shopping.databinding.ItemShowMoreBinding
-import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 import woowacourse.shopping.view.productlist.recentviewed.RecentViewedAdapter
 
@@ -66,12 +65,14 @@ sealed class ProductViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  ProductListViewType.PRODUCT_ITEM -> ProductItemViewHolder(
  ItemProductBinding.bind(
  view
- ), onItemClick
+ ),
+ onItemClick
  )
  ProductListViewType.SHOW_MORE_ITEM -> ShowMoreViewHolder(
  ItemShowMoreBinding.bind(
  view
- ), onItemClick
+ ),
+ onItemClick
  )
  }
  }

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

@@ -0,0 +1,137 @@
+package woowacourse.shopping
+
+import android.util.Log
+import io.mockk.*
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import woowacourse.shopping.domain.*
+import woowacourse.shopping.model.CartPageStatus
+import woowacourse.shopping.model.CartProductModel
+import woowacourse.shopping.model.ProductModel
+import woowacourse.shopping.model.toUiModel
+import woowacourse.shopping.view.cart.CartContract
+import woowacourse.shopping.view.cart.CartPresenter
+import woowacourse.shopping.view.cart.CartViewItem
+import woowacourse.shopping.view.productlist.ProductListContract
+import woowacourse.shopping.view.productlist.ProductListPresenter
+import woowacourse.shopping.view.productlist.ProductListViewItem
+
+class CartPresenterTest {
+ private lateinit var presenter: CartContract.Presenter
+ private lateinit var view: CartContract.View
+
+ @Before
+ fun setUp() {
+ view = mockk(relaxed = true)
+ val productRepository = object : ProductRepository {
+ private val mProducts = products
+ override fun findAll(): List<Product> {
+ return mProducts
+ }
+
+ override fun find(id: Int): Product {
+ return mProducts[id]
+ }
+
+ override fun findRange(mark: Int, rangeSize: Int): List<Product> {
+ return mProducts.subList(mark, mark + rangeSize)
+ }
+
+ override fun isExistByMark(mark: Int): Boolean {
+ return mProducts.find { it.id == mark } != null
+ }
+ }
+
+ val cartRepository = object : CartRepository {
+ private val cartProducts = mutableListOf<CartProduct>()
+ init {
+ cartProducts.add(CartProduct(0, 1))
+ cartProducts.add(CartProduct(1, 1))
+ cartProducts.add(CartProduct(2, 1))
+ cartProducts.add(CartProduct(3, 1))
+ cartProducts.add(CartProduct(4, 1))
+ cartProducts.add(CartProduct(5, 1))
+ cartProducts.add(CartProduct(6, 1))
+ cartProducts.add(CartProduct(7, 1))
+
+ }
+
+ override fun findAll(): List<CartProduct> {
+ return cartProducts
+ }
+
+ override fun add(id: Int, count: Int) {
+ cartProducts.add(CartProduct(id, count))
+ }
+
+ override fun remove(id: Int) {
+ cartProducts.remove(cartProducts.find { it.id == id })
+ }
+
+ override fun findRange(mark: Int, rangeSize: Int): List<CartProduct> {
+ return cartProducts.subList(mark, mark + rangeSize)
+ }
+
+ override fun isExistByMark(mark: Int): Boolean {
+ return cartProducts.getOrNull(mark) != null
+ }
+
+ }
+
+ presenter = CartPresenter(view, cartRepository, productRepository)
+ presenter.fetchProducts()
+ }
+
+ @Test
+ fun 장바구니의_상품을_띄울_수_있다() {
+ val items = slot<List<CartViewItem>>()
+ every { view.showProducts(capture(items)) } just runs
+ presenter.fetchProducts()
+ val itemsExpected = listOf<CartViewItem>(
+ CartViewItem.CartProductItem(CartProduct(0, 1).toUiModel(products[0])),
+ CartViewItem.CartProductItem(CartProduct(1, 1).toUiModel(products[1])),
+ CartViewItem.CartProductItem(CartProduct(2, 1).toUiModel(products[2])),
+ CartViewItem.CartProductItem(CartProduct(3, 1).toUiModel(products[3])),
+ CartViewItem.CartProductItem(CartProduct(4, 1).toUiModel(products[4])),
+ ) + CartViewItem.PaginationItem(CartPageStatus(
+ isPrevEnabled = false,
+ isNextEnabled = true,
+ count = 1
+ ))
+ assertEquals(itemsExpected, items.captured)
+ }
+
+ @Test
+ fun 장바구니_상품을_삭제할_수_있다() {
+ val actualId = slot<Int>()
+ every { view.notifyRemoveItem(capture(actualId)) } just runs
+ presenter.removeProduct(0)
+ assertEquals(0, actualId.captured)
+ }
+
+ private val products = listOf(
+ Product(0, "락토핏", "", Price(10000)),
+ Product(1, "락토핏", "", Price(10000)),
+ Product(2, "락토핏", "", Price(10000)),
+ Product(3, "락토핏", "", Price(10000)),
+ Product(4, "락토핏", "", Price(10000)),
+ Product(5, "락토핏", "", Price(10000)),
+ Product(6, "락토핏", "", Price(10000)),
+ Product(7, "락토핏", "", Price(10000)),
+ Product(8, "락토핏", "", Price(10000)),
+ Product(9, "락토핏", "", Price(10000)),
+ Product(10, "락토핏", "", Price(10000)),
+ Product(11, "락토핏", "", Price(10000)),
+ Product(12, "락토핏", "", Price(10000)),
+ Product(13, "락토핏", "", Price(10000)),
+ Product(14, "락토핏", "", Price(10000)),
+ Product(15, "락토핏", "", Price(10000)),
+ Product(16, "락토핏", "", Price(10000)),
+ Product(17, "락토핏", "", Price(10000)),
+ Product(18, "락토핏", "", Price(10000)),
+ Product(19, "락토핏", "", Price(10000)),
+ Product(20, "락토핏", "", Price(10000)),
+ Product(21, "락토핏", "", Price(10000)),
+ )
+}