tp7 step 2 solution

Author: Lysoun

tp7/src/main/kotlin/fmt/kotlin/fundamentals/Cellar.kt

@@ -1,5 +1,9 @@
 package fmt.kotlin.fundamentals
 
 data class Cellar(val bottles: List<WineBottle>) {
-
+    fun describeBottles(descriptionBuilder: (WineBottle) -> String) {
+        for(i in bottles.indices) {
+            println("$i: ${descriptionBuilder(bottles[i])}")
+        }
+    }
 }

tp7/src/main/kotlin/fmt/kotlin/fundamentals/Main.kt

@@ -1,13 +1,7 @@
 package fmt.kotlin.fundamentals
 
-val buildWineBottleDescription: (WineBottle) -> String = {
-    val bottleType = when(it.wineType) {
-        WineType.RED -> "rouge"
-        WineType.WHITE -> "blanc"
-        WineType.ROSE -> "rosé"
-    }
-
-    "Vin $bottleType de l'année ${it.year}"
+val buildWineBottleShortDescription: (WineBottle) -> String = {
+    "Vin ${buildWineTypeDescription(it.wineType)} de l'année ${it.year}"
 }
 
 fun main() {
@@ -31,4 +25,23 @@ fun main() {
             2.0
         ),
     ))
-}
+
+    cellar.describeBottles(buildWineBottleShortDescription)
+
+    cellar.describeBottles({
+        "Vin ${buildWineTypeDescription(it.wineType)} de l'année ${it.year}, " +
+                "cépage ${it.grapeVariety}, bouteille de ${it.volumeInLiters} litres"
+    })
+    cellar.describeBottles {
+        "Vin ${buildWineTypeDescription(it.wineType)} de l'année ${it.year}, " +
+                "cépage ${it.grapeVariety}, bouteille de ${it.volumeInLiters} litres"
+    }
+    cellar.describeBottles(WineBottle::describe)
+}
+
+fun buildWineTypeDescription(wineType: WineType): String =
+    when (wineType) {
+        WineType.RED -> "rouge"
+        WineType.WHITE -> "blanc"
+        WineType.ROSE -> "rosé"
+    }

tp7/src/main/kotlin/fmt/kotlin/fundamentals/WineBottle.kt

@@ -6,6 +6,9 @@ data class WineBottle(
     val grapeVariety: String,
     val volumeInLiters: Double
 ) {
+    fun describe(): String {
+        return "Vin ${buildWineTypeDescription(wineType)} de l'année $year"
+    }
 }
 
 enum class WineType {