From 712e2c9d02005e925a254d33ac7526920e446f29 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sun, 29 Dec 2024 07:01:47 -0500
Subject: [PATCH] [M] Combine other pojos

---
 .../model/response/data/AvatarEquip.java      | 23 -------------------
 .../model/response/data/GenreGraph.java       | 18 ---------------
 .../model/response/data/MatchingWaitState.kt  |  3 ++-
 .../model/userdata/Chu3MatchingMember.kt      | 17 ++++++++++++--
 4 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/AvatarEquip.java
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GenreGraph.java

diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/AvatarEquip.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/AvatarEquip.java
deleted file mode 100644
index ce1ba8f7..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/AvatarEquip.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AvatarEquip {
-
-    private int wearID;
-    private int headID;
-    private int faceID;
-    private int skinID;
-    private int itemID;
-    private int frontID;
-    private int backID;
-    
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GenreGraph.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GenreGraph.java
deleted file mode 100644
index fa80500f..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GenreGraph.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GenreGraph {
-
-    private int genreId;
-    private int musicCount;
-    
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt
index 9ae07d69..42c1f0da 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt
@@ -1,9 +1,10 @@
 package icu.samnyan.aqua.sega.chusan.model.response.data
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq
 
 class MatchingWaitState(
-    var matchingMemberInfoList: List<MatchingMemberInfo> = listOf(),
+    var matchingMemberInfoList: List<Chu3MatchingMemberReq> = listOf(),
 
     @JsonProperty("isFinish")
     var isFinish: Boolean = false,
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt
index 3508a13a..2c64e57e 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt
@@ -2,8 +2,6 @@ package icu.samnyan.aqua.sega.chusan.model.userdata
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import icu.samnyan.aqua.net.games.BaseEntity
-import icu.samnyan.aqua.sega.chusan.model.response.data.AvatarEquip
-import icu.samnyan.aqua.sega.chusan.model.response.data.GenreGraph
 import jakarta.persistence.Entity
 import jakarta.persistence.Table
 
@@ -43,6 +41,21 @@ class Chu3MatchingMember : BaseEntity() {
     var joinTime = 0
 }
 
+class AvatarEquip {
+    var wearID = 0
+    var headID = 0
+    var faceID = 0
+    var skinID = 0
+    var itemID = 0
+    var frontID = 0
+    var backID = 0
+}
+
+class GenreGraph {
+    var genreId = 0
+    var musicCount = 0
+}
+
 class Chu3MatchingMemberReq : Chu3MatchingMember() {
     var avatarEquip: AvatarEquip? = null
     var genreGraphList: List<GenreGraph>? = null