self-xdsd#262 "Tasks" card improvements.

- fix that will prevent contributor tasks from dashboard to crash
criske · Jan 10, 2021 · cc5581a · cc5581a
1 parent 5232076
commit cc5581a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/selfxdsd/selfweb/api/output/JsonTask.java b/src/main/java/com/selfxdsd/selfweb/api/output/JsonTask.java
@@ -25,6 +25,7 @@
 
 import javax.json.Json;
 import java.math.BigDecimal;
+import java.util.Optional;
 
 /**
  * Self Task as JSON.
@@ -42,12 +43,16 @@ public JsonTask(final Task task) {
         super(
             Json.createObjectBuilder()
                 .add("issueId", task.issueId())
-                .add("invoiceNumber", task.toString().split(":")[1])
+                .add("invoiceNumber", Optional.of(task.toString())
+                    .filter(str -> str.contains(":"))
+                    .map(str -> str.split(":")[1]).orElse(""))
                 .add("assignmentDate", String.valueOf(task.assignmentDate()))
                 .add("deadline", String.valueOf(task.deadline()))
                 .add("estimation", task.estimation())
                 .add("value", task.value().divide(BigDecimal.valueOf(100)))
-                .add("status", task.toString().split(":")[0])
+                .add("status", Optional.of(task.toString())
+                    .filter(str -> str.contains(":"))
+                    .map(str -> str.split(":")[0]).orElse(""))
                 .build()
         );
     }