Fixed scenario where 'finished_at' was null (#14)

LachlanMcKee · Sep 2, 2020 · 8e8d0d9 · 8e8d0d9
1 parent 1840ec0
commit 8e8d0d9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/kotlin/net/lachlanmckee/bitrise/core/data/entity/BuildsData.kt b/core/src/main/kotlin/net/lachlanmckee/bitrise/core/data/entity/BuildsData.kt
@@ -11,7 +11,7 @@ data class BuildsData(
         val buildNumber: Int,
         val buildSlug: String,
         val triggeredAt: String,
-        val finishedAt: String,
+        val finishedAt: String?,
         val originalEnvironmentValueList: List<EnvironmentValue>
     )
 

diff --git a/core/src/main/kotlin/net/lachlanmckee/bitrise/core/data/entity/BuildsResponse.kt b/core/src/main/kotlin/net/lachlanmckee/bitrise/core/data/entity/BuildsResponse.kt
@@ -19,7 +19,7 @@ data class BuildsResponse(
         val buildNumber: Int,
         val slug: String,
         val triggeredAt: String,
-        val finishedAt: String,
+        val finishedAt: String?,
         @SerializedName("original_build_params.environments")
         val originalEnvironmentValueList: List<EnvironmentValue>
     )

diff --git a/results/src/main/kotlin/net/lachlanmckee/bitrise/results/domain/entity/TestResultModel.kt b/results/src/main/kotlin/net/lachlanmckee/bitrise/results/domain/entity/TestResultModel.kt
@@ -5,7 +5,7 @@ internal data class TestResultModel(
     val status: String,
     val commitHash: String,
     val triggeredAt: String,
-    val finishedAt: String,
+    val finishedAt: String?,
     val buildSlug: String,
     val jobName: String?
 )
diff --git a/...ts/src/main/kotlin/net/lachlanmckee/bitrise/results/presentation/TestResultsListScreen.kt b/...ts/src/main/kotlin/net/lachlanmckee/bitrise/results/presentation/TestResultsListScreen.kt
@@ -50,7 +50,11 @@ internal class TestResultsListScreen(
                                 br()
                             }
 
-                            text("${build.triggeredAt} - ${build.finishedAt}")
+                            text(build.triggeredAt)
+
+                            if (build.finishedAt != null) {
+                                text(" - ${build.finishedAt}")
+                            }
 
                             br()
                             br()