fix(logbook): Tasks not showing when has tasks of just one type "rout…

…ine" or "study"
loryblu · Aug 9, 2024 · 2dcda7a · 2dcda7a
1 parent d95e238
commit 2dcda7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/logbook/src/main/java/com/loryblu/data/logbook/remote/model/LogbookTaskRemote.kt b/data/logbook/src/main/java/com/loryblu/data/logbook/remote/model/LogbookTaskRemote.kt
@@ -7,8 +7,8 @@ data class LogbookTaskRemote(
 
 data class Data(
     val count: Int,
-    val routine: List<LogbookRemoteItem>,
-    val study: List<LogbookRemoteItem>
+    val routine: List<LogbookRemoteItem>?,
+    val study: List<LogbookRemoteItem>?,
 )
 
 data class LogbookRemoteItem(

diff --git a/data/logbook/src/main/java/com/loryblu/data/logbook/util/RemoteExtensions.kt b/data/logbook/src/main/java/com/loryblu/data/logbook/util/RemoteExtensions.kt
@@ -28,7 +28,7 @@ fun LogbookTaskRemote.toLogbookTask(): List<LogbookTask> {
     val idToCard = TaskItem.getAllTaskItems().associateBy { it.taskId }
     val logbookItems = mutableListOf<LogbookTask>()
 
-    this.data.routine.map { remote ->
+    this.data.routine?.map { remote ->
         logbookItems.add(
             LogbookTask(
             itemOfCategory = idToCard[remote.categoryId]!!,
@@ -40,7 +40,7 @@ fun LogbookTaskRemote.toLogbookTask(): List<LogbookTask> {
             )
         )
     }
-    this.data.study.map { remote ->
+    this.data.study?.map { remote ->
         logbookItems.add(
             LogbookTask(
                 itemOfCategory = idToCard[remote.categoryId]!!,