From c41046953e505b90ab68afed87febe6794d1ea43 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 25 Mar 2024 14:15:03 -0400
Subject: [PATCH] [F] Fix user item isValid field

---
 .../aqua/sega/maimai2/handler/UpsertUserAllHandler.kt      | 7 +++----
 .../aqua/sega/maimai2/model/userdata/UserEntities.kt       | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
index 10853bae..ced9cc9b 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
@@ -13,7 +13,6 @@ import icu.samnyan.aqua.sega.maimai2.model.request.UpsertUserAll
 import icu.samnyan.aqua.sega.maimai2.model.userdata.*
 import icu.samnyan.aqua.sega.util.jackson.BasicMapper
 import lombok.AllArgsConstructor
-import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
 
@@ -27,7 +26,6 @@ class UpsertUserAllHandler(
     val cardService: CardService,
     val repos: Mai2Repos
 ) : BaseHandler {
-    val SUCCESS = """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.UpsertUserAllApi"}"""
 
     @Throws(JsonProcessingException::class)
     override fun handle(request: Map<String, Any>): Any? {
@@ -60,7 +58,7 @@ class UpsertUserAllHandler(
         // Set users
         req.run { listOf(userExtend, userOption, userCharacterList, userMapList, userLoginBonusList, userItemList,
             userMusicDetailList, userCourseList, userFriendSeasonRankingList, userFavoriteList) }
-            .flatten().forEach { it?.user = u }
+            .flatten().forEach { it.user = u }
 
         req.userExtend?.getOrNull(0)?.let {
             repos.userExtend.save(it.apply { id = repos.userExtend.findSingleByUser(u)()?.id ?: 0 })
@@ -134,6 +132,7 @@ class UpsertUserAllHandler(
     }
 
     companion object {
-        val logger: Logger = LoggerFactory.getLogger(UpsertUserAllHandler::class.java)
+        val logger = LoggerFactory.getLogger(UpsertUserAllHandler::class.java)
+        const val SUCCESS = """{"returnCode":1,"apiName":"com.sega.maimai2servlet.api.UpsertUserAllApi"}"""
     }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt
index 91fee082..33da9e92 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt
@@ -236,6 +236,8 @@ class Mai2UserItem : Mai2UserEntity() {
     var itemKind = 0
     var itemId = 0
     var stock = 0
+
+    @JsonProperty("isValid")
     var isValid = false
 }