tp9 step 2 solution

ctruchi · ctruchi · commit 1f0f44869b59 · 2025-02-14T11:08:12.000+04:00
diff --git a/tp9/src/main/kotlin/fmt/kotlin/fundamentals/Cellar.kt b/tp9/src/main/kotlin/fmt/kotlin/fundamentals/Cellar.kt
@@ -1,5 +1,7 @@
 package fmt.kotlin.fundamentals
 
+import fmt.kotlin.fundamentals.WineColor.RED
+
 data class Cellar(
     val bottles: List<Bottle>
 ) {
@@ -9,5 +11,11 @@ data class Cellar(
         }
     }
 
-    fun describeRedBottles() = ""
+    fun describeRedBottles() = bottles.joinToString("\n") {
+        it.takeIf { it.color == RED }
+            ?.let {
+                "Bouteille de ${it.name} de ${it.year}"
+            }
+            ?: "Bouteille de blanc"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package fmt.kotlin.fundamentals`
`2`	`2`
	`3`	`+import fmt.kotlin.fundamentals.WineColor.RED`
	`4`	`+`
`3`	`5`	`data class Cellar(`
`4`	`6`	`val bottles: List<Bottle>`
`5`	`7`	`) {`
`@@ -9,5 +11,11 @@ data class Cellar(`
`9`	`11`	`}`
`10`	`12`	`}`
`11`	`13`
`12`		`- fun describeRedBottles() = ""`
	`14`	`+ fun describeRedBottles() = bottles.joinToString("\n") {`
	`15`	`+ it.takeIf { it.color == RED }`
	`16`	`+ ?.let {`
	`17`	`+ "Bouteille de ${it.name} de ${it.year}"`
	`18`	`+ }`
	`19`	`+ ?: "Bouteille de blanc"`
	`20`	`+ }`
`13`	`21`	`}`