refactor: 강제종료 버그 수정, 패키지 정리

app/build.gradle.kts

@@ -53,7 +53,4 @@ dependencies {
  implementation("com.github.bumptech.glide:glide:4.15.1")
  testImplementation("io.mockk:mockk:1.13.5")
  testImplementation("androidx.arch.core:core-testing:2.2.0")
- implementation("com.squareup.okhttp3:okhttp:4.10.0")
- implementation("com.squareup.okhttp3:mockwebserver:4.10.0")
- implementation("org.json:json:20210307")
 }

app/src/main/java/woowacourse/shopping/data/db/CartDBHelper.kt

@@ -4,7 +4,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import woowacourse.shopping.domain.CartProduct
+import woowacourse.shopping.domain.model.CartProduct
 
 class CartDBHelper(context: Context) : SQLiteOpenHelper(context, "cart", null, 1) {
  override fun onCreate(db: SQLiteDatabase?) {

app/src/main/java/woowacourse/shopping/data/CartDbRepository.kt → app/src/main/java/woowacourse/shopping/data/repository/CartDbRepository.kt

@@ -1,9 +1,9 @@
-package woowacourse.shopping.data
+package woowacourse.shopping.data.repository
 
 import android.content.Context
 import woowacourse.shopping.data.db.CartDBHelper
-import woowacourse.shopping.domain.CartProduct
-import woowacourse.shopping.domain.CartRepository
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.repository.CartRepository
 
 class CartDbRepository(context: Context) : CartRepository {
  private val dbHelper = CartDBHelper(context)

app/src/main/java/woowacourse/shopping/data/ProductMockRepository.kt → app/src/main/java/woowacourse/shopping/data/repository/ProductMockRepository.kt

@@ -1,8 +1,8 @@
-package woowacourse.shopping.data
+package woowacourse.shopping.data.repository
 
-import woowacourse.shopping.domain.Price
-import woowacourse.shopping.domain.Product
-import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.domain.model.Price
+import woowacourse.shopping.domain.model.Product
+import woowacourse.shopping.domain.repository.ProductRepository
 
 object ProductMockRepository : ProductRepository {
  private val products = listOf(

app/src/main/java/woowacourse/shopping/data/RecentViewedDbRepository.kt → app/src/main/java/woowacourse/shopping/data/repository/RecentViewedDbRepository.kt

@@ -1,8 +1,8 @@
-package woowacourse.shopping.data
+package woowacourse.shopping.data.repository
 
 import android.content.Context
 import woowacourse.shopping.data.db.RecentViewedDBHelper
-import woowacourse.shopping.domain.RecentViewedRepository
+import woowacourse.shopping.domain.repository.RecentViewedRepository
 
 class RecentViewedDbRepository(context: Context) :
  RecentViewedRepository {

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

@@ -1,7 +1,7 @@
 package woowacourse.shopping.model
 
-import woowacourse.shopping.domain.CartProduct
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.model.Product
 
 fun CartProduct.toUiModel(isChecked: Boolean = false, product: Product): CartProductModel =
  CartProductModel(isChecked, id, product.name, product.imageUrl, count, product.price.price)

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

@@ -1,5 +1,5 @@
 package woowacourse.shopping.model
 
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.domain.model.Product
 
 fun Product.toUiModel(count: Int = 0) = ProductModel(id, name, imageUrl, price.price, count)

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

@@ -5,11 +5,10 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import woowacourse.shopping.data.CartDbRepository
-import woowacourse.shopping.data.MockServer
-import woowacourse.shopping.data.ProductMockRepository
-import woowacourse.shopping.data.ProductRemoteRepository
+import woowacourse.shopping.data.repository.CartDbRepository
+import woowacourse.shopping.domain.repository.ProductRemoteRepository
 import woowacourse.shopping.databinding.ActivityCartBinding
+import woowacourse.shopping.domain.data.MockServer
 import woowacourse.shopping.model.CartProductModel
 import woowacourse.shopping.view.productlist.ProductListActivity
 

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

@@ -1,8 +1,8 @@
 package woowacourse.shopping.view.cart
 
 import androidx.lifecycle.LiveData
-import woowacourse.shopping.domain.CartPageStatus
-import woowacourse.shopping.domain.CartSystemResult
+import woowacourse.shopping.domain.cartsystem.CartPageStatus
+import woowacourse.shopping.domain.cartsystem.CartSystemResult
 import woowacourse.shopping.model.CartProductModel
 
 interface CartContract {

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

@@ -2,13 +2,13 @@ package woowacourse.shopping.view.cart
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import woowacourse.shopping.domain.CartPageStatus
-import woowacourse.shopping.domain.CartPagination
-import woowacourse.shopping.domain.CartProduct
-import woowacourse.shopping.domain.CartRepository
-import woowacourse.shopping.domain.CartSystem
-import woowacourse.shopping.domain.CartSystemResult
-import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.domain.cartsystem.CartPageStatus
+import woowacourse.shopping.domain.pagination.CartPagination
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.repository.CartRepository
+import woowacourse.shopping.domain.cartsystem.CartSystem
+import woowacourse.shopping.domain.cartsystem.CartSystemResult
+import woowacourse.shopping.domain.repository.ProductRepository
 import woowacourse.shopping.model.CartProductModel
 import woowacourse.shopping.model.toDomain
 import woowacourse.shopping.model.toUiModel

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

@@ -1,6 +1,6 @@
 package woowacourse.shopping.view.cart
 
-import woowacourse.shopping.domain.CartPageStatus
+import woowacourse.shopping.domain.cartsystem.CartPageStatus
 import woowacourse.shopping.model.CartProductModel
 
 sealed interface CartViewItem {

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

@@ -11,8 +11,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import woowacourse.shopping.R
-import woowacourse.shopping.data.CartDbRepository
-import woowacourse.shopping.data.RecentViewedDbRepository
+import woowacourse.shopping.data.repository.CartDbRepository
+import woowacourse.shopping.data.repository.RecentViewedDbRepository
 import woowacourse.shopping.databinding.ActivityProductDetailBinding
 import woowacourse.shopping.databinding.DialogCountBinding
 import woowacourse.shopping.model.ProductModel

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

@@ -2,8 +2,8 @@ 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.domain.repository.CartRepository
+import woowacourse.shopping.domain.repository.RecentViewedRepository
 import woowacourse.shopping.model.ProductModel
 
 class ProductDetailPresenter(

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

@@ -10,10 +10,12 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
-import okhttp3.mockwebserver.MockWebServer
 import woowacourse.shopping.R
-import woowacourse.shopping.data.*
+import woowacourse.shopping.data.repository.CartDbRepository
+import woowacourse.shopping.data.repository.RecentViewedDbRepository
 import woowacourse.shopping.databinding.ActivityProductListBinding
+import woowacourse.shopping.domain.data.MockServer
+import woowacourse.shopping.domain.repository.ProductRemoteRepository
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.view.cart.CartActivity
 import woowacourse.shopping.view.productdetail.ProductDetailActivity

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

@@ -1,6 +1,10 @@
 package woowacourse.shopping.view.productlist
 
-import woowacourse.shopping.domain.*
+import woowacourse.shopping.domain.model.Product
+import woowacourse.shopping.domain.pagination.ProductListPagination
+import woowacourse.shopping.domain.repository.CartRepository
+import woowacourse.shopping.domain.repository.ProductRepository
+import woowacourse.shopping.domain.repository.RecentViewedRepository
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.model.toUiModel
 

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

@@ -7,7 +7,7 @@
 
  <variable
  name="status"
- type="woowacourse.shopping.domain.CartPageStatus" />
+ type="woowacourse.shopping.domain.cartsystem.CartPageStatus" />
 
  <variable
  name="onItemClick"

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

@@ -11,12 +11,12 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import woowacourse.shopping.domain.CartPageStatus
-import woowacourse.shopping.domain.CartProduct
-import woowacourse.shopping.domain.CartRepository
-import woowacourse.shopping.domain.Price
-import woowacourse.shopping.domain.Product
-import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.domain.cartsystem.CartPageStatus
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.repository.CartRepository
+import woowacourse.shopping.domain.model.Price
+import woowacourse.shopping.domain.model.Product
+import woowacourse.shopping.domain.repository.ProductRepository
 import woowacourse.shopping.model.CartProductModel
 import woowacourse.shopping.view.cart.CartContract
 import woowacourse.shopping.view.cart.CartPresenter

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

@@ -7,9 +7,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import woowacourse.shopping.domain.CartProduct
-import woowacourse.shopping.domain.CartRepository
-import woowacourse.shopping.domain.RecentViewedRepository
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.repository.CartRepository
+import woowacourse.shopping.domain.repository.RecentViewedRepository
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.view.productdetail.ProductDetailContract
 import woowacourse.shopping.view.productdetail.ProductDetailPresenter

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

@@ -5,7 +5,12 @@ import junit.framework.Assert.assertNull
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import woowacourse.shopping.domain.*
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.model.Price
+import woowacourse.shopping.domain.model.Product
+import woowacourse.shopping.domain.repository.CartRepository
+import woowacourse.shopping.domain.repository.ProductRepository
+import woowacourse.shopping.domain.repository.RecentViewedRepository
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.view.productlist.ProductListContract
 import woowacourse.shopping.view.productlist.ProductListPresenter

domain/build.gradle.kts

@@ -4,9 +4,12 @@ plugins {
 }
 
 java {
- sourceCompatibility = JavaVersion.VERSION_1_7
- targetCompatibility = JavaVersion.VERSION_1_7
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {
+ implementation("com.squareup.okhttp3:okhttp:4.10.0")
+ implementation("com.squareup.okhttp3:mockwebserver:4.10.0")
+ implementation("org.json:json:20210307")
 }

domain/src/main/java/woowacourse/shopping/domain/CartPageStatus.kt → domain/src/main/java/woowacourse/shopping/domain/cartsystem/CartPageStatus.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.cartsystem
 
 data class CartPageStatus(
  val isPrevEnabled: Boolean,

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

@@ -1,4 +1,8 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.cartsystem
+
+import woowacourse.shopping.domain.repository.ProductRepository
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.model.Price
 
 class CartSystem(
  private val productRepository: ProductRepository
@@ -17,7 +21,6 @@ class CartSystem(
  val price = productRepository.find(product.id).price
  _selectedProducts.add(CartSystemProduct(product, price))
  totalPrice += price * product.count
- println("Add : $_selectedProducts | total: $totalPrice")
  return CartSystemResult(totalPrice.price, _selectedProducts.size)
  }
  return deselectProduct(product.id)
@@ -28,19 +31,16 @@ class CartSystem(
  ?: throw java.lang.IllegalArgumentException()
  totalPrice -= product.price * product.cartProduct.count
  _selectedProducts.remove(product)
- println("Delete : $product | total: $totalPrice")
  return CartSystemResult(totalPrice.price, _selectedProducts.size)
  }
 
  fun updateProduct(id: Int, count: Int): CartSystemResult {
  val index = _selectedProducts.indexOfFirst { it.cartProduct.id == id }
  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)
  }

domain/src/main/java/woowacourse/shopping/domain/cartsystem/CartSystemProduct.kt

@@ -0,0 +1,6 @@
+package woowacourse.shopping.domain.cartsystem
+
+import woowacourse.shopping.domain.model.CartProduct
+import woowacourse.shopping.domain.model.Price
+
+data class CartSystemProduct(val cartProduct: CartProduct, val price: Price)

domain/src/main/java/woowacourse/shopping/domain/CartSystemResult.kt → domain/src/main/java/woowacourse/shopping/domain/cartsystem/CartSystemResult.kt

@@ -1,3 +1,3 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.cartsystem
 
 data class CartSystemResult(val totalPrice: Int, val totalCount: Int)

app/src/main/java/woowacourse/shopping/data/MockServer.kt → domain/src/main/java/woowacourse/shopping/domain/data/MockServer.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.data
+package woowacourse.shopping.domain.data
 
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
@@ -29,6 +29,13 @@ class MockServer {
  .setResponseCode(200)
  .setBody(getProducts(0, 100))
  }
+ path.startsWith("/products/") -> {
+ val productId = path.substringAfterLast("/")
+ MockResponse()
+ .setHeader("Content-Type", "application/json")
+ .setResponseCode(200)
+ .setBody(getProductById(productId))
+ }
  path.startsWith("/products") -> {
  val parameters = getParameters(path)
  val offset = parameters["mark"]?.toIntOrNull()
@@ -39,13 +46,6 @@ class MockServer {
  .setResponseCode(200)
  .setBody(getProducts(offset, count))
  }
- path.startsWith("/products/") -> {
- val productId = path.substringAfterLast("/")
- MockResponse()
- .setHeader("Content-Type", "application/json")
- .setResponseCode(200)
- .setBody(getProductById(productId))
- }
  else -> {
  MockResponse().setResponseCode(404)
  }

domain/src/main/java/woowacourse/shopping/domain/CartProduct.kt → domain/src/main/java/woowacourse/shopping/domain/model/CartProduct.kt

@@ -1,3 +1,3 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.model
 
 data class CartProduct(val id: Int, val count: Int)

domain/src/main/java/woowacourse/shopping/domain/Price.kt → domain/src/main/java/woowacourse/shopping/domain/model/Price.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.model
 
 @JvmInline
 value class Price(val price: Int) {

domain/src/main/java/woowacourse/shopping/domain/Product.kt → domain/src/main/java/woowacourse/shopping/domain/model/Product.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.model
 
 data class Product(val id: Int, val name: String, val imageUrl: String, val price: Price) {
  companion object

domain/src/main/java/woowacourse/shopping/domain/CartPagination.kt → domain/src/main/java/woowacourse/shopping/domain/pagination/CartPagination.kt

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

domain/src/main/java/woowacourse/shopping/domain/NextPagination.kt → domain/src/main/java/woowacourse/shopping/domain/pagination/NextPagination.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.pagination
 
 interface NextPagination<T> {
  val isNextEnabled: Boolean

domain/src/main/java/woowacourse/shopping/domain/PrevPagination.kt → domain/src/main/java/woowacourse/shopping/domain/pagination/PrevPagination.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.domain
+package woowacourse.shopping.domain.pagination
 
 interface PrevPagination<T> {
  val isPrevEnabled: Boolean

domain/src/main/java/woowacourse/shopping/domain/ProductListPagination.kt → domain/src/main/java/woowacourse/shopping/domain/pagination/ProductListPagination.kt

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