refactor(domain, SeatSelectionAcitivty): 도메인, 좌석 지정 코드 전체 리팩터링

app/src/androidTest/java/woowacourse/movie/view/ReservationActivityTest.kt

@@ -12,8 +12,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import woowacourse.movie.R
-import woowacourse.movie.domain.Minute
-import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.movie.Minute
+import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.reservation.ReservationActivity
 import java.time.LocalDate

app/src/androidTest/java/woowacourse/movie/view/SeatSelectionActivityTest.kt

@@ -17,8 +17,8 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import woowacourse.movie.R
-import woowacourse.movie.domain.Minute
-import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.movie.Minute
+import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.ReservationOptions
 import woowacourse.movie.view.seatselection.SeatSelectionActivity

app/src/main/java/woowacourse/movie/data/MovieMockRepository.kt

@@ -1,8 +1,8 @@
 package woowacourse.movie.data
 
 import woowacourse.movie.R
-import woowacourse.movie.domain.Minute
-import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.movie.Minute
+import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.domain.repository.MovieRepository
 import java.time.LocalDate
 

app/src/main/java/woowacourse/movie/data/Theater.kt

@@ -0,0 +1,26 @@
+package woowacourse.movie.data
+
+import woowacourse.movie.domain.policy.MorningPolicy
+import woowacourse.movie.domain.policy.MovieDayPolicy
+import woowacourse.movie.domain.policy.NightPolicy
+import woowacourse.movie.domain.theater.Grade
+import woowacourse.movie.domain.theater.TheaterInfo
+
+object Theater {
+ private val rowGrade = mapOf(
+ 0 to Grade.B,
+ 1 to Grade.B,
+ 2 to Grade.S,
+ 3 to Grade.S,
+ 4 to Grade.A,
+ )
+ val row = 5
+ val col = 4
+
+ val info = TheaterInfo(rowGrade, row, col)
+ val policies = listOf(
+ MovieDayPolicy(),
+ MorningPolicy(),
+ NightPolicy(),
+ )
+}

app/src/main/java/woowacourse/movie/data/reservation/ReservationMockRepository.kt

@@ -1,7 +1,7 @@
 package woowacourse.movie.data.reservation
 
-import woowacourse.movie.domain.Reservation
 import woowacourse.movie.domain.repository.ReservationRepository
+import woowacourse.movie.domain.reservation.Reservation
 
 object ReservationMockRepository : ReservationRepository {
 

app/src/main/java/woowacourse/movie/view/ReservationCompletedActivity.kt

@@ -71,11 +71,11 @@ class ReservationCompletedActivity : AppCompatActivity() {
  peopleCount.text = getString(R.string.reservation_people_count_format)
  .format(
  getString(R.string.general_person),
- reservation.peopleCount,
+ reservation.count,
  reservation.seats.joinToString(),
  )
  totalPrice.text =
- getString(R.string.total_price_format).format(DECIMAL_FORMAT.format(reservation.finalReservationFee))
+ getString(R.string.total_price_format).format(DECIMAL_FORMAT.format(reservation.count))
  }
  }
 

app/src/main/java/woowacourse/movie/view/mapper/MovieMapper.kt

@@ -1,7 +1,7 @@
 package woowacourse.movie.view.mapper
 
-import woowacourse.movie.domain.Minute
-import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.movie.Minute
+import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.view.model.MovieListModel.MovieUiModel
 
 fun Movie.toUiModel(): MovieUiModel = MovieUiModel(

app/src/main/java/woowacourse/movie/view/mapper/PriceMapper.kt

@@ -0,0 +1,8 @@
+package woowacourse.movie.view.mapper
+
+import woowacourse.movie.domain.price.Price
+import java.text.DecimalFormat
+
+fun Price.toUiModel(): String {
+ return DecimalFormat("#,###").format(price)
+}

app/src/main/java/woowacourse/movie/view/mapper/ReservationMapper.kt

@@ -1,12 +1,12 @@
 package woowacourse.movie.view.mapper
 
-import woowacourse.movie.domain.Reservation
+import woowacourse.movie.domain.reservation.Reservation
 import woowacourse.movie.view.model.ReservationUiModel
 
 fun Reservation.toUiModel(): ReservationUiModel = ReservationUiModel(
- movieTitle,
+ title,
  screeningDateTime,
  seats.size,
- seats.map { it.toUiModel().name },
- finalReservationFee.amount
+ seats.map { it.toUiModel().seatId },
+ price.price
 )

app/src/main/java/woowacourse/movie/view/mapper/SeatMapper.kt

@@ -1,15 +1,6 @@
 package woowacourse.movie.view.mapper
 
-import woowacourse.movie.R
-import woowacourse.movie.domain.Seat
-import woowacourse.movie.domain.SeatType
+import woowacourse.movie.domain.system.Seat
 import woowacourse.movie.view.model.SeatUiModel
 
-fun Seat.toUiModel(): SeatUiModel = SeatUiModel(
- ('A' + row - 1).toString() + "$column",
- when (this.type) {
- SeatType.BType -> R.color.purple_700
- SeatType.SType -> R.color.green
- SeatType.AType -> R.color.blue
- }
-)
+fun Seat.toUiModel(): SeatUiModel = SeatUiModel(row, col)

app/src/main/java/woowacourse/movie/view/model/ReservationUiModel.kt

@@ -8,7 +8,7 @@ import java.time.LocalDateTime
 data class ReservationUiModel(
  val title: String,
  val screeningDateTime: LocalDateTime,
- val peopleCount: Int,
+ val count: Int,
  val seats: List<String>,
- val finalReservationFee: Int
+ val price: Int
 ) : Parcelable

app/src/main/java/woowacourse/movie/view/model/SeatUiModel.kt

@@ -1,6 +1,5 @@
 package woowacourse.movie.view.model
 
-class SeatUiModel(
- val name: String,
- val color: Int
-)
+class SeatUiModel(row: Int, col: Int) : java.io.Serializable {
+ val seatId: String = ('A'.code + row).toChar() + (col + 1).toString()
+}

app/src/main/java/woowacourse/movie/view/moviemain/movielist/MovieListPresenter.kt

@@ -2,7 +2,7 @@ package woowacourse.movie.view.moviemain.movielist
 
 import woowacourse.movie.R
 import woowacourse.movie.data.MovieMockRepository
-import woowacourse.movie.domain.Movie
+import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.domain.repository.MovieRepository
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.MovieListModel

app/src/main/java/woowacourse/movie/view/reservation/ReservationPresenter.kt

@@ -1,22 +1,21 @@
 package woowacourse.movie.view.reservation
 
-import woowacourse.movie.domain.Reservation
-import woowacourse.movie.domain.ScreeningTime
+import woowacourse.movie.domain.movie.ScreeningTime
 import java.time.LocalDate
 
 class ReservationPresenter(private val view: ReservationContract.View) :
  ReservationContract.Presenter {
  private var peopleCountSaved = 0
 
  override fun onMinusClick() {
- if (peopleCountSaved > Reservation.MIN_PEOPLE_COUNT) {
+ if (peopleCountSaved > 0) {
  peopleCountSaved--
  view.setCount(peopleCountSaved)
  }
  }
 
  override fun onPlusClick() {
- if (peopleCountSaved < Reservation.MAX_PEOPLE_COUNT) {
+ if (peopleCountSaved < 20) {
  peopleCountSaved++
  view.setCount(peopleCountSaved)
  }