Merge pull request #474 from mannodermaus/api/eventresponse-nullable-…

…message Make EventResponse#message field nullable
DroidKaigi · Aug 15, 2024 · d9de76d · d9de76d
2 parents ee053d8 + c11c37c
commit d9de76d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...a/src/commonMain/kotlin/io/github/droidkaigi/confsched/data/eventmap/EventMapApiClient.kt b/...a/src/commonMain/kotlin/io/github/droidkaigi/confsched/data/eventmap/EventMapApiClient.kt
@@ -56,7 +56,7 @@ public fun EventMapResponse.toEventMapList(): PersistentList<EventMapEvent> {
                         enTitle = event.i18nDesc.en,
                     ),
                     moreDetailsUrl = event.moreDetailsUrl,
-                    message = event.message.toMultiLangText(),
+                    message = event.message?.toMultiLangText(),
                 )
             }
         }

diff --git a/.../commonMain/kotlin/io/github/droidkaigi/confsched/data/eventmap/response/EventResponse.kt b/.../commonMain/kotlin/io/github/droidkaigi/confsched/data/eventmap/response/EventResponse.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 public data class EventResponse(
     val i18nDesc: I18nDescResponse,
     val id: String,
-    val message: MessageResponse,
+    val message: MessageResponse?,
     val moreDetailsUrl: String?,
     val noShow: Boolean,
     val roomId: Int,

diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/EventMapEvent.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/EventMapEvent.kt
@@ -34,10 +34,14 @@ public fun EventMapEvent.Companion.fakes(): PersistentList<EventMapEvent> = Room
         } else {
             null
         },
-        message = MultiLangText(
-            "※こちらのイベントは時間が変更されました。",
-            "※This event has been rescheduled.",
-        ),
+        message = if (it.ordinal % 3 == 0) {
+            MultiLangText(
+                "※こちらのイベントは時間が変更されました。",
+                "※This event has been rescheduled.",
+            )
+        } else {
+            null
+        },
     )
 }.toPersistentList()