diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt index f9b82448..51d4b597 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt @@ -129,9 +129,7 @@ interface Chu3UserCMissionProgressRepo : Chu3UserLinked { interface Chu3NetBattleLogRepo : Chu3UserLinked -interface Chu3MatchingMemberRepo : JpaRepository { - fun existsByUserIdAndUserName(userId: Long, userName: String): Boolean -} +interface Chu3UserMiscRepo : Chu3UserLinked interface Chu3GameChargeRepo : JpaRepository @@ -187,7 +185,7 @@ class Chu3Repos( val userCMission: Chu3UserCMissionRepo, val userCMissionProgress: Chu3UserCMissionProgressRepo, val netBattleLog: Chu3NetBattleLogRepo, - val matchingMember: Chu3MatchingMemberRepo, + val userMisc: Chu3UserMiscRepo, val gameCharge: Chu3GameChargeRepo, val gameEvent: Chu3GameEventRepo, val gameGachaCard: Chu3GameGachaCardRepo, 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 index dafe9bc8..99be8f6f 100644 --- 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 @@ -25,7 +25,7 @@ class UpsertTeamPoint( ) data class UpsertNetBattleData( - val recentNBSelectMusicList: List = emptyList(), + val recentNBSelectMusicList: List = emptyList(), val isRankUpChallengeFailed: Boolean = false, val highestBattleRankId: Long = 0, val battleIconId: Long = 0, @@ -33,7 +33,7 @@ data class UpsertNetBattleData( val avatarEffectPoint: Long = 0, ) -data class UpsertNBSelectMusic( +data class MusicIdWrapper( val musicId: Int = 0, ) 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 2c64e57e..fd3a40c5 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 @@ -1,13 +1,8 @@ package icu.samnyan.aqua.sega.chusan.model.userdata import com.fasterxml.jackson.annotation.JsonProperty -import icu.samnyan.aqua.net.games.BaseEntity -import jakarta.persistence.Entity -import jakarta.persistence.Table -@Entity(name = "ChusanMatchingMember") -@Table(name = "chusan_matching_member") -class Chu3MatchingMember : BaseEntity() { +open class Chu3MatchingMember { var userId: Long = 0 var regionId = 0 var placeId = 0 diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt new file mode 100644 index 00000000..c767cb1f --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserMisc.kt @@ -0,0 +1,18 @@ +package icu.samnyan.aqua.sega.chusan.model.userdata + +import icu.samnyan.aqua.sega.general.IntegerListConverter +import jakarta.persistence.Convert +import jakarta.persistence.Entity + + +@Entity(name = "ChusanUserMisc") +class Chu3UserMisc( + @Convert(converter = IntegerListConverter::class) + var recentNbSelect: MutableList = mutableListOf(), + + @Convert(converter = IntegerListConverter::class) + var recentNbMusic: MutableList = mutableListOf(), + + @Convert(converter = IntegerListConverter::class) + var favMusic: MutableList = mutableListOf() +): Chu3UserEntity() \ No newline at end of file diff --git a/src/main/resources/db/migration/mariadb/V1000_30__chusan_user_misc.sql b/src/main/resources/db/migration/mariadb/V1000_30__chusan_user_misc.sql new file mode 100644 index 00000000..d75433f2 --- /dev/null +++ b/src/main/resources/db/migration/mariadb/V1000_30__chusan_user_misc.sql @@ -0,0 +1,17 @@ +CREATE TABLE chusan_user_misc +( + id BIGINT AUTO_INCREMENT NOT NULL, + user_id BIGINT NULL, + recent_nb_select VARCHAR(1023) NULL, + recent_nb_music VARCHAR(1023) NULL, + fav_music VARCHAR(1023) NULL, + CONSTRAINT pk_chusanusermisc PRIMARY KEY (id) +); + +ALTER TABLE chusan_user_misc + ADD CONSTRAINT FK_CHUSANUSERMISC_ON_USER FOREIGN KEY (user_id) REFERENCES chusan_user_data (id); + +ALTER TABLE chusan_user_misc + ADD CONSTRAINT UNQ_CHUSANUSERMISC_ON_USER UNIQUE (user_id); + +DROP TABLE chusan_matching_member