From 6844e1b4352246149544d5f3de492da1ba60e2b5 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 26 Dec 2024 06:42:27 -0500
Subject: [PATCH] [O] riik UpsertUserAll model

---
 .../chusan/model/request/UpsertUserAll.java   | 117 ------------------
 .../chusan/model/request/UpsertUserAll.kt     |  37 ++++++
 .../data/UserCMissionProgressResp.java        |  16 ---
 .../model/response/data/UserCMissionResp.java |  19 ---
 4 files changed, 37 insertions(+), 152 deletions(-)
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.java
 create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.kt
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionProgressResp.java
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionResp.java

diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.java
deleted file mode 100644
index 9dea991c..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.request;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import icu.samnyan.aqua.sega.chusan.model.userdata.*;
-import icu.samnyan.aqua.sega.general.model.response.UserRecentRating;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.lang.Nullable;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UpsertUserAll implements Serializable {
-
-    @Nullable
-    private List<Chu3UserData> userData;
-
-    @Nullable
-    private List<UserGameOption> userGameOption;
-
-    @Nullable
-    private List<UserCharacter> userCharacterList;
-
-    @Nullable
-    private List<UserItem> userItemList;
-
-    @Nullable
-    private List<UserMusicDetail> userMusicDetailList;
-
-    @Nullable
-    private List<UserActivity> userActivityList;
-
-    @Nullable
-    private List<UserRecentRating> userRecentRatingList;
-
-    @Nullable
-    private List<UserPlaylog> userPlaylogList;
-
-    @Nullable
-    private List<UserCharge> userChargeList;
-
-    @Nullable
-    private List<UserCourse> userCourseList;
-
-    @Nullable
-    private List<UserDuel> userDuelList;
-
-    @Nullable
-    private List<Map<String, Object>> userTeamPoint;
-
-    @Nullable
-    private List<Map<String, Object>> userRatingBaseHotList;
-
-    @Nullable
-    private List<Map<String, Object>> userRatingBaseList;
-
-    @Nullable
-    private List<Map<String, Object>> userRatingBaseNextList;
-
-    @Nullable
-    private List<Map<String, Object>> userLoginBonusList;
-
-    @Nullable
-    private List<UserMap> userMapAreaList;
-
-    @Nullable
-    private List<Map<String, Object>> userOverPowerList;
-
-    @Nullable
-    private List<Map<String, Object>> userNetBattlelogList;
-
-    @Nullable
-    private List<Map<String, Object>> userEmoneyList;
-
-    @Nullable
-    private List<Map<String, Object>> userNetBattleData;
-
-    @Nullable
-    private List<Map<String, Object>> userCMissionList;
-
-    @Nullable
-    @JsonProperty("isNewCharacterList")
-    private String isNewCharacterList;
-
-    @Nullable
-    @JsonProperty("isNewMusicDetailList")
-    private String isNewMusicDetailList;
-
-    @Nullable
-    @JsonProperty("isNewItemList")
-    private String isNewItemList;
-
-    @Nullable
-    @JsonProperty("isNewCourseList")
-    private String isNewCourseList;
-
-    @Nullable
-    @JsonProperty("isNewDuelList")
-    private String isNewDuelList;
-
-    @Nullable
-    @JsonProperty("isNewMapAreaList")
-    private String isNewMapAreaList;
-
-    @Nullable
-    @JsonProperty("isNewCMissionList")
-    private String isNewCMissionList;
-
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.kt
new file mode 100644
index 00000000..5f2e07af
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserAll.kt
@@ -0,0 +1,37 @@
+package icu.samnyan.aqua.sega.chusan.model.request
+
+import ext.JDict
+import icu.samnyan.aqua.sega.chusan.model.userdata.*
+import icu.samnyan.aqua.sega.general.model.response.UserRecentRating
+
+class UserCMissionResp {
+    var userId: Long? = 0
+    var missionId = 0
+    var point = 0
+    var userCMissionProgressList: List<UserCMissionProgress>? = null
+}
+
+class UpsertUserAll(
+    var userData: List<Chu3UserData>? = null,
+    var userGameOption: List<UserGameOption>? = null,
+    var userCharacterList: List<UserCharacter>? = null,
+    var userItemList: List<UserItem>? = null,
+    var userMusicDetailList: List<UserMusicDetail>? = null,
+    var userActivityList: List<UserActivity>? = null,
+    var userRecentRatingList: List<UserRecentRating>? = null,
+    var userPlaylogList: List<UserPlaylog>? = null,
+    var userChargeList: List<UserCharge>? = null,
+    var userCourseList: List<UserCourse>? = null,
+    var userDuelList: List<UserDuel>? = null,
+    var userTeamPoint: List<JDict>? = null,
+    var userRatingBaseHotList: List<UserRecentRating>? = null,
+    var userRatingBaseList: List<UserRecentRating>? = null,
+    var userRatingBaseNextList: List<UserRecentRating>? = null,
+    var userLoginBonusList: List<JDict>? = null,
+    var userMapAreaList: List<UserMap>? = null,
+    var userOverPowerList: List<JDict>? = null,
+    var userNetBattlelogList: List<JDict>? = null,
+    var userEmoneyList: List<JDict>? = null,
+    var userNetBattleData: List<JDict>? = null,
+    var userCMissionList: List<UserCMissionResp>? = null,
+)
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionProgressResp.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionProgressResp.java
deleted file mode 100644
index 0c3f206f..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionProgressResp.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserCMissionProgressResp implements Serializable {
-    private int order;
-    private int stage;
-    private int progress;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionResp.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionResp.java
deleted file mode 100644
index 885bd100..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserCMissionResp.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserCMissionResp implements Serializable {
-    private long userId;
-    private int missionId;
-    private int point;
-    private List<UserCMissionProgressResp> userCMissionProgressList;
-}