From f314b3982e50356baca5541585a9e3998d84a6fe Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Tue, 26 Mar 2024 22:27:12 -0400
Subject: [PATCH] [F] Fix mai event id

---
 src/main/java/icu/samnyan/aqua/net/games/Models.kt          | 2 +-
 .../icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt | 3 +++
 .../aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt      | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/net/games/Models.kt b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
index 6ac84b8f..b68d5460 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/Models.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/Models.kt
@@ -111,7 +111,7 @@ open class BaseEntity(
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JsonIgnore
-    var id: Long = 0
+    open var id: Long = 0
 ) : JavaSerializable {
     override fun toString() = JACKSON.writeValueAsString(this)
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt
index ffb1128c..8e902c8a 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt
@@ -11,6 +11,9 @@ import java.time.LocalDateTime
 @Data @Entity
 @Table(name = "maimai2_game_event")
 class Mai2GameEvent : BaseEntity() {
+    @JsonIgnore(false)
+    override var id = 0L
+
     var type = 0
     var startDate: String? = null
     var endDate: String? = null
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
index 4e59fb73..7c379bb2 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
@@ -1,5 +1,6 @@
 package icu.samnyan.aqua.sega.maimai2.model.userdata
 
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
@@ -13,8 +14,8 @@ import jakarta.persistence.*
 @Entity(name = "Maimai2UserData")
 @Table(name = "maimai2_user_detail")
 class Mai2UserDetail(
-    @JsonSerialize(using = AccessCodeSerializer::class)
-    @JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
+    @get:JsonSerialize(using = AccessCodeSerializer::class)
+    @get:JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
     @OneToOne
     @JoinColumn(name = "aime_card_id", unique = true)
     override var card: Card? = null,
@@ -149,6 +150,7 @@ class Mai2UserDetail(
     var currentPlayCount: Int? = 0,
     var renameCredit: Int? = 0
 ) : BaseEntity(), IGenericUserData {
+    @get:JsonIgnore
     override val totalScore: Long
         get() = totalDeluxscore
 }
\ No newline at end of file