ch01: PerformanceCalculator and EnrichedPerformance 실습하기 위해 책과 비슷하게 수정

Author: IamGroooooot

.idea/gradle.xml

@@ -8,18 +8,24 @@ data class StatementData(
     var totalVolumeCredits: Int = 0
 }
 
-class EnrichedPerformance(
-    val playID: String, val audience: Int, val play: Play
-) {
+class EnrichedPerformance() {
+    var playID: String = ""
+    var audience: Int = 0
     var amount: Int = 0
     var volumeCredits: Int = 0
+    var play: Play? = null
     var performanceCalculator: PerformanceCalculator? = null
+
+    constructor(aPerformance: Performance) : this() {
+        this.playID = aPerformance.playID
+        this.audience = aPerformance.audience
+    }
 }
 
 class PerformanceCalculator {
-    var aPerformance: EnrichedPerformance
+    var aPerformance: Performance
 
-    constructor(aPerformance: EnrichedPerformance) {
+    constructor(aPerformance: Performance) {
         this.aPerformance = aPerformance
     }
 }
@@ -31,7 +37,7 @@ internal fun createStatementData(plays: Plays, invoice: Invoice): StatementData
 
     fun amountFor(aPerformance: EnrichedPerformance): Int {
         var result = 0
-        when (aPerformance.play.type) {
+        when (aPerformance.play?.type) {
             "tragedy" -> {
                 result = 40000
                 if (aPerformance.audience > 30) {
@@ -48,7 +54,7 @@ internal fun createStatementData(plays: Plays, invoice: Invoice): StatementData
             }
 
             else -> {
-                throw Error("알 수 없는 장르: ${aPerformance.play.type}")
+                throw Error("알 수 없는 장르: ${aPerformance.play?.type}")
             }
         }
 
@@ -57,7 +63,7 @@ internal fun createStatementData(plays: Plays, invoice: Invoice): StatementData
 
     fun volumeCreditsFor(aPerformance: EnrichedPerformance): Int {
         var result = maxOf(aPerformance.audience - 30, 0)
-        if (aPerformance.play.type == "comedy") result += aPerformance.audience / 5
+        if (aPerformance.play?.type == "comedy") result += aPerformance.audience / 5
         return result
     }
 
@@ -70,16 +76,16 @@ internal fun createStatementData(plays: Plays, invoice: Invoice): StatementData
     }
 
     fun enrichPerformance(aPerformance: Performance): EnrichedPerformance {
-        val result = EnrichedPerformance(
-            aPerformance.playID, aPerformance.audience, playFor(aPerformance)
-        )
+        val calculator = PerformanceCalculator(aPerformance)
+        val result = EnrichedPerformance(aPerformance)
+        result.play = playFor(aPerformance)
         result.amount = amountFor(result)
         result.volumeCredits = volumeCreditsFor(result)
-        result.performanceCalculator = PerformanceCalculator(result)
         return result
     }
 
-    val statementData = StatementData(invoice.customer, invoice.performances.map { enrichPerformance(it) }).apply {
+    val statementData = StatementData(
+        invoice.customer, invoice.performances.map { enrichPerformance(it) }).apply {
         totalAmount = totalAmount(this)
         totalVolumeCredits = totalVolumeCredits(this)
     }

.idea/kotlinc.xml

@@ -3,19 +3,19 @@ package chapter01
 import java.text.NumberFormat
 import java.util.Locale.US
 
-fun usd(number: Int): String {
-    return NumberFormat.getCurrencyInstance(US).format(number / 100.0)
-}
-
 fun statement(invoice: Invoice, plays: Plays): String {
     return renderPlainText(createStatementData(plays, invoice), plays)
 }
 
 private fun renderPlainText(data: StatementData, plays: Plays): String {
+    fun usd(number: Int): String {
+        return NumberFormat.getCurrencyInstance(US).format(number / 100.0)
+    }
+
     var result = "청구 내역 (고객명: ${data.customer})\n"
     for (perf in data.performances) {
         // 청구 내역을 출력한다.
-        result += "  ${perf.play.name}: ${usd(perf.amount)} (${perf.audience}석)\n"
+        result += "  ${perf.play?.name}: ${usd(perf.amount)} (${perf.audience}석)\n"
     }
     result += "총액: ${usd(data.totalAmount)}\n"
     result += "적립 포인트: ${data.totalVolumeCredits}점"
@@ -27,11 +27,15 @@ fun htmlStatement(invoice: Invoice, plays: Plays): String {
 }
 
 fun renderHtml(data: StatementData): String {
+    fun usd(number: Int): String {
+        return NumberFormat.getCurrencyInstance(US).format(number / 100.0)
+    }
+
     var result = "<h1>청구 내역 (고객명: ${data.customer})</h1>\n"
     result += "<table>\n"
     result += "<tr><th>연극</th><th>좌석 수</th><th>금액</th></tr>\n"
     for (perf in data.performances) {
-        result += "<tr><td>${perf.play.name}</td><td>${perf.audience}</td>"
+        result += "<tr><td>${perf.play?.name}</td><td>${perf.audience}</td>"
         result += "<td>${usd(perf.amount)}</td></tr>\n"
     }
     result += "</table>\n"