refactor(SeatSelectinActivity): MVP 리팩터링

app/src/main/java/woowacourse/movie/view/seatselection/SeatSelectionActivity.kt

@@ -55,27 +55,26 @@ class SeatSelectionActivity : AppCompatActivity(), SeatSelectionContract.View {
  return
  }
  binding.options = options
-
  presenter = SeatSelectionPresenter(
  this,
  options,
  ReservationDbRepository(this),
  TheaterMockRepository,
  )
 
- createRows(presenter.getSeatInfoUiModel(TheaterMockRepository.gradeColor))
+ presenter.fetchSeatsData(TheaterMockRepository.gradeColor)
  setNextButton()
  supportActionBar?.setDisplayHomeAsUpEnabled(true)
  }
 
- private fun createRows(seatInfoUiModel: SeatInfoUiModel) {
- for (row in 0 until seatInfoUiModel.maxRow) {
+ override fun createSeats(seatInfo: SeatInfoUiModel) {
+ for (row in 0 until seatInfo.maxRow) {
  val tableRow = TableRow(this).apply {
  layoutParams = TableLayout.LayoutParams(0, 0, 1f)
  }
- for (col in 0 until seatInfoUiModel.maxCol) {
+ for (col in 0 until seatInfo.maxCol) {
  val seat = Seat(row, col)
- tableRow.addView(createSeat(seat.toUiModel(), seatInfoUiModel.colorOfRow))
+ tableRow.addView(createSeat(seat.toUiModel(), seatInfo.colorOfRow))
  }
  binding.layoutSeats.addView(tableRow)
  }
@@ -91,7 +90,7 @@ class SeatSelectionActivity : AppCompatActivity(), SeatSelectionContract.View {
  textSize = 22F
  textAlignment = TextView.TEXT_ALIGNMENT_CENTER
  gravity = Gravity.CENTER
- setOnClickListener { presenter.onSeatClick(seatUi.row, seatUi.col) }
+ setOnClickListener { presenter.updateSeat(seatUi.row, seatUi.col) }
  background =
  AppCompatResources.getDrawable(this@SeatSelectionActivity, R.drawable.seat_selector)
  layoutParams = TableRow.LayoutParams(0, LayoutParams.MATCH_PARENT, 1f)
@@ -108,7 +107,7 @@ class SeatSelectionActivity : AppCompatActivity(), SeatSelectionContract.View {
  setTitle(context.getString(R.string.reserve_dialog_title))
  setMessage(context.getString(R.string.reserve_dialog_detail))
  setPositiveButton(context.getString(R.string.reserve_dialog_submit)) { _, _ ->
- presenter.onReserveClick()
+ presenter.reserve()
  }
  setNegativeButton(context.getString(R.string.reserve_dialog_cancel)) { dialog, _ ->
  dialog.dismiss()
@@ -122,23 +121,23 @@ class SeatSelectionActivity : AppCompatActivity(), SeatSelectionContract.View {
  startActivity(intent)
  }
 
- override fun setSelectionSeat(index: Int, isClickableButton: Boolean) {
+ override fun onSeatSelectedByIndex(index: Int, isClickableButton: Boolean) {
  val textView = seats[index]
  textView.isSelected = true
  if (isClickableButton) binding.btnNext.isEnabled = true
  }
 
- override fun setDeselectionSeat(index: Int) {
+ override fun onSeatDeselectedByIndex(index: Int) {
  val textView = seats[index]
  binding.btnNext.isEnabled = false
  textView.isSelected = false
  }
 
- override fun maxSelectionToast() {
+ override fun showSeatMaxSelectionToast() {
  showToast(SELECT_ALL_SEAT_MESSAGE)
  }
 
- override fun wrongInputToast() {
+ override fun showWrongInputToast() {
  showToast(SELECT_WRONG_SEAT_MESSAGE)
  }
 

app/src/main/java/woowacourse/movie/view/seatselection/SeatSelectionContract.kt

@@ -1,29 +1,25 @@
 package woowacourse.movie.view.seatselection
 
-import woowacourse.movie.domain.system.PriceSystem
-import woowacourse.movie.domain.system.SeatSelectSystem
 import woowacourse.movie.domain.theater.Grade
-import woowacourse.movie.domain.theater.Theater
 import woowacourse.movie.view.model.ReservationUiModel
 import woowacourse.movie.view.model.SeatInfoUiModel
 
 interface SeatSelectionContract {
  interface View {
  var presenter: Presenter
- fun setSelectionSeat(index: Int, isClickableButton: Boolean)
- fun setDeselectionSeat(index: Int)
- fun maxSelectionToast()
- fun wrongInputToast()
+
+ fun createSeats(seatInfo: SeatInfoUiModel)
+ fun onSeatSelectedByIndex(index: Int, isClickableButton: Boolean)
+ fun onSeatDeselectedByIndex(index: Int)
+ fun showSeatMaxSelectionToast()
+ fun showWrongInputToast()
  fun setPrice(price: Int)
  fun onReserveClick(model: ReservationUiModel)
  }
 
  interface Presenter {
- val theater: Theater
- val seatSelectSystem: SeatSelectSystem
- val priceSystem: PriceSystem
- fun onSeatClick(row: Int, col: Int)
- fun onReserveClick()
- fun getSeatInfoUiModel(colorOfGrade: Map<Grade, Int>): SeatInfoUiModel
+ fun updateSeat(row: Int, col: Int)
+ fun reserve()
+ fun fetchSeatsData(colorOfGrade: Map<Grade, Int>)
  }
 }

app/src/main/java/woowacourse/movie/view/seatselection/SeatSelectionPresenter.kt

@@ -11,7 +11,6 @@ import woowacourse.movie.domain.system.SelectResult
 import woowacourse.movie.domain.theater.Grade
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.ReservationOptions
-import woowacourse.movie.view.model.SeatInfoUiModel
 
 class SeatSelectionPresenter(
  private val view: SeatSelectionContract.View,
@@ -20,35 +19,34 @@ class SeatSelectionPresenter(
  theaterRepository: TheaterRepository,
 ) : SeatSelectionContract.Presenter {
  private var price = Price(0)
- override val theater = theaterRepository.findTheater(reserveOption.theaterName)
- override val seatSelectSystem: SeatSelectSystem =
+ private val theater = theaterRepository.findTheater(reserveOption.theaterName)
+ private val seatSelectSystem: SeatSelectSystem =
  SeatSelectSystem(theater.seatInfo, reserveOption.peopleCount)
- override val priceSystem: PriceSystem =
+ private val priceSystem: PriceSystem =
  PriceSystem(PriceCalculator(theater.discountPolicies), reserveOption.screeningDateTime)
 
- override fun onSeatClick(row: Int, col: Int) {
+ override fun updateSeat(row: Int, col: Int) {
  val result = seatSelectSystem.select(row, col)
  val index = rowColToIndex(row, col)
  when (result) {
  is SelectResult.Success.Selection -> {
- view.setSelectionSeat(index, result.isSelectAll)
+ view.onSeatSelectedByIndex(index, result.isSelectAll)
  }
  is SelectResult.Success.Deselection -> {
- view.setDeselectionSeat(index)
+ view.onSeatDeselectedByIndex(index)
  }
  is SelectResult.MaxSelection -> {
- view.maxSelectionToast()
+ view.showSeatMaxSelectionToast()
  }
  is SelectResult.WrongInput -> {
- view.wrongInputToast()
+ view.showWrongInputToast()
  }
  }
- val newPrice = priceSystem.getCurrentPrice(price, result)
- price = newPrice
- view.setPrice(newPrice.toUiModel())
+ price = priceSystem.getCurrentPrice(price, result)
+ view.setPrice(price.toUiModel())
  }
 
- override fun onReserveClick() {
+ override fun reserve() {
  val reservation = Reservation(
  reserveOption.title,
  reserveOption.screeningDateTime,
@@ -60,8 +58,8 @@ class SeatSelectionPresenter(
  view.onReserveClick(reservation.toUiModel())
  }
 
- override fun getSeatInfoUiModel(colorOfGrade: Map<Grade, Int>): SeatInfoUiModel {
- return theater.seatInfo.toUiModel(colorOfGrade)
+ override fun fetchSeatsData(colorOfGrade: Map<Grade, Int>) {
+ view.createSeats(theater.seatInfo.toUiModel(colorOfGrade))
  }
 
  private fun rowColToIndex(row: Int, col: Int): Int = row * theater.seatInfo.size.col + col