From 98275ade59c813077a22f7a57277311bd377f5c0 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 16 Mar 2024 22:09:21 -0400 Subject: [PATCH] [O] Refactor chusan repos --- .../v2/ApiChuniV2GameDataController.java | 2 +- .../icu/samnyan/aqua/net/CardController.kt | 3 +- .../java/icu/samnyan/aqua/net/games/Chusan.kt | 7 +- .../java/icu/samnyan/aqua/net/games/Models.kt | 7 +- .../dao/gamedata/GameAvatarAccRepository.java | 16 -- .../dao/gamedata/GameCharacterRepository.java | 12 -- .../dao/gamedata/GameChargeRepository.java | 12 -- .../dao/gamedata/GameEventRepository.java | 16 -- .../dao/gamedata/GameFrameRepository.java | 16 -- .../dao/gamedata/GameGachaCardRepository.java | 17 -- .../dao/gamedata/GameGachaRepository.java | 12 -- .../GameLoginBonusPresetsRepository.java | 12 -- .../gamedata/GameLoginBonusRepository.java | 16 -- .../dao/gamedata/GameMapIconRepository.java | 16 -- .../dao/gamedata/GameMusicRepository.java | 16 -- .../dao/gamedata/GameNamePlateRepository.java | 16 -- .../gamedata/GameSystemVoiceRepository.java | 16 -- .../dao/gamedata/GameTrophyRepository.java | 16 -- .../ChusanUserLoginBonusRepository.java | 16 -- .../dao/userdata/UserActivityRepository.java | 22 -- .../UserCardPrintStateRepository.java | 20 -- .../dao/userdata/UserCharacterRepository.java | 27 --- .../dao/userdata/UserChargeRepository.java | 19 -- .../dao/userdata/UserCourseRepository.java | 23 --- .../dao/userdata/UserDataRepository.java | 17 -- .../dao/userdata/UserDuelRepository.java | 20 -- .../dao/userdata/UserGachaRepository.java | 19 -- .../userdata/UserGameOptionRepository.java | 19 -- .../dao/userdata/UserGeneralDataRepository.kt | 19 -- .../dao/userdata/UserItemRepository.java | 28 --- .../dao/userdata/UserMapAreaRepository.java | 21 -- .../userdata/UserMusicDetailRepository.java | 26 --- .../dao/userdata/UserPlaylogRepository.java | 21 -- .../impl/CMUpsertUserGachaHandler.java | 4 +- .../impl/CMUpsertUserPrintCancelHandler.java | 2 +- .../CMUpsertUserPrintSubtractHandler.java | 2 +- .../handler/impl/GetGameChargeHandler.java | 2 +- .../handler/impl/GetGameEventHandler.java | 2 +- .../handler/impl/GetGameGachaHandler.java | 2 +- .../impl/GetUserCardPrintErrorHandler.java | 2 +- .../samnyan/aqua/sega/chusan/model/Repos.kt | 188 ++++++++++++++++++ .../chusan/model/userdata/UserLoginBonus.java | 2 +- .../chusan/service/GameGachaCardService.java | 2 +- .../service/GameLoginBonusPresetService.java | 2 +- .../chusan/service/GameLoginBonusService.java | 2 +- .../sega/chusan/service/GameMusicService.java | 2 +- .../chusan/service/UserActivityService.java | 4 +- .../chusan/service/UserCharacterService.java | 2 +- .../chusan/service/UserChargeService.java | 2 +- .../chusan/service/UserCourseService.java | 2 +- .../sega/chusan/service/UserDataService.java | 2 +- .../sega/chusan/service/UserDuelService.java | 2 +- .../sega/chusan/service/UserGachaService.java | 2 +- .../chusan/service/UserGameOptionService.java | 6 +- .../service/UserGeneralDataService.java | 2 +- .../sega/chusan/service/UserItemService.java | 4 +- .../chusan/service/UserLoginBonusService.java | 2 +- .../chusan/service/UserMapAreaService.java | 6 +- .../service/UserMusicDetailService.java | 2 +- .../chusan/service/UserPlaylogService.java | 2 +- .../samnyan/aqua/sega/maimai2/model/Repos.kt | 23 --- .../ongeki/dao/userdata/UserDataRepository.kt | 3 - 62 files changed, 234 insertions(+), 591 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameCharacterRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameChargeRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameEventRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusPresetsRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMusicRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/ChusanUserLoginBonusRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserActivityRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCharacterRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserChargeRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCourseRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDuelRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGameOptionRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGeneralDataRepository.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserItemRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMapAreaRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMusicDetailRepository.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/Repos.kt diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java index f23663e3..7b0f6eb4 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.api.controller.sega.game.chuni.v2; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.*; +import icu.samnyan.aqua.sega.chusan.model.*; import icu.samnyan.aqua.sega.chusan.model.gamedata.Character; import icu.samnyan.aqua.sega.chusan.model.gamedata.*; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt index 5271aa6b..d09e8e8f 100644 --- a/src/main/java/icu/samnyan/aqua/net/CardController.kt +++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt @@ -7,6 +7,7 @@ import icu.samnyan.aqua.net.utils.AquaNetProps import icu.samnyan.aqua.net.games.GenericUserDataRepo import icu.samnyan.aqua.net.games.IGenericUserData import icu.samnyan.aqua.net.utils.SUCCESS +import icu.samnyan.aqua.sega.chusan.model.UserDataRepository import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.general.service.CardService @@ -144,7 +145,7 @@ suspend fun getSummaryFor(repo: GenericUserDataRepo<*>, card: Card): Map : JpaRepository { fun findByCard(card: Card): T? - + fun findByCard_ExtId(extId: Long): Optional @Query("select count(*) from #{#entityName} where playerRating > :rating") fun getRanking(rating: Int): Long } @@ -103,6 +107,7 @@ interface GenericUserDataRepo : JpaRepository { @NoRepositoryBean interface GenericPlaylogRepo : JpaRepository { fun findByUserCardExtId(extId: Long): List + fun findByUserCardExtId(extId: Long, page: Pageable): Page } abstract class GameApiController(name: String) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java deleted file mode 100644 index e965c6ea..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.AvatarAcc; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameAvatarAccRepository") -public interface GameAvatarAccRepository extends JpaRepository { - - Optional findById(int trophyId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameCharacterRepository.java deleted file mode 100644 index 8f936313..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameCharacterRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.Character; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameCharacterRepository") -public interface GameCharacterRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameChargeRepository.java deleted file mode 100644 index bef726e2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameChargeRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameCharge; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameChargeRepository") -public interface GameChargeRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameEventRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameEventRepository.java deleted file mode 100644 index 1f14bbe0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameEventRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameEvent; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameEventRepository") -public interface GameEventRepository extends JpaRepository { - - List findByEnable(boolean enable); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java deleted file mode 100644 index 7a09a9c1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.Frame; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameFrameRepository") -public interface GameFrameRepository extends JpaRepository { - - Optional findById(int trophyId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java deleted file mode 100644 index 1a1ef6c2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameGachaCardRepository") -public interface GameGachaCardRepository extends JpaRepository { - - List findAllByGachaId(int gacha_id); - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java deleted file mode 100644 index 378d7f87..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGacha; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameGachaRepository") -public interface GameGachaRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusPresetsRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusPresetsRepository.java deleted file mode 100644 index 0a24e1d6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusPresetsRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -public interface GameLoginBonusPresetsRepository extends JpaRepository { - @Query(value = "select * from chusan_game_login_bonus_preset where version = ?1 and is_enabled = ?2", nativeQuery = true) - List findLoginBonusPresets(int version, int isEnabled); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java deleted file mode 100644 index 7c388d38..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonus; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; -import java.util.Optional; - -public interface GameLoginBonusRepository extends JpaRepository { - @Query(value = "select * from chusan_game_login_bonus where version = ?1 and preset_id = ?2 order by need_login_day_count desc", nativeQuery = true) - List findGameLoginBonus(int version, int presetId); - - @Query(value = "select * from chusan_game_login_bonus where version = ?1 and preset_id = ?2 and need_login_day_count = ?3 limit 1", nativeQuery = true) - Optional findByRequiredDays(int version, int presetId, int requiredDays); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java deleted file mode 100644 index 74ecf1b5..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.MapIcon; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameMapIconRepository") -public interface GameMapIconRepository extends JpaRepository { - - Optional findById(int mapIconId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMusicRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMusicRepository.java deleted file mode 100644 index 4fe7ab05..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMusicRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.Music; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameMusicRepository") -public interface GameMusicRepository extends JpaRepository { - - Optional findByMusicId(int musicId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java deleted file mode 100644 index 122a633c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.NamePlate; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameNamePlateRepository") -public interface GameNamePlateRepository extends JpaRepository { - - Optional findById(int trophyId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java deleted file mode 100644 index a82c62e6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.SystemVoice; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameSystemVoiceRepository") -public interface GameSystemVoiceRepository extends JpaRepository { - - Optional findById(int trophyId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java deleted file mode 100644 index 76aef8af..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.gamedata; - -import icu.samnyan.aqua.sega.chusan.model.gamedata.Trophy; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanGameTrophyRepository") -public interface GameTrophyRepository extends JpaRepository { - - Optional findById(int trophyId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/ChusanUserLoginBonusRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/ChusanUserLoginBonusRepository.java deleted file mode 100644 index 53d4b3eb..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/ChusanUserLoginBonusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; -import java.util.Optional; - -public interface ChusanUserLoginBonusRepository extends JpaRepository{ - @Query(value = "select * from chusan_user_login_bonus where user = ?1 and version = ?2 and is_finished = ?3 order by last_update_date desc", nativeQuery = true) - List findAllLoginBonus(int user_id, int version, int is_finished); - - @Query(value = "select * from chusan_user_login_bonus where user = ?1 and version = ?2 and preset_id = ?3 limit 1", nativeQuery = true) - Optional findLoginBonus(int user_id, int version, int preset_id); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserActivityRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserActivityRepository.java deleted file mode 100644 index 14da4164..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserActivityRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserActivity; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserActivityRepository") -public interface UserActivityRepository extends JpaRepository { - - Optional findTopByUserAndActivityIdAndKindOrderByIdDesc(UserData user, int activityId, int kind); - - List findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long extId, int kind); - - List findAllByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java deleted file mode 100644 index a5e9ab5f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserCardPrintStateRepository") -public interface UserCardPrintStateRepository extends JpaRepository { - List findByUser_Card_ExtId(Long extId); - - List findByUser_Card_ExtIdAndHasCompleted(Long extId, boolean hasCompleted); - - List findByUserAndGachaIdAndHasCompleted(UserData userData, int gachaId, boolean hasCompleted); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCharacterRepository.java deleted file mode 100644 index 6f446da1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCharacterRepository.java +++ /dev/null @@ -1,27 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserCharacterRepository") -public interface UserCharacterRepository extends JpaRepository { - - Page findByUser_Card_ExtId(Long extId, Pageable pageable); - - List findByUser_Card_ExtId(Long extId); - - Optional findTopByUserAndCharacterIdOrderByIdDesc(UserData user, int characterId); - - Optional findByUser_Card_ExtIdAndCharacterId(Long extId, int characterId); - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserChargeRepository.java deleted file mode 100644 index a0930bf3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserChargeRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserChargeRepository") -public interface UserChargeRepository extends JpaRepository { - List findByUser_Card_ExtId(Long extId); - - Optional findByUserAndChargeId(UserData extId, int chargeId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCourseRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCourseRepository.java deleted file mode 100644 index 05a79f41..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCourseRepository.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCourse; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserCourseRepository") -public interface UserCourseRepository extends JpaRepository { - Optional findTopByUserAndCourseIdOrderByIdDesc(UserData user, int courseId); - - Page findByUser_Card_ExtId(Long extId, Pageable page); - - List findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java deleted file mode 100644 index 64205442..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.net.games.GenericUserDataRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserDataRepository") -public interface UserDataRepository extends GenericUserDataRepo { - - Optional findByCard_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDuelRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDuelRepository.java deleted file mode 100644 index 2e3c9357..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDuelRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserDuel; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserDuelRepository") -public interface UserDuelRepository extends JpaRepository { - - Optional findTopByUserAndDuelIdOrderByIdDesc(UserData user, int duelId); - - List findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java deleted file mode 100644 index d7673fcc..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserGachaRepository") -public interface UserGachaRepository extends JpaRepository { - List findByUser_Card_ExtId(Long extId); - - Optional findByUserAndGachaId(UserData extId, int gachaId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGameOptionRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGameOptionRepository.java deleted file mode 100644 index f526ea3b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGameOptionRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserGameOptionRepository") -public interface UserGameOptionRepository extends JpaRepository { - - Optional findByUser(UserData user); - - Optional findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGeneralDataRepository.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGeneralDataRepository.kt deleted file mode 100644 index e0080ca8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGeneralDataRepository.kt +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData -import org.springframework.data.jpa.repository.JpaRepository -import org.springframework.stereotype.Repository -import java.util.* - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserGeneralDataRepository") -interface UserGeneralDataRepository : JpaRepository { - fun findByUserAndPropertyKey(user: UserData, key: String): Optional - - fun findByUser_Card_ExtIdAndPropertyKey(extId: Long, key: String): Optional - - fun findByUser_Card_ExtId(extId: Long): List -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserItemRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserItemRepository.java deleted file mode 100644 index b12e2661..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserItemRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserItemRepository") -public interface UserItemRepository extends JpaRepository { - - Optional findTopByUserAndItemIdAndItemKindOrderByIdDesc(UserData user, int itemId, int itemKind); - - Page findAllByUser_Card_ExtIdAndItemKind(Long extId, int itemKind, Pageable pageable); - - List findAllByUser_Card_ExtId(Long extId); - - List findAllByUser_Card_ExtIdAndItemKind(Long extId, int itemKind); - - Page findByUser_Card_ExtId(Long extId, Pageable pageable); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMapAreaRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMapAreaRepository.java deleted file mode 100644 index 5a9b8d67..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMapAreaRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserMapArea; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserMapAreaRepository extends JpaRepository { - List findAllByUser(UserData user); - - List findAllByUser_Card_ExtId(Long extId); - - Optional findTopByUserAndMapAreaIdOrderByIdDesc(UserData user, int mapAreaId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMusicDetailRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMusicDetailRepository.java deleted file mode 100644 index 7cda812e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserMusicDetailRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserMusicDetailRepository") -public interface UserMusicDetailRepository extends JpaRepository { - - Optional findTopByUserAndMusicIdAndLevelOrderByIdDesc(UserData user, int musicId, int level); - - List findByUser_Card_ExtId(Long extId); - - List findByUser_Card_ExtIdAndMusicId(Long extId, int musicId); - - Page findByUser_Card_ExtId(Long extId, Pageable page); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java deleted file mode 100644 index 65fbaa9b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.dao.userdata; - -import icu.samnyan.aqua.net.games.GenericPlaylogRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChusanUserPlaylogRepository") -public interface UserPlaylogRepository extends GenericPlaylogRepo { - List findByUser_Card_ExtIdAndLevelNot(Long extId, int levelNot, Pageable page); - - Page findByUserCardExtId(Long extId, Pageable page); - - List findByUser_Card_ExtIdAndMusicIdAndLevel(Long extId, int musicId, int level); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java index fe47d02a..20bec818 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java @@ -1,8 +1,8 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGachaRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCardPrintStateRepository; +import icu.samnyan.aqua.sega.chusan.model.UserGachaRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.model.request.UpsertUserGacha; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java index 1b08db5d..5185da15 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java index 55cb30f7..4c131e9e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java index 6b550f81..8e6330de 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameChargeRepository; +import icu.samnyan.aqua.sega.chusan.model.GameChargeRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameCharge; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java index 19ddbfa7..a87baed7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameEventRepository; +import icu.samnyan.aqua.sega.chusan.model.GameEventRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameEvent; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java index b90ee44c..fd7f5f81 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameGachaRepository; +import icu.samnyan.aqua.sega.chusan.model.GameGachaRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGacha; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java index 69b7ac9d..3dd494f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/Repos.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Repos.kt new file mode 100644 index 00000000..9de94285 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Repos.kt @@ -0,0 +1,188 @@ +@file:Suppress("FunctionName") + +package icu.samnyan.aqua.sega.chusan.model + +import icu.samnyan.aqua.net.games.GenericPlaylogRepo +import icu.samnyan.aqua.net.games.GenericUserDataRepo +import icu.samnyan.aqua.sega.chusan.model.gamedata.* +import icu.samnyan.aqua.sega.chusan.model.userdata.* +import org.springframework.data.domain.Page +import org.springframework.data.domain.Pageable +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.NoRepositoryBean +import org.springframework.stereotype.Repository +import java.util.* + + +@NoRepositoryBean +interface UserLinked : JpaRepository { + fun findByUser_Card_ExtId(extId: Long): List + fun findSingleByUser_Card_ExtId(extId: Long): Optional + fun findByUser_Card_ExtId(extId: Long, pageable: Pageable): Page + fun findByUser(user: UserData): List + fun findSingleByUser(user: UserData): Optional +} + + +interface ChusanUserLoginBonusRepository : JpaRepository { + @Query( + value = "select * from chusan_user_login_bonus where user = ?1 and version = ?2 and is_finished = ?3 order by last_update_date desc", + nativeQuery = true + ) + fun findAllLoginBonus(userId: Int, version: Int, isFinished: Int): List + + @Query( + value = "select * from chusan_user_login_bonus where user = ?1 and version = ?2 and preset_id = ?3 limit 1", + nativeQuery = true + ) + fun findLoginBonus(userId: Int, version: Int, presetId: Int): Optional +} + +@Repository("ChusanUserActivityRepository") +interface UserActivityRepository : UserLinked { + fun findTopByUserAndActivityIdAndKindOrderByIdDesc(user: UserData, activityId: Int, kind: Int): Optional + + fun findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(extId: Long, kind: Int): List +} + +@Repository("ChusanUserCardPrintStateRepository") +interface UserCardPrintStateRepository : UserLinked { + fun findByUser_Card_ExtIdAndHasCompleted(extId: Long, hasCompleted: Boolean): List + + fun findByUserAndGachaIdAndHasCompleted(userData: UserData, gachaId: Int, hasCompleted: Boolean): List +} + +@Repository("ChusanUserCharacterRepository") +interface UserCharacterRepository : UserLinked { + fun findTopByUserAndCharacterIdOrderByIdDesc(user: UserData, characterId: Int): Optional +} + +@Repository("ChusanUserChargeRepository") +interface UserChargeRepository : UserLinked { + fun findByUserAndChargeId(extId: UserData, chargeId: Int): Optional +} + +@Repository("ChusanUserCourseRepository") +interface UserCourseRepository : UserLinked { + fun findTopByUserAndCourseIdOrderByIdDesc(user: UserData, courseId: Int): Optional +} + +@Repository("ChusanUserDataRepository") +interface UserDataRepository : GenericUserDataRepo + +@Repository("ChusanUserDuelRepository") +interface UserDuelRepository : UserLinked { + fun findTopByUserAndDuelIdOrderByIdDesc(user: UserData, duelId: Int): Optional +} + +@Repository("ChusanUserGachaRepository") +interface UserGachaRepository : UserLinked { + fun findByUserAndGachaId(extId: UserData, gachaId: Int): Optional +} + +@Repository("ChusanUserGameOptionRepository") +interface UserGameOptionRepository : UserLinked + +@Repository("ChusanUserGeneralDataRepository") +interface UserGeneralDataRepository : UserLinked { + fun findByUserAndPropertyKey(user: UserData, key: String): Optional + + fun findByUser_Card_ExtIdAndPropertyKey(extId: Long, key: String): Optional +} + +@Repository("ChusanUserItemRepository") +interface UserItemRepository : UserLinked { + fun findTopByUserAndItemIdAndItemKindOrderByIdDesc( + user: UserData, + itemId: Int, + itemKind: Int + ): Optional + + fun findAllByUser_Card_ExtIdAndItemKind(extId: Long, itemKind: Int, pageable: Pageable): Page + + fun findAllByUser_Card_ExtIdAndItemKind(extId: Long, itemKind: Int): List +} + +@Repository +interface UserMapAreaRepository : UserLinked { + fun findTopByUserAndMapAreaIdOrderByIdDesc(user: UserData, mapAreaId: Int): Optional +} + +@Repository("ChusanUserMusicDetailRepository") +interface UserMusicDetailRepository : UserLinked { + fun findTopByUserAndMusicIdAndLevelOrderByIdDesc(user: UserData, musicId: Int, level: Int): Optional + + fun findByUser_Card_ExtIdAndMusicId(extId: Long, musicId: Int): List +} + +@Repository("ChusanUserPlaylogRepository") +interface UserPlaylogRepository : GenericPlaylogRepo { + fun findByUser_Card_ExtIdAndLevelNot(extId: Long, levelNot: Int, page: Pageable): List + + fun findByUser_Card_ExtIdAndMusicIdAndLevel(extId: Long, musicId: Int, level: Int): List +} + +@Repository("ChusanGameAvatarAccRepository") +interface GameAvatarAccRepository : JpaRepository + +@Repository("ChusanGameCharacterRepository") +interface GameCharacterRepository : JpaRepository + +@Repository("ChusanGameChargeRepository") +interface GameChargeRepository : JpaRepository + +@Repository("ChusanGameEventRepository") +interface GameEventRepository : JpaRepository { + fun findByEnable(enable: Boolean): List +} + +@Repository("ChusanGameFrameRepository") +interface GameFrameRepository : JpaRepository + +@Repository("ChusanGameGachaCardRepository") +interface GameGachaCardRepository : JpaRepository { + fun findAllByGachaId(gachaId: Int): List +} + +@Repository("ChusanGameGachaRepository") +interface GameGachaRepository : JpaRepository + +interface GameLoginBonusPresetsRepository : JpaRepository { + @Query( + value = "select * from chusan_game_login_bonus_preset where version = ?1 and is_enabled = ?2", + nativeQuery = true + ) + fun findLoginBonusPresets(version: Int, isEnabled: Int): List +} + +interface GameLoginBonusRepository : JpaRepository { + @Query( + value = "select * from chusan_game_login_bonus where version = ?1 and preset_id = ?2 order by need_login_day_count desc", + nativeQuery = true + ) + fun findGameLoginBonus(version: Int, presetId: Int): List + + @Query( + value = "select * from chusan_game_login_bonus where version = ?1 and preset_id = ?2 and need_login_day_count = ?3 limit 1", + nativeQuery = true + ) + fun findByRequiredDays(version: Int, presetId: Int, requiredDays: Int): Optional +} + +@Repository("ChusanGameMapIconRepository") +interface GameMapIconRepository : JpaRepository + +@Repository("ChusanGameMusicRepository") +interface GameMusicRepository : JpaRepository { + fun findByMusicId(musicId: Int): Optional +} + +@Repository("ChusanGameNamePlateRepository") +interface GameNamePlateRepository : JpaRepository + +@Repository("ChusanGameSystemVoiceRepository") +interface GameSystemVoiceRepository : JpaRepository + +@Repository("ChusanGameTrophyRepository") +interface GameTrophyRepository : JpaRepository \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java index 93fba549..b5d6ae18 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java @@ -18,7 +18,7 @@ public class UserLoginBonus implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @JsonIgnore - private int id; + private long id; private int version; private int user; private int presetId; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameGachaCardService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameGachaCardService.java index 6bb10273..19cb23b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameGachaCardService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameGachaCardService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameGachaCardRepository; +import icu.samnyan.aqua.sega.chusan.model.GameGachaCardRepository; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java index 8db158bd..8047c533 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameLoginBonusPresetsRepository; +import icu.samnyan.aqua.sega.chusan.model.GameLoginBonusPresetsRepository; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java index 0e1c51d4..13514884 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameLoginBonusRepository; +import icu.samnyan.aqua.sega.chusan.model.GameLoginBonusRepository; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameMusicService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameMusicService.java index 230f32f1..7e3db31f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameMusicService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameMusicService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameMusicRepository; +import icu.samnyan.aqua.sega.chusan.model.GameMusicRepository; import icu.samnyan.aqua.sega.chusan.model.gamedata.Music; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java index 5e145043..956143e9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserActivityRepository; +import icu.samnyan.aqua.sega.chusan.model.UserActivityRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserActivity; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +39,6 @@ public class UserActivityService { } public List getByUserId(String userId) { - return userActivityRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); + return userActivityRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java index fe573740..8daefe7c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCharacterRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCharacterRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java index 427eda9b..c712c540 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserChargeRepository; +import icu.samnyan.aqua.sega.chusan.model.UserChargeRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java index 006a7159..53ed228e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCourseRepository; +import icu.samnyan.aqua.sega.chusan.model.UserCourseRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCourse; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDataService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDataService.java index e946f5be..2b5a62b7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDataService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDataService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserDataRepository; +import icu.samnyan.aqua.sega.chusan.model.UserDataRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.general.model.Card; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java index b9d53ba9..fd012dae 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserDuelRepository; +import icu.samnyan.aqua.sega.chusan.model.UserDuelRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserDuel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java index 05efd73a..b1ea2ce8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGachaRepository; +import icu.samnyan.aqua.sega.chusan.model.UserGachaRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java index 00d9ec10..6ce8ff0d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGameOptionRepository; +import icu.samnyan.aqua.sega.chusan.model.UserGameOptionRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption; import org.springframework.beans.factory.annotation.Autowired; @@ -26,10 +26,10 @@ public class UserGameOptionService { } public Optional getByUser(UserData user) { - return userGameOptionRepository.findByUser(user); + return userGameOptionRepository.findSingleByUser(user); } public Optional getByUserId(String userId) { - return userGameOptionRepository.findByUser_Card_ExtId(Long.parseLong(userId)); + return userGameOptionRepository.findSingleByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java index f6ac9394..c6ed77e0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGeneralDataRepository; +import icu.samnyan.aqua.sega.chusan.model.UserGeneralDataRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java index cdc5c7f3..b5f513ec 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserItemRepository; +import icu.samnyan.aqua.sega.chusan.model.UserItemRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +34,7 @@ public class UserItemService { } public List getByUserId(String userId) { - List userItemList = userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); + List userItemList = userItemRepository.findByUser_Card_ExtId(Long.parseLong(userId)); userItemList.sort(Comparator.comparingInt(UserItem::getItemId)); return userItemList; } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java index 432601c7..217d3235 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.ChusanUserLoginBonusRepository; +import icu.samnyan.aqua.sega.chusan.model.ChusanUserLoginBonusRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java index 3e77418e..3efe69c4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserMapAreaRepository; +import icu.samnyan.aqua.sega.chusan.model.UserMapAreaRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserMapArea; import org.springframework.beans.factory.annotation.Autowired; @@ -31,11 +31,11 @@ public class UserMapAreaService { } public List getByUser(UserData user) { - return userMapRepository.findAllByUser(user); + return userMapRepository.findByUser(user); } public List getByUserId(String userId) { - return userMapRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); + return userMapRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public Optional getByUserAndMapAreaId(UserData user, int mapId) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java index 6a16f866..cc8daa21 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserMusicDetailRepository; +import icu.samnyan.aqua.sega.chusan.model.UserMusicDetailRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java index 663d2528..c8e33b4d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; -import icu.samnyan.aqua.sega.chusan.dao.userdata.UserPlaylogRepository; +import icu.samnyan.aqua.sega.chusan.model.UserPlaylogRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt index d418f04a..03480672 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt @@ -13,7 +13,6 @@ import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.repository.NoRepositoryBean -import org.springframework.stereotype.Repository import org.springframework.transaction.annotation.Transactional import java.util.* @@ -27,35 +26,28 @@ interface UserLinked: JpaRepository { fun deleteByUser(user: UserDetail) } -@Repository interface Mai2MapEncountNpcRepo : UserLinked -@Repository interface Mai2UserActRepo : UserLinked { fun findByUserAndKindAndActivityId(user: UserDetail, kind: Int, id: Int): Optional fun findByUser_Card_ExtIdAndKind(userId: Long, kind: Int): List } -@Repository interface Mai2UserCardRepo : UserLinked { fun findByUserAndCardId(user: UserDetail, cardId: Int): Optional } -@Repository interface Mai2UserCharacterRepo : UserLinked { fun findByUserAndCharacterId(user: UserDetail, characterId: Int): Optional } -@Repository interface Mai2UserChargeRepo : UserLinked -@Repository interface Mai2UserCourseRepo : UserLinked { fun findByUserAndCourseId(user: UserDetail, courseId: Int): Optional } -@Repository interface Mai2UserDataRepo : GenericUserDataRepo { fun findByCardExtId(userId: Long): Optional @@ -63,73 +55,58 @@ interface Mai2UserDataRepo : GenericUserDataRepo { fun deleteByCard(card: Card) } -@Repository interface Mai2UserExtendRepo : UserLinked -@Repository interface Mai2UserFavoriteRepo : UserLinked { fun findByUserAndItemKind(user: UserDetail, kind: Int): Optional fun findByUserIdAndItemKind(userId: Long, kind: Int): List } -@Repository interface Mai2UserFriendSeasonRankingRepo : UserLinked { fun findByUserAndSeasonId(user: UserDetail, seasonId: Int): Optional } -@Repository interface Mai2UserGeneralDataRepo : UserLinked { fun findByUserAndPropertyKey(user: UserDetail, key: String): Optional fun findByUser_Card_ExtIdAndPropertyKey(userId: Long, key: String): Optional } -@Repository interface Mai2UserItemRepo : UserLinked { fun findByUserAndItemKindAndItemId(user: UserDetail, itemKind: Int, itemId: Int): Optional fun findByUser_Card_ExtIdAndItemKind(userId: Long, kind: Int, page: Pageable): Page } -@Repository interface Mai2UserLoginBonusRepo : UserLinked { fun findByUserAndBonusId(user: UserDetail, bonusId: Int): Optional } -@Repository interface Mai2UserMapRepo : UserLinked { fun findByUserAndMapId(user: UserDetail, mapId: Int): Optional } -@Repository interface Mai2UserMusicDetailRepo : UserLinked { fun findByUser_Card_ExtIdAndMusicId(userId: Long, id: Int): List fun findByUserAndMusicIdAndLevel(user: UserDetail, musicId: Int, level: Int): Optional } -@Repository interface Mai2UserOptionRepo : UserLinked -@Repository interface Mai2UserPlaylogRepo : GenericPlaylogRepo, UserLinked { fun findByUser_Card_ExtIdAndMusicIdAndLevel(userId: Long, musicId: Int, level: Int): List } -@Repository interface Mai2UserPrintDetailRepo : JpaRepository -@Repository interface Mai2UserUdemaeRepo : UserLinked -@Repository interface Mai2GameChargeRepo : JpaRepository -@Repository interface Mai2GameEventRepo : JpaRepository { fun findByTypeAndEnable(type: Int, enable: Boolean): List } -@Repository interface Mai2GameSellingCardRepo : JpaRepository \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt index 7736d4cd..bea50ec3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt @@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData import org.springframework.stereotype.Repository import org.springframework.transaction.annotation.Transactional -import java.util.* /** * @author samnyan (privateamusement@protonmail.com) @@ -14,8 +13,6 @@ import java.util.* interface UserDataRepository : GenericUserDataRepo { fun findByCard_ExtIdIn(userIds: Collection): List - fun findByCard_ExtId(aimeId: Long): Optional - @Transactional fun deleteByCard(card: Card) }