refactor: PriceModel 구현 및 수정

app/src/main/java/woowacourse/movie/activity/moviedetail/MovieDetailActivity.kt

@@ -21,7 +21,10 @@ class MovieDetailActivity : AppCompatActivity() {
  return
  }
  MovieDetailView(findViewById(R.id.layout_detail_info)).set(movie)
- ReservationInfoView(findViewById(R.id.layout_reservation_info)).set(savedInstanceState, movie)
+ ReservationInfoView(findViewById(R.id.layout_reservation_info)).set(
+ savedInstanceState,
+ movie,
+ )
  supportActionBar?.setDisplayHomeAsUpEnabled(true)
  }
 

app/src/main/java/woowacourse/movie/activity/seatselect/SeatSelectActivity.kt

@@ -2,6 +2,7 @@ package woowacourse.movie.activity.seatselect
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import woowacourse.movie.R
@@ -33,25 +34,33 @@ class SeatSelectActivity : AppCompatActivity(), InjectedModelListener<TicketMode
  val seatSelectSystem = SeatSelectSystem(Theater.info, count)
  val priceSystem = PriceSystem(PriceCalculator(Theater.policies), dateTime!!)
  val seatView =
- SeatSelectView(findViewById(R.id.layout_select_seat), seatSelectSystem, priceSystem, this)
+ SeatSelectView(
+ findViewById(R.id.layout_select_seat),
+ seatSelectSystem,
+ priceSystem,
+ this,
+ )
 
  seatView.set(title!!, dateTime)
+
+ Log.d("hyem", seatSelectSystem.seats.toString())
  }
 
  private fun isDataNull(title: String?, dateTime: LocalDateTime?, count: Int): Boolean {
  return title == null || dateTime == null || count == -1
  }
 
+ override fun onClick(model: TicketModel) {
+ val intent = Intent(this, TicketResultActivity::class.java)
+ intent.putExtra(TicketResultActivity.INFO_KEY, model)
+ startActivity(intent)
+ }
+
  companion object {
  private const val DATA_LOADING_ERROR_MESSAGE = "데이터가 로딩되지 않았습니다. 다시 시도해주세요."
+ private const val PRICE_KEY = "PRICE"
  const val TITLE_KEY = "TITLE"
  const val DATETIME_KEY = "DATETIME"
  const val COUNT_KEY = "COUNT"
  }
-
- override fun onClick(model: TicketModel) {
- val intent = Intent(this, TicketResultActivity::class.java)
- intent.putExtra(TicketResultActivity.INFO_KEY, model)
- startActivity(intent)
- }
 }

app/src/main/java/woowacourse/movie/activity/seatselect/SeatSelectView.kt

@@ -14,10 +14,10 @@ import woowacourse.movie.domain.system.PriceSystem
 import woowacourse.movie.domain.system.SeatSelectSystem
 import woowacourse.movie.domain.system.SelectResult
 import woowacourse.movie.domain.ticket.Ticket
+import woowacourse.movie.model.PriceModel
 import woowacourse.movie.model.TicketModel
 import woowacourse.movie.model.toPresentation
 import woowacourse.movie.util.Theater
-import java.text.DecimalFormat
 import java.time.LocalDateTime
 
 class SeatSelectView(
@@ -55,11 +55,8 @@ class SeatSelectView(
  }
  }
 
- private fun setPrice(price: Int) {
- priceView.text = viewGroup.context.getString(
- R.string.price,
- DecimalFormat(viewGroup.context.getString(R.string.decimal_format)).format(price),
- )
+ private fun setPrice(price: PriceModel) {
+ priceView.text = viewGroup.context.getString(R.string.price, price.price)
  }
 
  private fun setSeatViews() {
@@ -77,7 +74,7 @@ class SeatSelectView(
  is SelectResult.Success.Deselection -> {
  textView.setBackgroundColor(textView.context.getColor(R.color.white))
  nextButton.isEnabled = false
- setPrice(result.seatPrice.price)
+ setPrice(result.seatPrice.toPresentation())
  }
  is SelectResult.MaxSelection -> {
  Toast.makeText(

app/src/main/java/woowacourse/movie/activity/ticketresult/TicketView.kt

@@ -5,7 +5,6 @@ import android.widget.TextView
 import woowacourse.movie.R
 import woowacourse.movie.model.SeatModel
 import woowacourse.movie.model.TicketModel
-import java.text.DecimalFormat
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
@@ -14,7 +13,7 @@ class TicketView(private val viewGroup: ViewGroup) {
  initTitle(ticket.title)
  initPlayingDate(ticket.playingDateTime)
  initCountSeats(ticket.count, ticket.seats)
- initPricePayment(ticket.price)
+ initPricePayment(ticket.price.price)
  }
 
  private fun initTitle(title: String) {
@@ -37,11 +36,11 @@ class TicketView(private val viewGroup: ViewGroup) {
  viewGroup.context.getString(R.string.normal_count_seat, count, convertSeats)
  }
 
- private fun initPricePayment(price: Int) {
+ private fun initPricePayment(price: String) {
  viewGroup.findViewById<TextView>(R.id.text_price_payment).text =
  viewGroup.context.getString(
  R.string.price_payment,
- DecimalFormat(viewGroup.context.getString(R.string.decimal_format)).format(price),
+ price,
  )
  }
 }

app/src/main/java/woowacourse/movie/model/PriceMapper.kt

@@ -1,7 +1,8 @@
 package woowacourse.movie.model
 
 import woowacourse.movie.domain.price.Price
+import java.text.DecimalFormat
 
-fun Price.toPresentation(): Int {
- return price
+fun Price.toPresentation(): PriceModel {
+ return PriceModel(DecimalFormat("#,###").format(price))
 }

app/src/main/java/woowacourse/movie/model/PriceModel.kt

@@ -0,0 +1,3 @@
+package woowacourse.movie.model
+
+data class PriceModel(val price: String) : java.io.Serializable

app/src/main/java/woowacourse/movie/model/TicketModel.kt

@@ -7,5 +7,5 @@ data class TicketModel(
  val playingDateTime: LocalDateTime,
  val count: Int,
  val seats: List<SeatModel>,
- val price: Int
+ val price: PriceModel
 ) : java.io.Serializable