refactor: ReserveInfoModel 추가 및 수정

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

@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import woowacourse.movie.R
 import woowacourse.movie.activity.seatselect.SeatSelectActivity
 import woowacourse.movie.model.MovieModel
+import woowacourse.movie.model.ReserveInfoModel
 import woowacourse.movie.util.getSerializableExtraCompat
 import java.time.LocalDateTime
 
@@ -40,9 +41,7 @@ class MovieDetailActivity : AppCompatActivity() {
 
  private fun onClick(title: String, dateTime: LocalDateTime, count: Int) {
  val intent = Intent(this, SeatSelectActivity::class.java)
- intent.putExtra(SeatSelectActivity.TITLE_KEY, title)
- intent.putExtra(SeatSelectActivity.DATETIME_KEY, dateTime)
- intent.putExtra(SeatSelectActivity.COUNT_KEY, count)
+ intent.putExtra(SeatSelectActivity.INFO_KEY, ReserveInfoModel(title, dateTime, count))
  startActivity(intent)
  }
 

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

@@ -10,28 +10,29 @@ import woowacourse.movie.activity.ticketresult.TicketResultActivity
 import woowacourse.movie.domain.price.PriceCalculator
 import woowacourse.movie.domain.system.PriceSystem
 import woowacourse.movie.domain.system.SeatSelectSystem
+import woowacourse.movie.model.ReserveInfoModel
 import woowacourse.movie.model.TicketModel
 import woowacourse.movie.util.Theater
 import woowacourse.movie.util.getSerializableExtraCompat
-import java.time.LocalDateTime
 
 class SeatSelectActivity : AppCompatActivity() {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  setContentView(R.layout.activity_seat_select)
 
- val title = intent.getStringExtra(TITLE_KEY)
- val dateTime = intent.getSerializableExtraCompat<LocalDateTime>(DATETIME_KEY)
- val count = intent.getIntExtra(COUNT_KEY, -1)
-
- if (isDataNull(title, dateTime, count)) {
+ val reserveInfo = intent.getSerializableExtraCompat<ReserveInfoModel>(INFO_KEY)
+ if (reserveInfo == null) {
  Toast.makeText(this, DATA_LOADING_ERROR_MESSAGE, Toast.LENGTH_LONG).show()
  finish()
  return
  }
 
+ val title = reserveInfo.title
+ val dateTime = reserveInfo.dateTime
+ val count = reserveInfo.count
+
  val seatSelectSystem = SeatSelectSystem(Theater.info, count)
- val priceSystem = PriceSystem(PriceCalculator(Theater.policies), dateTime!!)
+ val priceSystem = PriceSystem(PriceCalculator(Theater.policies), dateTime)
  val seatView =
  SeatSelectView(
  findViewById(R.id.layout_select_seat),
@@ -40,24 +41,20 @@ class SeatSelectActivity : AppCompatActivity() {
  ::onClick,
  )
 
- seatView.set(title!!, dateTime)
+ 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
- }
-
  private fun onClick(model: TicketModel) {
  val intent = Intent(this, TicketResultActivity::class.java)
  intent.putExtra(TicketResultActivity.INFO_KEY, model)
  startActivity(intent)
  }
 
  companion object {
+ const val INFO_KEY = "INFO"
  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"

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

@@ -0,0 +1,9 @@
+package woowacourse.movie.model
+
+import java.time.LocalDateTime
+
+data class ReserveInfoModel(
+ val title: String,
+ val dateTime: LocalDateTime,
+ val count: Int
+) : java.io.Serializable