Do not query for catcher or batter if they don't exist

guardian · Sep 11, 2024 · b5a1aac · b5a1aac
1 parent 819316a
commit b5a1aac
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/sport/app/cricket/feed/cricketPaDeserialisation.scala b/sport/app/cricket/feed/cricketPaDeserialisation.scala
@@ -134,8 +134,12 @@ object Parser {
     batters
       .map { batter =>
         val dismissalDescription = (batter \ "dismissal" \ "description").text
-        val catcherId = (batter \ "dismissal" \ "caughtBy" \ "player" \ "@id").text
-        val bowlerId = (batter \ "dismissal" \ "bowledBy" \ "player" \ "@id").text
+        val catcherId =
+          if (dismissalDescription.contains("c") || dismissalDescription.contains("st"))
+            (batter \ "dismissal" \ "caughtBy" \ "player" \ "@id").text
+          else ""
+        val bowlerId =
+          if (dismissalDescription.contains("b")) (batter \ "dismissal" \ "bowledBy" \ "player" \ "@id").text else ""
 
         InningsBatter(
           (batter \ "player" \ "name").text,