Merge pull request #145 from RADAR-base/fix/user

mpgxvii · web-flow · commit 6b9dc43384f3 · 2024-07-15T11:28:00.000+01:00
Fix isComplete check for User
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/user/OuraUser.kt b/oura-library/src/main/kotlin/org/radarbase/oura/user/OuraUser.kt
@@ -23,5 +23,5 @@ data class OuraUser(
     override val observationKey: ObservationKey = ObservationKey(projectId, userId, sourceId)
     override val versionedId: String = "$id${version?.let { "#$it" } ?: ""}"
 
-    fun isComplete() = isAuthorized && startDate.isBefore(endDate) && serviceUserId != null
+    fun isComplete() = isAuthorized && (endDate == null || startDate.isBefore(endDate)) && serviceUserId != null
 }

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ data class OuraUser(`
`23`	`23`	`override val observationKey: ObservationKey = ObservationKey(projectId, userId, sourceId)`
`24`	`24`	`override val versionedId: String = "$id${version?.let { "#$it" } ?: ""}"`
`25`	`25`
`26`		`- fun isComplete() = isAuthorized && startDate.isBefore(endDate) && serviceUserId != null`
	`26`	`+ fun isComplete() = isAuthorized && (endDate == null \|\| startDate.isBefore(endDate)) && serviceUserId != null`
`27`	`27`	`}`