From bb7b7fd8f01a7114a2966619a48b22e547938743 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Tue, 17 Jan 2023 15:06:35 +0800 Subject: [PATCH] fix(api): include Z in datetime formats --- .../api/rest/dto/AuthenticationActivityDto.kt | 2 +- .../komga/interfaces/api/rest/dto/BookDto.kt | 16 ++++++++-------- .../interfaces/api/rest/dto/CollectionDto.kt | 4 ++-- .../komga/interfaces/api/rest/dto/ReadListDto.kt | 4 ++-- .../komga/interfaces/api/rest/dto/SeriesDto.kt | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthenticationActivityDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthenticationActivityDto.kt index 78471fb65..943c5bed9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthenticationActivityDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/AuthenticationActivityDto.kt @@ -11,7 +11,7 @@ data class AuthenticationActivityDto( val userAgent: String?, val success: Boolean, val error: String?, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val dateTime: LocalDateTime, val source: String?, ) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookDto.kt index 60b890a54..eaf11f04a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/BookDto.kt @@ -14,11 +14,11 @@ data class BookDto( val name: String, val url: String, val number: Int, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val fileLastModified: LocalDateTime, val sizeBytes: Long, val size: String = BinaryByteUnit.format(sizeBytes), @@ -60,19 +60,19 @@ data class BookMetadataDto( val links: List, val linksLock: Boolean, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, ) data class ReadProgressDto( val page: Int, val completed: Boolean, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val readDate: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, ) diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionDto.kt index 662b5abe8..daafe2c0c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/CollectionDto.kt @@ -12,9 +12,9 @@ data class CollectionDto( val seriesIds: List, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val createdDate: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModifiedDate: LocalDateTime, val filtered: Boolean, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListDto.kt index bca2307cd..68b0cbbf0 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/ReadListDto.kt @@ -12,9 +12,9 @@ data class ReadListDto( val bookIds: List, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val createdDate: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModifiedDate: LocalDateTime, val filtered: Boolean, diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesDto.kt index ede898622..5c5f0738b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/dto/SeriesDto.kt @@ -9,11 +9,11 @@ data class SeriesDto( val libraryId: String, val name: String, val url: String, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val fileLastModified: LocalDateTime, val booksCount: Int, val booksReadCount: Int, @@ -57,9 +57,9 @@ data class SeriesMetadataDto( val alternateTitles: List, val alternateTitlesLock: Boolean, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, ) @@ -71,8 +71,8 @@ data class BookMetadataAggregationDto( val summary: String, val summaryNumber: String, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val created: LocalDateTime, - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'") val lastModified: LocalDateTime, )