diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java index 0787c708..a1f9ed6b 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java @@ -87,41 +87,41 @@ public class ApiOngekiPlayerDataController { } @GetMapping("profile") - public ProfileResp getProfile(@RequestParam Integer aimeId) { + public ProfileResp getProfile(@RequestParam long aimeId) { return mapper.convert(userDataRepository.findByCard_ExtId(aimeId).orElseThrow(), new TypeReference<>() { }); } @PostMapping("profile/userName") public UserData updateName(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setUserName((String) request.get("userName")); return userDataRepository.save(profile); } @PostMapping("profile/plate") public UserData updatePlate(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setNameplateId((Integer) request.get("nameplateId")); return userDataRepository.save(profile); } @PostMapping("profile/trophy") public UserData updateTrophy(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setTrophyId((Integer) request.get("trophyId")); return userDataRepository.save(profile); } @PostMapping("profile/card") public UserData updateCard(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setCardId((Integer) request.get("cardId")); return userDataRepository.save(profile); } @GetMapping("card") - public ReducedPageResponse getCard(@RequestParam Integer aimeId, + public ReducedPageResponse getCard(@RequestParam long aimeId, @RequestParam(required = false, defaultValue = "0") int page, @RequestParam(required = false, defaultValue = "10") int size) { Page cards = userCardRepository.findByUser_Card_ExtId(aimeId, PageRequest.of(page, size, Sort.Direction.DESC, "id")); @@ -136,7 +136,7 @@ public class ApiOngekiPlayerDataController { */ @PostMapping("card") public ResponseEntity insertCard(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); Integer cardId = (Integer) request.get("cardId"); Optional userCardOptional = userCardRepository.findByUserAndCardId(profile, cardId); if (userCardOptional.isPresent()) { @@ -174,7 +174,7 @@ public class ApiOngekiPlayerDataController { } @PostMapping("card/{cardId}/kaika") - public ResponseEntity kaikaCard(@RequestParam Integer aimeId, @PathVariable Integer cardId) { + public ResponseEntity kaikaCard(@RequestParam long aimeId, @PathVariable Integer cardId) { Optional userCardOptional = userCardRepository.findByUser_Card_ExtIdAndCardId(aimeId, cardId); if (userCardOptional.isEmpty()) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new MessageResponse("Card not found.")); @@ -192,7 +192,7 @@ public class ApiOngekiPlayerDataController { } @PostMapping("card/{cardId}/choKaika") - public ResponseEntity choKaikaCard(@RequestParam Integer aimeId, @PathVariable Integer cardId) { + public ResponseEntity choKaikaCard(@RequestParam long aimeId, @PathVariable Integer cardId) { Optional userCardOptional = userCardRepository.findByUser_Card_ExtIdAndCardId(aimeId, cardId); if (userCardOptional.isEmpty()) { return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new MessageResponse("Card not found.")); @@ -224,7 +224,7 @@ public class ApiOngekiPlayerDataController { } @GetMapping("character") - public ReducedPageResponse getCharacter(@RequestParam Integer aimeId, + public ReducedPageResponse getCharacter(@RequestParam long aimeId, @RequestParam(required = false, defaultValue = "0") int page, @RequestParam(required = false, defaultValue = "10") int size) { Page characters = userCharacterRepository.findByUser_Card_ExtId(aimeId, PageRequest.of(page, size)); @@ -232,13 +232,13 @@ public class ApiOngekiPlayerDataController { } @GetMapping("activity") - public List getActivities(@RequestParam Integer aimeId) { + public List getActivities(@RequestParam long aimeId) { return userActivityRepository.findByUser_Card_ExtId(aimeId); } @PostMapping("activity") public ResponseEntity updateActivities(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); Integer activityId = (Integer) request.get("id"); Integer kind = (Integer) request.get("kind"); Integer sortNumber = (Integer) request.get("sortNumber"); @@ -266,7 +266,7 @@ public class ApiOngekiPlayerDataController { } @GetMapping("item") - public ReducedPageResponse getItem(@RequestParam Integer aimeId, + public ReducedPageResponse getItem(@RequestParam long aimeId, @RequestParam(required = false, defaultValue = "0") int page, @RequestParam(required = false, defaultValue = "10") int size) { Page items = userItemRepository.findByUser_Card_ExtId(aimeId, PageRequest.of(page, size)); @@ -275,7 +275,7 @@ public class ApiOngekiPlayerDataController { @PostMapping("item") public ResponseEntity updateItem(@RequestBody Map request) { - UserData profile = userDataRepository.findByCard_ExtId((Integer) request.get("aimeId")).orElseThrow(); + UserData profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); Integer itemKind = (Integer) request.get("itemKind"); Integer itemId = (Integer) request.get("itemId"); int stock = 1; @@ -299,7 +299,7 @@ public class ApiOngekiPlayerDataController { } @GetMapping("recent") - public ReducedPageResponse getRecent(@RequestParam Integer aimeId, + public ReducedPageResponse getRecent(@RequestParam long aimeId, @RequestParam(required = false, defaultValue = "0") int page, @RequestParam(required = false, defaultValue = "10") int size) { Page playlogs = userPlaylogRepository.findByUser_Card_ExtId(aimeId, PageRequest.of(page, size, Sort.Direction.DESC, "id")); @@ -308,29 +308,29 @@ public class ApiOngekiPlayerDataController { } @GetMapping("song/{id}") - public List getSongDetail(@RequestParam Integer aimeId, @PathVariable int id) { + public List getSongDetail(@RequestParam long aimeId, @PathVariable int id) { return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(aimeId, id); } @GetMapping("song/{id}/{level}") - public List getLevelPlaylog(@RequestParam Integer aimeId, @PathVariable int id, @PathVariable int level) { + public List getLevelPlaylog(@RequestParam long aimeId, @PathVariable int id, @PathVariable int level) { return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(aimeId, id, level); } @GetMapping("options") - public UserOption getOptions(@RequestParam Integer aimeId) { + public UserOption getOptions(@RequestParam long aimeId) { return userOptionRepository.findByUser_Card_ExtId(aimeId).orElseThrow(); } @GetMapping("general") - public ResponseEntity getGeneralData(@RequestParam Integer aimeId, @RequestParam String key) { + public ResponseEntity getGeneralData(@RequestParam long aimeId, @RequestParam String key) { Optional userGeneralDataOptional = userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(aimeId, key); return userGeneralDataOptional.>map(ResponseEntity::ok) .orElseGet(() -> ResponseEntity.status(HttpStatus.NOT_FOUND).body(new MessageResponse("User or value not found."))); } @GetMapping("export") - public ResponseEntity exportAllUserData(@RequestParam Integer aimeId) { + public ResponseEntity exportAllUserData(@RequestParam long aimeId) { OngekiDataExport data = new OngekiDataExport(); try { data.setGameId("SDDT"); diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserActivityRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserActivityRepository.java index c3c9c6c9..e04c90d0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserActivityRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserActivityRepository.java @@ -16,7 +16,7 @@ public interface UserActivityRepository extends JpaRepository findTopByUserAndActivityIdAndKindOrderByIdDesc(UserData user, int activityId, int kind); - List findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(int extId, int kind); + List findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long extId, int kind); - List findAllByUser_Card_ExtId(int extId); + List findAllByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java index 05bf5263..d58c0f55 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java @@ -16,12 +16,12 @@ import java.util.Optional; @Repository public interface UserCharacterRepository extends JpaRepository { - Page findByUser_Card_ExtId(int extId, Pageable pageable); + Page findByUser_Card_ExtId(Long extId, Pageable pageable); - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); Optional findTopByUserAndCharacterIdOrderByIdDesc(UserData user, int characterId); - Optional findByUser_Card_ExtIdAndCharacterId(int extId, int characterId); + Optional findByUser_Card_ExtIdAndCharacterId(Long extId, int characterId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java index 640bd67c..883d6bf1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java @@ -13,7 +13,7 @@ import java.util.Optional; */ @Repository public interface UserChargeRepository extends JpaRepository { - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); Optional findByUserAndChargeId(UserData extId, int chargeId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java index bb472cac..b1b6da5a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java @@ -17,7 +17,7 @@ import java.util.Optional; public interface UserCourseRepository extends JpaRepository { Optional findTopByUserAndCourseIdOrderByIdDesc(UserData user, int courseId); - Page findByUser_Card_ExtId(int extId, Pageable page); + Page findByUser_Card_ExtId(Long extId, Pageable page); - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java index 3abbd438..2db81cb6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java @@ -15,5 +15,5 @@ public interface UserDataExRepository extends JpaRepository { Optional findByUser(UserData user); - Optional findByUser_Card_ExtId(int extId); + Optional findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataRepository.java index 0ef17fe8..76095442 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataRepository.java @@ -15,5 +15,5 @@ public interface UserDataRepository extends JpaRepository { Optional findByCard(Card card); - Optional findByCard_ExtId(int extId); + Optional findByCard_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDuelRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDuelRepository.java index a695e9a2..342cae6c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDuelRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDuelRepository.java @@ -16,5 +16,5 @@ public interface UserDuelRepository extends JpaRepository { Optional findTopByUserAndDuelIdOrderByIdDesc(UserData user, int duelId); - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java index 668846ca..43c16117 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java @@ -14,5 +14,5 @@ import java.util.Optional; public interface UserGameOptionExRepository extends JpaRepository { Optional findByUser(UserData user); - Optional findByUser_Card_ExtId(int extId); + Optional findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionRepository.java index 349e14f7..e895a741 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionRepository.java @@ -15,5 +15,5 @@ public interface UserGameOptionRepository extends JpaRepository findByUser(UserData user); - Optional findByUser_Card_ExtId(int extId); + Optional findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java index 683c2d7b..ab3450ff 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java @@ -15,6 +15,6 @@ public interface UserGeneralDataRepository extends JpaRepository findByUserAndPropertyKey(UserData user, String key); - Optional findByUser_Card_ExtIdAndPropertyKey(int extId, String key); + Optional findByUser_Card_ExtIdAndPropertyKey(Long extId, String key); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserItemRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserItemRepository.java index 77bac3f7..d51aa237 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserItemRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserItemRepository.java @@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.chunithm.dao.userdata; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserItem; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -19,9 +18,9 @@ public interface UserItemRepository extends JpaRepository { Optional findTopByUserAndItemIdAndItemKindOrderByIdDesc(UserData user, int itemId, int itemKind); - Page findAllByUser_Card_ExtIdAndItemKind(int extId, int itemKind, Pageable pageable); + Page findAllByUser_Card_ExtIdAndItemKind(Long extId, int itemKind, Pageable pageable); - List findAllByUser_Card_ExtId(int extId); + List findAllByUser_Card_ExtId(Long extId); - Page findByUser_Card_ExtId(int extId, Pageable pageable); + Page findByUser_Card_ExtId(Long extId, Pageable pageable); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMapRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMapRepository.java index cb84c269..43660cb2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMapRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMapRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; public interface UserMapRepository extends JpaRepository { List findAllByUser(UserData user); - List findAllByUser_Card_ExtId(int extId); + List findAllByUser_Card_ExtId(Long extId); Optional findTopByUserAndMapIdOrderByIdDesc(UserData user, int mapId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMusicDetailRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMusicDetailRepository.java index a9978ad5..245f5121 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMusicDetailRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMusicDetailRepository.java @@ -18,9 +18,9 @@ public interface UserMusicDetailRepository extends JpaRepository findTopByUserAndMusicIdAndLevelOrderByIdDesc(UserData user, int musicId, int level); - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); - List findByUser_Card_ExtIdAndMusicId(int extId, int musicId); + List findByUser_Card_ExtIdAndMusicId(Long extId, int musicId); - Page findByUser_Card_ExtId(int extId, Pageable page); + Page findByUser_Card_ExtId(Long extId, Pageable page); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java index c8c89d42..3317bba7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java @@ -13,11 +13,11 @@ import java.util.List; */ @Repository public interface UserPlaylogRepository extends JpaRepository { - List findByUser_Card_ExtIdAndLevelNot(int extId, int levelNot, Pageable page); + List findByUser_Card_ExtIdAndLevelNot(Long extId, int levelNot, Pageable page); - Page findByUser_Card_ExtId(int extId, Pageable page); + Page findByUser_Card_ExtId(Long extId, Pageable page); - List findByUser_Card_ExtIdAndMusicIdAndLevel(int extId, int musicId, int level); + List findByUser_Card_ExtIdAndMusicIdAndLevel(Long extId, int musicId, int level); - List findByUser_Card_ExtId(int extId); + List findByUser_Card_ExtId(Long extId); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataHandler.java index c3007b42..4e60981d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataHandler.java @@ -3,14 +3,13 @@ package icu.samnyan.aqua.sega.chunithm.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chunithm.handler.BaseHandler; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.general.service.ClientSettingService; import icu.samnyan.aqua.sega.chunithm.service.UserDataService; +import icu.samnyan.aqua.sega.general.service.ClientSettingService; import icu.samnyan.aqua.sega.util.VersionUtil; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.LinkedHashMap; @@ -33,23 +32,13 @@ public class GetUserDataHandler implements BaseHandler { private final UserDataService userDataService; - private final boolean overwriteVersion; - private final String romVersion; - private final String dataVersion; - @Autowired public GetUserDataHandler(StringMapper mapper, - ClientSettingService clientSettingService, UserDataService userDataService, - @Value("${game.chunithm.overwrite-version}") boolean overwriteVersion, - @Value("${game.chunithm.rom-version}") String romVersion, - @Value("${game.chunithm.data-version}") String dataVersion + ClientSettingService clientSettingService, UserDataService userDataService ) { this.mapper = mapper; this.clientSettingService = clientSettingService; this.userDataService = userDataService; - this.overwriteVersion = overwriteVersion; - this.romVersion = romVersion; - this.dataVersion = dataVersion; } @Override diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserPreviewHandler.java index 6eb4ce10..6150e72c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserPreviewHandler.java @@ -6,16 +6,15 @@ import icu.samnyan.aqua.sega.chunithm.model.response.GetUserPreviewResp; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGameOption; -import icu.samnyan.aqua.sega.general.service.ClientSettingService; import icu.samnyan.aqua.sega.chunithm.service.UserCharacterService; import icu.samnyan.aqua.sega.chunithm.service.UserDataService; import icu.samnyan.aqua.sega.chunithm.service.UserGameOptionService; +import icu.samnyan.aqua.sega.general.service.ClientSettingService; import icu.samnyan.aqua.sega.util.VersionUtil; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Map; @@ -43,27 +42,17 @@ public class GetUserPreviewHandler implements BaseHandler { private final UserCharacterService userCharacterService; private final UserGameOptionService userGameOptionService; - private final boolean overwriteVersion; - private final String romVersion; - private final String dataVersion; - @Autowired public GetUserPreviewHandler(StringMapper mapper, ClientSettingService clientSettingService, UserDataService userDataService, UserCharacterService userCharacterService, - UserGameOptionService userGameOptionService, - @Value("${game.chunithm.overwrite-version}") boolean overwriteVersion, - @Value("${game.chunithm.rom-version}") String romVersion, - @Value("${game.chunithm.data-version}") String dataVersion + UserGameOptionService userGameOptionService ) { this.mapper = mapper; this.clientSettingService = clientSettingService; this.userDataService = userDataService; this.userCharacterService = userCharacterService; this.userGameOptionService = userGameOptionService; - this.overwriteVersion = overwriteVersion; - this.romVersion = romVersion; - this.dataVersion = dataVersion; } @Override @@ -101,10 +90,6 @@ public class GetUserPreviewHandler implements BaseHandler { resp.setLastDataVersion(user.getLastDataVersion()); } - if (overwriteVersion) { - resp.setLastRomVersion(romVersion); - resp.setLastDataVersion(dataVersion); - } resp.setLastPlayDate(user.getLastPlayDate()); resp.setTrophyId(user.getTrophyId()); diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Character.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Character.java index 6add579e..cedbe509 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Character.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Character.java @@ -1,10 +1,13 @@ package icu.samnyan.aqua.sega.chunithm.model.gamedata; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; import java.io.Serializable; -import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) @@ -29,7 +32,7 @@ public class Character implements Serializable { private String illustratorName; - private Integer firstSkillId; + private String firstSkillId; // Format: level:skillId,level:skillId // Keep 0 skillId diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGeneralData.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGeneralData.java index c81cefa7..cecf199b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGeneralData.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGeneralData.java @@ -33,6 +33,7 @@ public class UserGeneralData implements Serializable { private String propertyKey; + @Column(columnDefinition = "TEXT") private String propertyValue; public UserGeneralData(UserData userData, String key) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserActivityService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserActivityService.java index e915409b..3cba1438 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserActivityService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserActivityService.java @@ -35,10 +35,10 @@ public class UserActivityService { } public List getAllByUserIdAndKind(String userId, String kind) { - return userActivityRepository.findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Integer.parseInt(userId), Integer.parseInt(kind)); + return userActivityRepository.findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long.parseLong(userId), Integer.parseInt(kind)); } public List getByUserId(String userId) { - return userActivityRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId)); + return userActivityRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCharacterService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCharacterService.java index 93142b0c..db8efeb0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCharacterService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCharacterService.java @@ -34,12 +34,12 @@ public class UserCharacterService { } public List getByUserId(String userId) { - return userCharacterRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userCharacterRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public Page getByUserId(String userId, int pageNumber, int maxCount) { Pageable pageable = PageRequest.of(pageNumber, maxCount); - return userCharacterRepository.findByUser_Card_ExtId(Integer.parseInt(userId), pageable); + return userCharacterRepository.findByUser_Card_ExtId(Long.parseLong(userId), pageable); } public Optional getByUserAndCharacterId(UserData user, int characterId) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserChargeService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserChargeService.java index 5266060c..2f13f1db 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserChargeService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserChargeService.java @@ -29,7 +29,7 @@ public class UserChargeService { } public List getByUserId(String userId) { - return userChargeRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userChargeRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public Optional getByUserAndChargeId(UserData user, int chargeId) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCourseService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCourseService.java index ab565dc6..4df29de3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCourseService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCourseService.java @@ -34,12 +34,12 @@ public class UserCourseService { } public List getByUserId(String userId) { - return userCourseRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userCourseRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public Page getByUserId(String userId, int pageNum, int maxCount) { Pageable page = PageRequest.of(pageNum, maxCount); - return userCourseRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page); + return userCourseRepository.findByUser_Card_ExtId(Long.parseLong(userId), page); } public Optional getByUserAndCourseId(UserData user, int courseId) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataExService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataExService.java index 86f3e322..b1d82b86 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataExService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataExService.java @@ -30,6 +30,6 @@ public class UserDataExService { } public Optional getByExtId(String userId) { - return userDataExRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userDataExRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataService.java index 5c9dcaba..d0e50e35 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataService.java @@ -31,7 +31,7 @@ public class UserDataService { } public Optional getUserByExtId(String aimeId) { - return userDataRepository.findByCard_ExtId(Integer.parseInt(aimeId)); + return userDataRepository.findByCard_ExtId(Long.parseLong(aimeId)); } public Optional getUserByCard(Card card) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDuelService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDuelService.java index 8daed9b5..9250809a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDuelService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDuelService.java @@ -35,6 +35,6 @@ public class UserDuelService { } public List getByUserId(String userId) { - return userDuelRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userDuelRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionExService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionExService.java index dd772f8b..a6fb25af 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionExService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionExService.java @@ -30,6 +30,6 @@ public class UserGameOptionExService { } public Optional getByUserId(String userId) { - return userGameOptionExRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userGameOptionExRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionService.java index 960a4b2c..76e50642 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionService.java @@ -30,6 +30,6 @@ public class UserGameOptionService { } public Optional getByUserId(String userId) { - return userGameOptionRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userGameOptionRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGeneralDataService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGeneralDataService.java index affc1b95..863e6ee5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGeneralDataService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGeneralDataService.java @@ -28,7 +28,7 @@ public class UserGeneralDataService { } public Optional getByUserIdAndKey(String userId, String key) { - return userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(Integer.parseInt(userId), key); + return userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(Long.parseLong(userId), key); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java index 586ae960..6e8df9a9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java @@ -33,7 +33,7 @@ public class UserItemService { } public List getByUserId(String userId) { - return userItemRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId)); + return userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); } public Optional getByUserAndItemIdAndKind(UserData user, int itemId, int itemKind) { @@ -42,10 +42,10 @@ public class UserItemService { public Page getByUserAndItemKind(String userId, int kind, int pageNumber, int maxCount) { Pageable page = PageRequest.of(pageNumber, maxCount); - return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Integer.parseInt(userId), kind, page); + return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Long.parseLong(userId), kind, page); } public Page getByUserId(String userId, int page, int size) { - return userItemRepository.findByUser_Card_ExtId(Integer.parseInt(userId), PageRequest.of(page, size)); + return userItemRepository.findByUser_Card_ExtId(Long.parseLong(userId), PageRequest.of(page, size)); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMapService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMapService.java index 409e8059..bb287028 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMapService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMapService.java @@ -35,7 +35,7 @@ public class UserMapService { } public List getByUserId(String userId) { - return userMapRepository.findAllByUser_Card_ExtId(Integer.parseInt(userId)); + return userMapRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); } public Optional getByUserAndMapId(UserData user, int mapId) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMusicDetailService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMusicDetailService.java index 3dbd4e71..2ca0d1c6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMusicDetailService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMusicDetailService.java @@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMusicDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -34,15 +33,15 @@ public class UserMusicDetailService { } public List getByUserId(String userId) { - return userMusicDetailRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public Page getByUserId(String userId, Pageable page) { - return userMusicDetailRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page); + return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId), page); } public List getByUserIdAndMusicId(String userId, int musicId) { - return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(Integer.parseInt(userId), musicId); + return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(Long.parseLong(userId), musicId); } public Optional getByUserAndMusicIdAndLevel(UserData user, int musicId, int level) { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserPlaylogService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserPlaylogService.java index 6867b6fb..2b945f8b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserPlaylogService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserPlaylogService.java @@ -33,19 +33,19 @@ public class UserPlaylogService { } public Page getRecentPlays(String userId, Pageable page) { - return userPlaylogRepository.findByUser_Card_ExtId(Integer.parseInt(userId), page); + return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId), page); } public List getRecent30Plays(String userId) { Pageable page = PageRequest.of(0, 30, Sort.by(Sort.Direction.DESC, "userPlayDate")); - return userPlaylogRepository.findByUser_Card_ExtIdAndLevelNot(Integer.parseInt(userId), 4, page); + return userPlaylogRepository.findByUser_Card_ExtIdAndLevelNot(Long.parseLong(userId), 4, page); } public List getByUserId(String userId) { - return userPlaylogRepository.findByUser_Card_ExtId(Integer.parseInt(userId)); + return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId)); } public List getByUserIdAndMusicIdAndLevel(String userId, int id, int level) { - return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Integer.parseInt(userId), id, level); + return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Long.parseLong(userId), id, level); } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.java index 5028a49e..36b6a284 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.handler.ingame; -import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerProfileRepository; import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerPvCustomizeRepository; import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerPvRecordRepository; import icu.samnyan.aqua.sega.diva.handler.BaseHandler; @@ -11,6 +10,7 @@ import icu.samnyan.aqua.sega.diva.model.response.ingame.GetPvPdResponse; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvCustomize; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvRecord; +import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.diva.util.DivaMapper; import icu.samnyan.aqua.sega.util.URIEncoder; @@ -31,18 +31,18 @@ public class GetPvPdHandler extends BaseHandler { private final PlayerPvRecordRepository pvRecordRepository; private final PlayerPvCustomizeRepository pvCustomizeRepository; - private final PlayerProfileRepository profileRepository; + private final PlayerProfileService playerProfileService; - public GetPvPdHandler(DivaMapper mapper, PlayerPvRecordRepository pvRecordRepository, PlayerPvCustomizeRepository pvCustomizeRepository, PlayerProfileRepository profileRepository) { + public GetPvPdHandler(DivaMapper mapper, PlayerPvRecordRepository pvRecordRepository, PlayerPvCustomizeRepository pvCustomizeRepository, PlayerProfileService playerProfileService) { super(mapper); this.pvRecordRepository = pvRecordRepository; this.pvCustomizeRepository = pvCustomizeRepository; - this.profileRepository = profileRepository; + this.playerProfileService = playerProfileService; } public String handle(GetPvPdRequest request) { - Optional profileO = profileRepository.findByPdId(request.getPd_id()); + Optional profileO = playerProfileService.findByPdId(request.getPd_id()); StringBuilder pd = new StringBuilder(); for (int pvId : diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.java index 56ba1825..3fab2736 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.handler.ingame; -import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerProfileRepository; import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerPvCustomizeRepository; import icu.samnyan.aqua.sega.diva.exception.ProfileNotFoundException; import icu.samnyan.aqua.sega.diva.handler.BaseHandler; @@ -9,6 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.ShopExitRequest; import icu.samnyan.aqua.sega.diva.model.response.ingame.ShopExitResponse; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvCustomize; +import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; import icu.samnyan.aqua.sega.diva.util.DivaMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,19 +24,19 @@ public class ShopExitHandler extends BaseHandler { private static final Logger logger = LoggerFactory.getLogger(ShopExitHandler.class); - private final PlayerProfileRepository playerProfileRepository; + private final PlayerProfileService playerProfileService; private final PlayerPvCustomizeRepository pvCustomizeRepository; - public ShopExitHandler(DivaMapper mapper, PlayerProfileRepository playerProfileRepository, PlayerPvCustomizeRepository pvCustomizeRepository) { + public ShopExitHandler(DivaMapper mapper, PlayerProfileService playerProfileService, PlayerPvCustomizeRepository pvCustomizeRepository) { super(mapper); - this.playerProfileRepository = playerProfileRepository; + this.playerProfileService = playerProfileService; this.pvCustomizeRepository = pvCustomizeRepository; } public String handle(ShopExitRequest request) { - PlayerProfile profile = playerProfileRepository.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); + PlayerProfile profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); PlayerPvCustomize customize = pvCustomizeRepository.findByPdIdAndPvId(profile, request.getPly_pv_id()).orElseGet(() -> new PlayerPvCustomize(profile, request.getPly_pv_id())); if (request.getUse_pv_mdl_eqp() == 1) { @@ -53,7 +53,7 @@ public class ShopExitHandler extends BaseHandler { profile.setCommonCustomizeItems(arrToCsv(request.getC_itm_eqp_cmn_ary())); profile.setModuleSelectItemFlag(arrToCsv(request.getMs_itm_flg_cmn_ary())); - playerProfileRepository.save(profile); + playerProfileService.save(profile); pvCustomizeRepository.save(customize); ShopExitResponse response = new ShopExitResponse( request.getCmd(), diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.java index 26621601..842fc61f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.java @@ -10,6 +10,7 @@ import icu.samnyan.aqua.sega.diva.model.gamedata.Contest; import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest; import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse; import icu.samnyan.aqua.sega.diva.model.userdata.*; +import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; import icu.samnyan.aqua.sega.diva.util.DivaCalculator; import icu.samnyan.aqua.sega.diva.util.DivaMapper; import org.apache.commons.lang3.StringUtils; @@ -32,7 +33,7 @@ public class StageResultHandler extends BaseHandler { private final GameSessionRepository gameSessionRepository; private final PlayerPvRecordRepository pvRecordRepository; - private final PlayerProfileRepository profileRepository; + private final PlayerProfileService playerProfileService; private final PlayLogRepository playLogRepository; private final ContestRepository contestRepository; private final PlayerContestRepository playerContestRepository; @@ -43,11 +44,11 @@ public class StageResultHandler extends BaseHandler { private PlayerProfile currentProfile = null; - public StageResultHandler(DivaMapper mapper, GameSessionRepository gameSessionRepository, PlayerPvRecordRepository pvRecordRepository, PlayerProfileRepository profileRepository, PlayLogRepository playLogRepository, ContestRepository contestRepository, PlayerContestRepository playerContestRepository, PlayerCustomizeRepository playerCustomizeRepository, PlayerInventoryRepository playerInventoryRepository, DivaCalculator divaCalculator) { + public StageResultHandler(DivaMapper mapper, GameSessionRepository gameSessionRepository, PlayerPvRecordRepository pvRecordRepository, PlayerProfileService playerProfileService, PlayLogRepository playLogRepository, ContestRepository contestRepository, PlayerContestRepository playerContestRepository, PlayerCustomizeRepository playerCustomizeRepository, PlayerInventoryRepository playerInventoryRepository, DivaCalculator divaCalculator) { super(mapper); this.gameSessionRepository = gameSessionRepository; this.pvRecordRepository = pvRecordRepository; - this.profileRepository = profileRepository; + this.playerProfileService = playerProfileService; this.playLogRepository = playLogRepository; this.contestRepository = contestRepository; this.playerContestRepository = playerContestRepository; @@ -59,7 +60,7 @@ public class StageResultHandler extends BaseHandler { public String handle(StageResultRequest request) { StageResultResponse response; if (request.getPd_id() != -1) { - PlayerProfile profile = profileRepository.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); + PlayerProfile profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); GameSession session = gameSessionRepository.findByPdId(profile).orElseThrow(SessionNotFoundException::new); currentProfile = profile; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.java index d42546d2..4b4ccea2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.handler.ingame; import icu.samnyan.aqua.sega.diva.dao.userdata.GameSessionRepository; -import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerProfileRepository; import icu.samnyan.aqua.sega.diva.exception.ProfileNotFoundException; import icu.samnyan.aqua.sega.diva.exception.SessionNotFoundException; import icu.samnyan.aqua.sega.diva.handler.BaseHandler; @@ -9,6 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.StageStartRequest; import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import icu.samnyan.aqua.sega.diva.model.userdata.GameSession; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile; +import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; import icu.samnyan.aqua.sega.diva.util.DivaMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,17 +23,17 @@ public class StageStartHandler extends BaseHandler { private static final Logger logger = LoggerFactory.getLogger(StageResultHandler.class); private final GameSessionRepository gameSessionRepository; - private final PlayerProfileRepository profileRepository; + private final PlayerProfileService playerProfileService; - public StageStartHandler(DivaMapper mapper, GameSessionRepository gameSessionRepository, PlayerProfileRepository profileRepository) { + public StageStartHandler(DivaMapper mapper, GameSessionRepository gameSessionRepository, PlayerProfileService playerProfileService) { super(mapper); this.gameSessionRepository = gameSessionRepository; - this.profileRepository = profileRepository; + this.playerProfileService = playerProfileService; } public String handle(StageStartRequest request) { if (request.getPd_id() != -1) { - PlayerProfile profile = profileRepository.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); + PlayerProfile profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); GameSession session = gameSessionRepository.findByPdId(profile).orElseThrow(SessionNotFoundException::new); int[] stageArr = request.getStg_ply_pv_id(); diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.java index 61823d6b..5691f3cb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.handler.ingame; -import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerProfileRepository; import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerScreenShotRepository; import icu.samnyan.aqua.sega.diva.exception.ProfileNotFoundException; import icu.samnyan.aqua.sega.diva.handler.BaseHandler; @@ -8,6 +7,7 @@ import icu.samnyan.aqua.sega.diva.model.request.ingame.StoreSsRequest; import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerScreenShot; +import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; import icu.samnyan.aqua.sega.diva.util.DivaMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,19 +31,19 @@ public class StoreSsHandler extends BaseHandler { private static final Logger logger = LoggerFactory.getLogger(StoreSsHandler.class); - private final PlayerProfileRepository profileRepository; + private final PlayerProfileService playerProfileService; private final PlayerScreenShotRepository screenShotRepository; - public StoreSsHandler(DivaMapper mapper, PlayerProfileRepository profileRepository, PlayerScreenShotRepository screenShotRepository) { + public StoreSsHandler(DivaMapper mapper, PlayerProfileService playerProfileService, PlayerScreenShotRepository screenShotRepository) { super(mapper); - this.profileRepository = profileRepository; + this.playerProfileService = playerProfileService; this.screenShotRepository = screenShotRepository; } public String handle(StoreSsRequest request, MultipartFile file) { - PlayerProfile profile = profileRepository.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); + PlayerProfile profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow(ProfileNotFoundException::new); BaseResponse response; try { diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java index 968b3254..e06b4e06 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java @@ -5,7 +5,9 @@ import icu.samnyan.aqua.sega.diva.model.common.ChallengeKind; import icu.samnyan.aqua.sega.diva.model.common.ClearResult; import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import javax.persistence.*; import java.io.Serializable; @@ -17,6 +19,8 @@ import java.time.LocalDateTime; @Entity(name = "DivaPlayLog") @Table(name = "diva_play_log") @Data +@NoArgsConstructor +@AllArgsConstructor public class PlayLog implements Serializable { private static final long serialVersionUID = 1L; @@ -110,9 +114,6 @@ public class PlayLog implements Serializable { private LocalDateTime dateTime; - public PlayLog() { - } - public PlayLog(PlayerProfile pdId, int pvId, Difficulty difficulty, Edition edition, int scriptVer, int score, ChallengeKind challengeKind, int challengeResult, ClearResult clearResult, int vp, int coolCount, int coolPercent, int fineCount, int finePercent, int safeCount, int safePercent, int sadCount, int sadPercent, int wrongCount, int wrongPercent, int maxCombo, int chanceTime, int holdScore, int attainPoint, int skinId, int buttonSe, int buttonSeVol, int sliderSe, int chainSlideSe, int sliderTouchSe, String modules, int stageCompletion, int slideScore, int isVocalChange, String customizeItems, String rhythmGameOptions, int screenShotCount, LocalDateTime dateTime) { this.pdId = pdId; this.pvId = pvId; diff --git a/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java b/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java index 2128f6bd..a5ce2a7e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/general/dao/CardRepository.java @@ -12,7 +12,7 @@ import java.util.Optional; @Repository("SegaCardRepository") public interface CardRepository extends JpaRepository { - Optional findByExtId(int extId); + Optional findByExtId(Long extId); Optional findByLuid(String luid); } diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.java b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.java index e8008aa5..eb35699c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/Card.java +++ b/src/main/java/icu/samnyan/aqua/sega/general/model/Card.java @@ -26,7 +26,7 @@ public class Card implements Serializable { // A external id @Column(name = "ext_id", unique = true) - private Integer extId; + private Long extId; // Access Code @Column(unique = true) diff --git a/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java b/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java index 097f98cc..3b223488 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java +++ b/src/main/java/icu/samnyan/aqua/sega/general/model/PropertyEntry.java @@ -24,6 +24,7 @@ public class PropertyEntry implements Serializable { @Column(unique = true) private String propertyKey; + @Column(columnDefinition = "TEXT") private String propertyValue; public PropertyEntry(String propertyKey, String propertyValue) { diff --git a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.java b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.java index 09c239a7..5f7a992d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.java +++ b/src/main/java/icu/samnyan/aqua/sega/general/service/CardService.java @@ -28,15 +28,16 @@ public class CardService { * @return Optional of a Card */ public Optional getCardByExtId(String extId) { - return cardRepository.findByExtId(Integer.parseInt(extId)); + return cardRepository.findByExtId(Long.parseLong(extId)); } /** * Find a card by External Id + * * @param extId External Id * @return Optional of a Card */ - public Optional getCardByExtId(int extId) { + public Optional getCardByExtId(Long extId) { return cardRepository.findByExtId(extId); } @@ -57,9 +58,9 @@ public class CardService { public Card registerByAccessCode(String accessCode) { Card card = new Card(); card.setLuid(accessCode); - int extId = ThreadLocalRandom.current().nextInt(99999999); + long extId = ThreadLocalRandom.current().nextLong(99999999); while (cardRepository.findByExtId(extId).isPresent()) { - extId = ThreadLocalRandom.current().nextInt(99999999); + extId = ThreadLocalRandom.current().nextLong(99999999); } card.setExtId(extId); card.setRegisterTime(LocalDateTime.now()); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserActivityRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserActivityRepository.java index dafd2d7c..54a175c6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserActivityRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserActivityRepository.java @@ -15,11 +15,11 @@ import java.util.Optional; @Repository("OngekiUserActivityRepository") public interface UserActivityRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndKindAndActivityId(UserData userData, int kind, int activityId); - List findByUser_Card_ExtIdAndKindOrderBySortNumberDesc(int userId, int kind); + List findByUser_Card_ExtIdAndKindOrderBySortNumberDesc(long userId, int kind); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserBossRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserBossRepository.java index 7e729d6e..cbc0c998 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserBossRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserBossRepository.java @@ -14,7 +14,7 @@ import java.util.Optional; @Repository("OngekiUserBossRepository") public interface UserBossRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndMusicId(UserData user, int musicId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCardRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCardRepository.java index 91018e39..00f84862 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCardRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCardRepository.java @@ -19,11 +19,11 @@ public interface UserCardRepository extends JpaRepository { Optional findByUserAndCardId(UserData userData, int cardId); - Optional findByUser_Card_ExtIdAndCardId(int userId, int cardId); + Optional findByUser_Card_ExtIdAndCardId(long userId, int cardId); - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserChapterRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserChapterRepository.java index 9f65b97b..d402892f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserChapterRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserChapterRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; @Repository("OngekiUserChapterRepository") public interface UserChapterRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndChapterId(UserData userData, int chapterId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCharacterRepository.java index a34f7135..cff20bf1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCharacterRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserCharacterRepository.java @@ -17,9 +17,9 @@ import java.util.Optional; @Repository("OngekiUserCharacterRepository") public interface UserCharacterRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); Optional findByUserAndCharacterId(UserData userData, int characterId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java index 9c41a1b2..a0dadf0d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java @@ -16,7 +16,7 @@ public interface UserDataRepository extends JpaRepository { Optional findByCard(Card card); - Optional findByCard_ExtId(int aimeId); + Optional findByCard_ExtId(long aimeId); @Transactional void deleteByCard(Card card); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDeckRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDeckRepository.java index 4a835169..fb2f685c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDeckRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDeckRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; @Repository("OngekiUserDeckRepository") public interface UserDeckRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndDeckId(UserData userData, int deckId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserEventPointRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserEventPointRepository.java index 4ca2f0bb..69669186 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserEventPointRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserEventPointRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; @Repository("OngekiUserEventPointRepository") public interface UserEventPointRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndEventId(UserData userData, int eventId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserGeneralDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserGeneralDataRepository.java index 37689ae6..fde67e7a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserGeneralDataRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserGeneralDataRepository.java @@ -15,11 +15,11 @@ import java.util.Optional; @Repository("OngekiUserGeneralDataRepository") public interface UserGeneralDataRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndPropertyKey(UserData user, String key); - Optional findByUser_Card_ExtIdAndPropertyKey(int userId, String key); + Optional findByUser_Card_ExtIdAndPropertyKey(long userId, String key); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserItemRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserItemRepository.java index 5ec2a5c2..7edf34eb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserItemRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserItemRepository.java @@ -17,13 +17,13 @@ import java.util.Optional; @Repository("OngekiUserItemRepository") public interface UserItemRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); Optional findByUserAndItemKindAndItemId(UserData userData, int itemKind, int itemId); - Page findByUser_Card_ExtIdAndItemKind(int userId, int kind, Pageable page); + Page findByUser_Card_ExtIdAndItemKind(long userId, int kind, Pageable page); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserLoginBonusRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserLoginBonusRepository.java index 5147ae10..c5da0dd5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserLoginBonusRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserLoginBonusRepository.java @@ -13,7 +13,7 @@ import java.util.Optional; */ public interface UserLoginBonusRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndBonusId(UserData userData, int bonusId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMissionPointRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMissionPointRepository.java index afd84446..29fdb73f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMissionPointRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMissionPointRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; @Repository("OngekiUserMissionPointRepository") public interface UserMissionPointRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndEventId(UserData userData, int eventId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicDetailRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicDetailRepository.java index bdc4c89d..52443909 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicDetailRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicDetailRepository.java @@ -17,11 +17,11 @@ import java.util.Optional; @Repository("OngekiUserMusicDetailRepository") public interface UserMusicDetailRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); - List findByUser_Card_ExtIdAndMusicId(int userId, int id); + List findByUser_Card_ExtIdAndMusicId(long userId, int id); Optional findByUserAndMusicIdAndLevel(UserData userData, int musicId, int level); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicItemRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicItemRepository.java index 79151475..e199d921 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicItemRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserMusicItemRepository.java @@ -17,9 +17,9 @@ import java.util.Optional; @Repository("OngekiUserMusicItemRepository") public interface UserMusicItemRepository extends JpaRepository { - List findByUser_Card_ExtId(int aimeId); + List findByUser_Card_ExtId(long aimeId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); Optional findByUserAndMusicId(UserData userData, int musicId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserOptionRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserOptionRepository.java index b0d37380..370e2c9c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserOptionRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserOptionRepository.java @@ -16,7 +16,7 @@ public interface UserOptionRepository extends JpaRepository { Optional findByUser(UserData userData); - Optional findByUser_Card_ExtId(int userId); + Optional findByUser_Card_ExtId(long userId); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.java index 51b43fe1..ee879d9a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.java @@ -16,11 +16,11 @@ import java.util.List; @Repository("OngekiUserPlaylogRepository") public interface UserPlaylogRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); - Page findByUser_Card_ExtId(int userId, Pageable page); + Page findByUser_Card_ExtId(long userId, Pageable page); - List findByUser_Card_ExtIdAndMusicIdAndLevel(Integer userId, int musicId, int level); + List findByUser_Card_ExtIdAndMusicIdAndLevel(long userId, int musicId, int level); @Transactional void deleteByUser(UserData user); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserScenarioRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserScenarioRepository.java index e4d7661c..a7a1fa56 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserScenarioRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserScenarioRepository.java @@ -14,7 +14,7 @@ import java.util.Optional; @Repository("OngekiUserScenarioRepository") public interface UserScenarioRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndScenarioId(UserData user, int scenarioId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserStoryRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserStoryRepository.java index 61070610..9d57b5f6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserStoryRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserStoryRepository.java @@ -15,7 +15,7 @@ import java.util.Optional; @Repository("OngekiUserStoryRepository") public interface UserStoryRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndStoryId(UserData userData, int storyId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTechCountRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTechCountRepository.java index 6279b6cc..9072673a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTechCountRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTechCountRepository.java @@ -14,7 +14,7 @@ import java.util.Optional; @Repository("OngekiUserTechCountRepository") public interface UserTechCountRepository extends JpaRepository { - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); Optional findByUserAndLevelId(UserData user, int levelId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTrainingRoomRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTrainingRoomRepository.java index ee3f1478..e4e9ce46 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTrainingRoomRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserTrainingRoomRepository.java @@ -17,7 +17,7 @@ public interface UserTrainingRoomRepository extends JpaRepository findByUserAndRoomId(UserData user, int roomId); - List findByUser_Card_ExtId(int userId); + List findByUser_Card_ExtId(long userId); @Transactional void deleteByUser(UserData user); 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 727920b1..ad79a32f 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 @@ -35,7 +35,7 @@ public class GetUserChapterHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List chapterList = userChapterRepository.findByUser_Card_ExtId(userId); Map resultMap = new LinkedHashMap<>(); 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 fffa3e52..b3b93372 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 @@ -35,7 +35,7 @@ public class GetUserDataHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); Optional userDataOptional = userDataRepository.findByCard_ExtId(userId); 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 6e0b1421..18b177cb 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 @@ -35,7 +35,7 @@ public class GetUserDeckByKeyHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List deckList = userDeckRepository.findByUser_Card_ExtId(userId); 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 fd52d165..0c38a428 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 @@ -35,7 +35,7 @@ public class GetUserEventPointHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List eventPointList = userEventPointRepository.findByUser_Card_ExtId(userId); 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 8602236b..a4143960 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 @@ -39,7 +39,7 @@ public class GetUserEventRankingHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0")); 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 6683e47c..2f1e18aa 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 @@ -35,7 +35,7 @@ public class GetUserLoginBonusHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List loginBonusList = userLoginBonusRepository.findByUser_Card_ExtId(userId); 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 52b0f18c..b74c6b9c 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 @@ -35,7 +35,7 @@ public class GetUserMissionPointHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List missionPointList = userMissionPointRepository.findByUser_Card_ExtId(userId); 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 4f2007d6..128b56fc 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 @@ -35,7 +35,7 @@ public class GetUserOptionHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); Optional userOptionOptional = userOptionRepository.findByUser_Card_ExtId(userId); 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 cf2047f7..6aa68e92 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 @@ -43,7 +43,7 @@ public class GetUserPreviewHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); Optional userData = userDataRepository.findByCard_ExtId(userId); 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 c2db9994..8db1c11a 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 @@ -35,7 +35,7 @@ public class GetUserStoryHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List userStoryList = userStoryRepository.findByUser_Card_ExtId(userId); 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 b1ec8e88..6fc950fb 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 @@ -35,7 +35,7 @@ public class GetUserTrainingRoomByKeyHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); List trainingRoomList = userTrainingRoomRepository.findByUser_Card_ExtId(userId); diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.java index 2852ea98..d7fdf2de 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/handler/impl/UpsertUserAllHandler.java @@ -83,7 +83,7 @@ public class UpsertUserAllHandler implements BaseHandler { @Override public String handle(Map request) throws JsonProcessingException { - Integer userId = (Integer) request.get("userId"); + Long userId = (Long) request.get("userId"); UpsertUserAll upsertUserAll = mapper.convert(request.get("upsertUserAll"), UpsertUserAll.class); // All the field should exist, no need to check now. diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/GetUserPreviewResp.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/GetUserPreviewResp.java index 897fe267..d17743b4 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/GetUserPreviewResp.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/GetUserPreviewResp.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class GetUserPreviewResp { - private Integer userId = 0; + private long userId = 0; @JsonProperty("isLogin") private boolean isLogin = false; private String lastLoginDate = null; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserGeneralData.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserGeneralData.java index dd81f918..fea15a0e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserGeneralData.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserGeneralData.java @@ -33,6 +33,7 @@ public class UserGeneralData implements Serializable { private String propertyKey; + @Column(columnDefinition = "TEXT") private String propertyValue; public UserGeneralData(UserData userData, String key) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b2679540..3caa5905 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -31,10 +31,4 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLiteDialect #spring.datasource.url=jdbc:mariadb://localhost:3306/?useSSL=false #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB10Dialect -## Game setting -## CHUNITHM -game.chunithm.overwrite-version=false -game.chunithm.rom-version=1.30.00 -game.chunithm.data-version=1.30.00 - ## You can add any Spring Boot properties below \ No newline at end of file