exceptions-to-values.3 : return null for other failure

Duncan McGregor · dmcg · commit 799d81d39c07 · 2021-06-23T22:24:16.000+01:00
diff --git a/src/main/java/travelator/marketing/HighValueCustomersReport.kt b/src/main/java/travelator/marketing/HighValueCustomersReport.kt
@@ -23,15 +23,18 @@ private fun Sequence<String>.withoutHeader() = drop(1)
 internal fun String.toCustomerData(): CustomerData? =
     split("\t").let { parts ->
         if (parts.size < 4)
-            null
-        else
-            CustomerData(
-                id = parts[0],
-                givenName = parts[1],
-                familyName = parts[2],
-                score = parts[3].toInt(),
-                spend = if (parts.size == 4) 0.0 else parts[4].toDouble()
-            )
+            return null
+        val score = parts[3].toIntOrNull() ?:
+            return null
+        val spend = if (parts.size == 4) 0.0 else parts[4].toDoubleOrNull() ?:
+            return null
+        CustomerData(
+            id = parts[0],
+            givenName = parts[1],
+            familyName = parts[2],
+            score = score,
+            spend = spend
+        )
     }
 
 private val CustomerData.outputLine: String
