From c0604bc98998bb918f57215f69db32261a5e7bba Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Wed, 26 Mar 2025 18:56:33 -0400 Subject: [PATCH] [M] Ongeki: Move model --- .../icu/samnyan/aqua/net/games/ongeki/Ongeki.kt | 2 +- .../icu/samnyan/aqua/net/transfer/DataBroker.kt | 2 +- .../icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt | 2 +- .../handler/impl/GetUserActivityHandler.java | 2 +- .../ongeki/handler/impl/GetUserBossHandler.java | 2 +- .../ongeki/handler/impl/GetUserCardHandler.java | 2 +- .../handler/impl/GetUserChapterHandler.java | 2 +- .../handler/impl/GetUserCharacterHandler.java | 2 +- .../ongeki/handler/impl/GetUserDataHandler.java | 2 +- .../handler/impl/GetUserDeckByKeyHandler.java | 2 +- .../handler/impl/GetUserEventMusicHandler.java | 2 +- .../handler/impl/GetUserEventPointHandler.java | 2 +- .../impl/GetUserEventRankingHandler.java | 2 +- .../ongeki/handler/impl/GetUserItemHandler.kt | 2 +- .../ongeki/handler/impl/GetUserKopHandler.java | 2 +- .../handler/impl/GetUserLoginBonusHandler.java | 2 +- .../impl/GetUserMemoryChapterHandler.java | 2 +- .../impl/GetUserMissionPointHandler.java | 2 +- .../handler/impl/GetUserMusicHandler.java | 2 +- .../handler/impl/GetUserMusicItemHandler.java | 2 +- .../handler/impl/GetUserOptionHandler.java | 2 +- .../handler/impl/GetUserPreviewHandler.java | 2 +- .../impl/GetUserRecentRatingHandler.java | 4 ++-- .../handler/impl/GetUserScenarioHandler.java | 2 +- .../handler/impl/GetUserStoryHandler.java | 2 +- .../handler/impl/GetUserTechCountHandler.java | 2 +- .../handler/impl/GetUserTechEventHandler.java | 2 +- .../impl/GetUserTechEventRankingHandler.java | 2 +- .../handler/impl/GetUserTradeItemHandler.java | 2 +- .../impl/GetUserTrainingRoomByKeyHandler.java | 2 +- .../ongeki/handler/impl/UpsertUserAllHandler.kt | 2 +- .../{userdata/All.kt => OngekiUserEntities.kt} | 3 +-- .../ongeki/model/request/UpsertUserAll.java | 2 +- .../aqua/sega/ongeki/model/response/data/All.kt | 2 +- .../sega/ongeki/model/userdata/ZUserDataTest.kt | 17 ----------------- 35 files changed, 35 insertions(+), 53 deletions(-) rename src/main/java/icu/samnyan/aqua/sega/ongeki/model/{userdata/All.kt => OngekiUserEntities.kt} (98%) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/ZUserDataTest.kt diff --git a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt index dcd613f0..78abb905 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt @@ -8,7 +8,7 @@ import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo import icu.samnyan.aqua.sega.ongeki.OgkUserGeneralDataRepo import icu.samnyan.aqua.sega.ongeki.OgkUserMusicDetailRepo import icu.samnyan.aqua.sega.ongeki.OgkUserPlaylogRepo -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData +import icu.samnyan.aqua.sega.ongeki.model.UserData import org.springframework.web.bind.annotation.RestController @RestController diff --git a/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt b/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt index b3753a28..d3537da1 100644 --- a/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt +++ b/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt @@ -10,7 +10,7 @@ import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserFavorite import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserItem import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMusicDetail import icu.samnyan.aqua.sega.ongeki.model.request.UpsertUserAll -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserItem +import icu.samnyan.aqua.sega.ongeki.model.UserItem import icu.samnyan.aqua.sega.util.jackson.BasicMapper import icu.samnyan.aqua.sega.util.jackson.IMapper import icu.samnyan.aqua.sega.util.jackson.StringMapper diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt index 2e349906..66125a7f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt @@ -5,8 +5,8 @@ import icu.samnyan.aqua.net.games.GenericPlaylogRepo import icu.samnyan.aqua.net.games.GenericUserDataRepo import icu.samnyan.aqua.net.games.GenericUserMusicRepo import icu.samnyan.aqua.net.games.IUserRepo +import icu.samnyan.aqua.sega.ongeki.model.* import icu.samnyan.aqua.sega.ongeki.model.gamedata.* -import icu.samnyan.aqua.sega.ongeki.model.userdata.* import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.data.jpa.repository.JpaRepository diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserActivityHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserActivityHandler.java index 6bb09866..b6435b46 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserActivityHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserActivityHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserActivityRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserActivity; +import icu.samnyan.aqua.sega.ongeki.model.UserActivity; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserBossHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserBossHandler.java index 5af59ac9..fba064d1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserBossHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserBossHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserBossRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserBoss; +import icu.samnyan.aqua.sega.ongeki.model.UserBoss; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCardHandler.java index 9af2356d..b565e700 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCardHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserCardRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserCard; +import icu.samnyan.aqua.sega.ongeki.model.UserCard; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserChapterHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserChapterHandler.java index 3d24ec38..5d146f43 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserChapterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserChapterHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserChapterRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserChapter; +import icu.samnyan.aqua.sega.ongeki.model.UserChapter; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCharacterHandler.java index 31b2468f..f3e980fe 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCharacterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserCharacterHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserCharacterRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserCharacter; +import icu.samnyan.aqua.sega.ongeki.model.UserCharacter; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDataHandler.java index 7da7cf82..4c24125a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDataHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData; +import icu.samnyan.aqua.sega.ongeki.model.UserData; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDeckByKeyHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDeckByKeyHandler.java index 9a418bcd..e3b54764 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDeckByKeyHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserDeckByKeyHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserDeckRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserDeck; +import icu.samnyan.aqua.sega.ongeki.model.UserDeck; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventMusicHandler.java index 3c37cfbf..4259a460 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventMusicHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserEventMusicRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserEventMusic; +import icu.samnyan.aqua.sega.ongeki.model.UserEventMusic; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventPointHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventPointHandler.java index eddffcbd..e79ff890 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventPointHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventPointHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserEventPointRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserEventPoint; +import icu.samnyan.aqua.sega.ongeki.model.UserEventPoint; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventRankingHandler.java index 89a4ccc4..43841b08 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserEventRankingHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserEventPointRepo; import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.ongeki.model.response.data.UserEventRankingItem; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserEventPoint; +import icu.samnyan.aqua.sega.ongeki.model.UserEventPoint; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserItemHandler.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserItemHandler.kt index afd9a074..a28c1312 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserItemHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserItemHandler.kt @@ -5,7 +5,7 @@ import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo import icu.samnyan.aqua.sega.ongeki.OgkUserItemRepo import icu.samnyan.aqua.sega.ongeki.model.common.ItemType -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserItem +import icu.samnyan.aqua.sega.ongeki.model.UserItem import icu.samnyan.aqua.sega.util.jackson.BasicMapper import org.springframework.data.domain.PageRequest import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserKopHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserKopHandler.java index 37918861..f05a9a6b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserKopHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserKopHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserKopRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserKop; +import icu.samnyan.aqua.sega.ongeki.model.UserKop; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserLoginBonusHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserLoginBonusHandler.java index 4fd7cdca..569234c6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserLoginBonusHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserLoginBonusHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserLoginBonusRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserLoginBonus; +import icu.samnyan.aqua.sega.ongeki.model.UserLoginBonus; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMemoryChapterHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMemoryChapterHandler.java index 804f03e7..72867288 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMemoryChapterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMemoryChapterHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserMemoryChapterRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMemoryChapter; +import icu.samnyan.aqua.sega.ongeki.model.UserMemoryChapter; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMissionPointHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMissionPointHandler.java index b6063114..d74d2888 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMissionPointHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMissionPointHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserMissionPointRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMissionPoint; +import icu.samnyan.aqua.sega.ongeki.model.UserMissionPoint; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicHandler.java index 4fa143ea..a59a3a3b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserMusicDetailRepo; import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.ongeki.model.response.data.UserMusicListItem; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicDetail; +import icu.samnyan.aqua.sega.ongeki.model.UserMusicDetail; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import icu.samnyan.aqua.spring.data.OffsetPageRequest; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicItemHandler.java index ba94d2ed..0c1635a4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserMusicItemHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserMusicItemRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicItem; +import icu.samnyan.aqua.sega.ongeki.model.UserMusicItem; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserOptionHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserOptionHandler.java index 1869252b..78604d5e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserOptionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserOptionHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserOptionRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserOption; +import icu.samnyan.aqua.sega.ongeki.model.UserOption; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserPreviewHandler.java index 58c16195..68ca2ae8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserPreviewHandler.java @@ -5,7 +5,7 @@ import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo; import icu.samnyan.aqua.sega.ongeki.OgkUserOptionRepo; import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.ongeki.model.response.GetUserPreviewResp; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData; +import icu.samnyan.aqua.sega.ongeki.model.UserData; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserRecentRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserRecentRatingHandler.java index 6709551f..5907eec1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserRecentRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserRecentRatingHandler.java @@ -5,8 +5,8 @@ import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; import icu.samnyan.aqua.sega.ongeki.OgkUserGeneralDataRepo; import icu.samnyan.aqua.sega.ongeki.OgkUserPlaylogRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserGeneralData; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserPlaylog; +import icu.samnyan.aqua.sega.ongeki.model.UserGeneralData; +import icu.samnyan.aqua.sega.ongeki.model.UserPlaylog; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserScenarioHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserScenarioHandler.java index 3811f5c5..447032be 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserScenarioHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserScenarioHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserScenarioRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserScenario; +import icu.samnyan.aqua.sega.ongeki.model.UserScenario; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserStoryHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserStoryHandler.java index 2144c433..093b7713 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserStoryHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserStoryHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserStoryRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserStory; +import icu.samnyan.aqua.sega.ongeki.model.UserStory; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechCountHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechCountHandler.java index 633f547c..fe44d9e5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechCountHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechCountHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserTechCountRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserTechCount; +import icu.samnyan.aqua.sega.ongeki.model.UserTechCount; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventHandler.java index c947d973..76c70e5e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserTechEventRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserTechEvent; +import icu.samnyan.aqua.sega.ongeki.model.UserTechEvent; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventRankingHandler.java index 5e6c88af..65262915 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTechEventRankingHandler.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserTechEventRepo; import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.ongeki.model.response.data.UserTechEventRankingItem; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserTechEvent; +import icu.samnyan.aqua.sega.ongeki.model.UserTechEvent; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTradeItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTradeItemHandler.java index b25d0745..b5589be4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTradeItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTradeItemHandler.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserTradeItemRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserTradeItem; +import icu.samnyan.aqua.sega.ongeki.model.UserTradeItem; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTrainingRoomByKeyHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTrainingRoomByKeyHandler.java index e9a237a5..bb56df0f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTrainingRoomByKeyHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/GetUserTrainingRoomByKeyHandler.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.OgkUserTrainingRoomRepo; import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserTrainingRoom; +import icu.samnyan.aqua.sega.ongeki.model.UserTrainingRoom; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.kt index a84cb479..51bf9aad 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.kt @@ -5,9 +5,9 @@ import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.model.response.UserRecentRating import icu.samnyan.aqua.sega.general.service.CardService import icu.samnyan.aqua.sega.ongeki.* +import icu.samnyan.aqua.sega.ongeki.model.* import icu.samnyan.aqua.sega.ongeki.model.request.UpsertUserAll import icu.samnyan.aqua.sega.ongeki.model.response.CodeResp -import icu.samnyan.aqua.sega.ongeki.model.userdata.* import icu.samnyan.aqua.sega.util.jackson.BasicMapper import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/All.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt similarity index 98% rename from src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/All.kt rename to src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt index 5a61f229..839c860e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/All.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.ongeki.model.userdata +package icu.samnyan.aqua.sega.ongeki.model import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty @@ -102,7 +102,6 @@ class UserData : IUserData { name = "ongeki_user_activity", uniqueConstraints = [UniqueConstraint(columnNames = ["user_id", "kind", "activity_id"])] ) -@JsonPropertyOrder("kind", "id", "sortNumber", "param1", "param2", "param3", "param4") class UserActivity : OngekiUserEntity() { var kind = 0 @JsonProperty("id") diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/request/UpsertUserAll.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/request/UpsertUserAll.java index 89d2173a..b56975f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/request/UpsertUserAll.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/request/UpsertUserAll.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.ongeki.model.request; import com.fasterxml.jackson.annotation.JsonProperty; import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; -import icu.samnyan.aqua.sega.ongeki.model.userdata.*; +import icu.samnyan.aqua.sega.ongeki.model.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt index 8875b07c..fb714719 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.ongeki.model.response.data -import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicDetail +import icu.samnyan.aqua.sega.ongeki.model.UserMusicDetail import lombok.AllArgsConstructor import lombok.Data import lombok.NoArgsConstructor diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/ZUserDataTest.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/ZUserDataTest.kt deleted file mode 100644 index 6e349e30..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/ZUserDataTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.ongeki.model.userdata - -import icu.samnyan.aqua.sega.util.jackson.BasicMapper -import kotlin.io.path.Path -import kotlin.io.path.writeText - -fun main(args: Array) { - val classes = listOf(UserActivity(), UserBoss(), UserCard(), UserChapter(), UserCharacter(), UserData(), UserDeck(), UserEventMusic(), UserEventPoint(), UserGeneralData(), UserItem(), UserKop(), UserLoginBonus(), UserMemoryChapter(), UserMissionPoint(), UserMusicDetail(), UserMusicItem(), UserOption(), UserPlaylog(), UserRival(), UserScenario(), UserStory(), UserTechCount(), UserTechEvent(), UserTradeItem(), UserTrainingRoom()) - val mapper = BasicMapper() - - // Json stringify all of them - var str = "" - classes.forEach { - str += mapper.write(it) + "\n" - } - Path("ogk-userdata.jsonl").writeText(str) -} \ No newline at end of file