atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix requesting recipe summary errors due to time types

Browse Source
This commit is contained in:
Kirill Kamakin
2021-11-08 20:15:19 +03:00
parent 14ddd1ed55
commit 65548cb397
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/gq/kirmanak/mealie/data/RoomTypeConverters.kt
View File

@@ -1,12 +1,22 @@
package gq.kirmanak.mealie.data package gq.kirmanak.mealie.data
import androidx.room.TypeConverter import androidx.room.TypeConverter
import kotlinx.datetime.Instant import kotlinx.datetime.*
object RoomTypeConverters { object RoomTypeConverters {
@TypeConverter @TypeConverter
fun instantToTimestamp(instant: Instant) = instant.toEpochMilliseconds() fun localDateTimeToTimestamp(localDateTime: LocalDateTime) =
localDateTime.toInstant(TimeZone.UTC).toEpochMilliseconds()
@TypeConverter @TypeConverter
fun timestampToInstant(timestamp: Long) = Instant.fromEpochMilliseconds(timestamp) fun timestampToLocalDateTime(timestamp: Long) =
Instant.fromEpochMilliseconds(timestamp).toLocalDateTime(TimeZone.UTC)
@TypeConverter
fun localDateToTimeStamp(date: LocalDate) =
localDateTimeToTimestamp(date.atTime(0, 0))
@TypeConverter
fun timestampToLocalDate(timestamp: Long) =
timestampToLocalDateTime(timestamp).date
} }

7
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeEntity.kt
View File

@@ -4,7 +4,8 @@ import androidx.room.ColumnInfo
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Index import androidx.room.Index
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalDateTime
@Entity(tableName = "recipes", indices = [Index(value = ["remote_id"], unique = true)]) @Entity(tableName = "recipes", indices = [Index(value = ["remote_id"], unique = true)])
data class RecipeEntity( data class RecipeEntity(
@@ -15,6 +16,6 @@ data class RecipeEntity(
@ColumnInfo(name = "image") val image: String, @ColumnInfo(name = "image") val image: String,
@ColumnInfo(name = "description") val description: String, @ColumnInfo(name = "description") val description: String,
@ColumnInfo(name = "rating") val rating: Int?, @ColumnInfo(name = "rating") val rating: Int?,
@ColumnInfo(name = "date_added") val dateAdded: Instant, @ColumnInfo(name = "date_added") val dateAdded: LocalDate,
@ColumnInfo(name = "date_updated") val dateUpdated: Instant @ColumnInfo(name = "date_updated") val dateUpdated: LocalDateTime
) )

7
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/GetRecipeSummaryResponse.kt
View File

@@ -1,6 +1,7 @@
package gq.kirmanak.mealie.data.recipes.network package gq.kirmanak.mealie.data.recipes.network
import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalDateTime
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@@ -14,6 +15,6 @@ data class GetRecipeSummaryResponse(
@SerialName("recipeCategory") val recipeCategories: List<String>, @SerialName("recipeCategory") val recipeCategories: List<String>,
@SerialName("tags") val tags: List<String>, @SerialName("tags") val tags: List<String>,
@SerialName("rating") val rating: Int?, @SerialName("rating") val rating: Int?,
@SerialName("dateAdded") val dateAdded: Instant, @SerialName("dateAdded") val dateAdded: LocalDate,
@SerialName("dateUpdated") val dateUpdated: Instant @SerialName("dateUpdated") val dateUpdated: LocalDateTime
) )