From 1333b524731b1b951698a70a7b8830a2add99012 Mon Sep 17 00:00:00 2001 From: Lanius Trolling Date: Mon, 13 Feb 2023 16:27:14 -0500 Subject: [PATCH] Fix duplicate ID field --- src/main/kotlin/info/mechyrdia/auth/session_storage.kt | 2 ++ src/main/kotlin/info/mechyrdia/data/comments.kt | 2 ++ src/main/kotlin/info/mechyrdia/data/nations.kt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/main/kotlin/info/mechyrdia/auth/session_storage.kt b/src/main/kotlin/info/mechyrdia/auth/session_storage.kt index 8d3d4c5..ad09fb2 100644 --- a/src/main/kotlin/info/mechyrdia/auth/session_storage.kt +++ b/src/main/kotlin/info/mechyrdia/auth/session_storage.kt @@ -5,6 +5,7 @@ import info.mechyrdia.data.DocumentTable import info.mechyrdia.data.Id import info.mechyrdia.data.TableHolder import io.ktor.server.sessions.* +import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable object SessionStorageMongoDB : SessionStorage { @@ -23,6 +24,7 @@ object SessionStorageMongoDB : SessionStorage { @Serializable data class SessionStorageDoc( + @SerialName("_id") override val id: Id, val session: String ) : DataDocument { diff --git a/src/main/kotlin/info/mechyrdia/data/comments.kt b/src/main/kotlin/info/mechyrdia/data/comments.kt index 905cc30..c29ba71 100644 --- a/src/main/kotlin/info/mechyrdia/data/comments.kt +++ b/src/main/kotlin/info/mechyrdia/data/comments.kt @@ -2,6 +2,7 @@ package info.mechyrdia.data import kotlinx.coroutines.flow.Flow import kotlinx.serialization.Contextual +import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import org.litote.kmongo.descending import org.litote.kmongo.eq @@ -9,6 +10,7 @@ import java.time.Instant @Serializable data class Comment( + @SerialName("_id") override val id: Id, val submittedBy: Id, diff --git a/src/main/kotlin/info/mechyrdia/data/nations.kt b/src/main/kotlin/info/mechyrdia/data/nations.kt index 5fd9bdb..c90e736 100644 --- a/src/main/kotlin/info/mechyrdia/data/nations.kt +++ b/src/main/kotlin/info/mechyrdia/data/nations.kt @@ -8,10 +8,12 @@ import info.mechyrdia.auth.executeSuspend import io.ktor.server.application.* import io.ktor.server.sessions.* import io.ktor.util.* +import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable data class NationData( + @SerialName("_id") override val id: Id, val name: String, val flag: String, -- 2.25.1