From 67efabbfa74c6964a4a76c98ecbc6b0f42a6a300 Mon Sep 17 00:00:00 2001 From: Jonas Heubuch Date: Mon, 8 Jul 2024 15:07:44 +0200 Subject: [PATCH] :ambulance: Fix serialization of enums --- .../hbch/traewelling/api/models/status/CheckIn.kt | 14 +++++++------- .../api/models/status/TrwlCheckInUpdateRequest.kt | 4 ++-- .../de/hbch/traewelling/shared/CheckInViewModel.kt | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/de/hbch/traewelling/api/models/status/CheckIn.kt b/app/src/main/kotlin/de/hbch/traewelling/api/models/status/CheckIn.kt index d879208f..fc51b0e0 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/api/models/status/CheckIn.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/api/models/status/CheckIn.kt @@ -5,19 +5,19 @@ import de.hbch.traewelling.providers.checkin.CheckInRequest import java.time.ZonedDateTime data class TrwlCheckInRequest( - @SerializedName("body") val body: String, - @SerializedName("business") val business: StatusBusiness, - @SerializedName("visibility") val visibility: StatusVisibility, - @SerializedName("eventId") val eventId: Int?, + val body: String, + val business: Int, + val visibility: Int, + val eventId: Int?, @SerializedName("toot") val sendToot: Boolean, @SerializedName("chainPost") val shouldChainToot: Boolean, - @SerializedName("tripId") val tripId: String, - @SerializedName("lineName") val lineName: String, + val tripId: String, + val lineName: String, @SerializedName("start") val startStationId: Int, @SerializedName("destination") val destinationStationId: Int, @SerializedName("departure") val departureTime: ZonedDateTime, @SerializedName("arrival") val arrivalTime: ZonedDateTime, - @SerializedName("force") val force: Boolean = false + val force: Boolean = false ): CheckInRequest() data class TrwlCheckInResponse( diff --git a/app/src/main/kotlin/de/hbch/traewelling/api/models/status/TrwlCheckInUpdateRequest.kt b/app/src/main/kotlin/de/hbch/traewelling/api/models/status/TrwlCheckInUpdateRequest.kt index 9b7de65a..565d24dd 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/api/models/status/TrwlCheckInUpdateRequest.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/api/models/status/TrwlCheckInUpdateRequest.kt @@ -5,8 +5,8 @@ import java.time.ZonedDateTime data class TrwlCheckInUpdateRequest( val body: String?, - val business: StatusBusiness, - val visibility: StatusVisibility, + val business: Int, + val visibility: Int, val destinationId: Int? = null, val destinationArrivalPlanned: ZonedDateTime? = null, val manualDeparture: ZonedDateTime? = null, diff --git a/app/src/main/kotlin/de/hbch/traewelling/shared/CheckInViewModel.kt b/app/src/main/kotlin/de/hbch/traewelling/shared/CheckInViewModel.kt index 7d0b2a93..e543a667 100644 --- a/app/src/main/kotlin/de/hbch/traewelling/shared/CheckInViewModel.kt +++ b/app/src/main/kotlin/de/hbch/traewelling/shared/CheckInViewModel.kt @@ -99,8 +99,8 @@ class CheckInViewModel : ViewModel() { if (checkInTrwl) { val trwlCheckInRequest = TrwlCheckInRequest( message.value ?: "", - statusBusiness.value ?: StatusBusiness.PRIVATE, - statusVisibility.value ?: StatusVisibility.PUBLIC, + (statusBusiness.value ?: StatusBusiness.PRIVATE).ordinal, + (statusVisibility.value ?: StatusVisibility.PUBLIC).ordinal, event.value?.id, toot.value ?: false, chainToot.value ?: false, @@ -135,8 +135,8 @@ class CheckInViewModel : ViewModel() { editStatusId, TrwlCheckInUpdateRequest( message.value, - statusBusiness.value ?: error("Invalid data"), - statusVisibility.value ?: error("Invalid data"), + statusBusiness.value?.ordinal ?: error("Invalid data"), + statusVisibility.value?.ordinal ?: error("Invalid data"), destinationStationId, arrivalTime, manualDepartureTime,