From df3deee3160aa2c30259bbc8a46e4f51d6672c32 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 4 Jan 2025 18:53:36 -0500 Subject: [PATCH] [-] Remove unused services --- .../v2/ApiChuniV2PlayerDataController.java | 256 ------------------ .../samnyan/aqua/sega/chusan/ChusanApis.kt | 2 +- .../aqua/sega/chusan/ChusanMatchingApis.kt | 2 +- .../data => request}/MatchingWaitState.kt | 2 +- .../sega/chusan/model/request/UserEmoney.kt | 11 + .../model/response/data/GameRanking.java | 16 -- .../model/response/data/SymbolChatInfo.java | 19 -- .../model/response/data/UserEmoney.java | 22 -- .../model/response/data/UserFavorite.java | 17 -- .../chusan/model/userdata/Chu3NetBattleLog.kt | 80 +++--- .../chusan/model/userdata/Chu3UserData.kt | 2 +- .../chusan/model/userdata/UserCharacter.kt | 18 +- .../sega/chusan/model/userdata/UserItem.kt | 4 +- .../service/GameLoginBonusPresetService.java | 22 -- .../chusan/service/GameLoginBonusService.java | 28 -- .../chusan/service/UserActivityService.java | 28 -- .../chusan/service/UserCharacterService.java | 49 ---- .../chusan/service/UserChargeService.java | 39 --- .../chusan/service/UserCourseService.java | 44 --- .../sega/chusan/service/UserDuelService.java | 28 -- .../sega/chusan/service/UserGachaService.java | 34 --- .../chusan/service/UserGameOptionService.java | 35 --- .../service/UserGeneralDataService.java | 34 --- .../chusan/service/UserLoginBonusService.java | 35 --- .../chusan/service/UserMapAreaService.java | 28 -- .../service/UserMusicDetailService.java | 38 --- .../chusan/service/UserPlaylogService.java | 43 --- 27 files changed, 66 insertions(+), 870 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java rename src/main/java/icu/samnyan/aqua/sega/chusan/model/{response/data => request}/MatchingWaitState.kt (86%) create mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GameRanking.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/SymbolChatInfo.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserEmoney.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserFavorite.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java deleted file mode 100644 index 632a1ccd..00000000 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java +++ /dev/null @@ -1,256 +0,0 @@ -package icu.samnyan.aqua.api.controller.sega.game.chuni.v2; - -import com.fasterxml.jackson.core.type.TypeReference; -import icu.samnyan.aqua.api.model.MessageResponse; -import icu.samnyan.aqua.api.model.ReducedPageResponse; -import icu.samnyan.aqua.api.model.resp.sega.chuni.v2.RecentResp; -import icu.samnyan.aqua.api.model.resp.sega.chuni.v2.external.Chu3DataExport; -import icu.samnyan.aqua.api.util.ApiMapper; -import icu.samnyan.aqua.sega.chusan.model.userdata.*; -import icu.samnyan.aqua.sega.chusan.service.*; -import icu.samnyan.aqua.sega.general.service.CardService; -import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.*; - -/** - * For all aimeId parameter, should use String - * @author samnyan (privateamusement@protonmail.com) - */ -@RestController -@RequestMapping("api/game/chuni/v2") -@ConditionalOnProperty(prefix = "aquaviewer.api", name = "enabled", havingValue = "true") -@AllArgsConstructor -public class ApiChuniV2PlayerDataController { - - private static final Logger logger = LoggerFactory.getLogger(ApiChuniV2PlayerDataController.class); - - private final ApiMapper mapper; - - private final CardService cardService; - - private final UserActivityService userActivityService; - private final UserCharacterService userCharacterService; - private final UserChargeService userChargeService; - private final UserCourseService userCourseService; - private final UserDataService userDataService; - private final UserDuelService userDuelService; - private final UserGameOptionService userGameOptionService; - private final UserItemService userItemService; - private final UserMapAreaService userMapAreaService; - private final UserMusicDetailService userMusicDetailService; - private final UserPlaylogService userPlaylogService; - private final UserGeneralDataService userGeneralDataService; - - @PutMapping("profile/username") - public Chu3UserData updateName(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setUserName((String) request.get("userName")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/romversion") - public Chu3UserData updateRomVersion(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setLastRomVersion((String) request.get("romVersion")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/dataversion") - public Chu3UserData updateDataVersion(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setLastDataVersion((String) request.get("dataVersion")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/plate") - public Chu3UserData updatePlate(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setNameplateId((Integer) request.get("nameplateId")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/frame") - public Chu3UserData updateFrame(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setFrameId((Integer) request.get("frameId")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/trophy") - public Chu3UserData updateTrophy(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setTrophyId((Integer) request.get("trophyId")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/mapicon") - public Chu3UserData updateMapIcon(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setMapIconId((Integer) request.get("mapiconId")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/sysvoice") - public Chu3UserData updateSystemVoice(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - profile.setVoiceId((Integer) request.get("voiceId")); - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/avatar") - public Chu3UserData updateAvatar(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - int category = (Integer) request.get("category"); - switch (category) { - case 1: - profile.setAvatarWear((Integer) request.get("accId")); - break; - case 2: - profile.setAvatarHead((Integer) request.get("accId")); - break; - case 3: - profile.setAvatarFace((Integer) request.get("accId")); - break; - case 4: - profile.setAvatarSkin((Integer) request.get("accId")); - break; - case 5: - profile.setAvatarItem((Integer) request.get("accId")); - break; - case 6: - profile.setAvatarFront((Integer) request.get("accId")); - break; - case 7: - profile.setAvatarBack((Integer) request.get("accId")); - break; - } - - return userDataService.saveUserData(profile); - } - - @PutMapping("profile/privacy") - public ResponseEntity updatePrivacy(@RequestBody Map request) { - Chu3UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); - UserGameOption option = userGameOptionService.getByUser(profile).orElseThrow(); - int privacy = (Integer) request.get("privacy"); - if (privacy != 1 && privacy != 0) { - return ResponseEntity.badRequest().body(new MessageResponse("Wrong data")); - } - option.setPrivacy(privacy); - return ResponseEntity.ok(userDataService.saveUserData(profile)); - } - - @GetMapping("recent") - public ReducedPageResponse getRecentPlay(@RequestParam String aimeId, - @RequestParam(required = false, defaultValue = "0") int page, - @RequestParam(required = false, defaultValue = "10") int size) { - Page playLogs = userPlaylogService.getRecentPlays(aimeId, PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "userPlayDate"))); - return new ReducedPageResponse<>(mapper.convert(playLogs.getContent(), new TypeReference<>() { - }), playLogs.getPageable().getPageNumber(), playLogs.getTotalPages(), playLogs.getTotalElements()); - } - - @GetMapping("song/{id}") - public List getSongDetail(@RequestParam String aimeId, @PathVariable int id) { - return userMusicDetailService.getByUserIdAndMusicId(aimeId, id); - } - - @GetMapping("song/{id}/{level}") - public List getLevelPlaylog(@RequestParam String aimeId, @PathVariable int id, @PathVariable int level) { - return userPlaylogService.getByUserIdAndMusicIdAndLevel(aimeId, id, level); - } - - @GetMapping("song/{id}/isfavorite") - public boolean getSongFavorite(@RequestParam String aimeId, @PathVariable String id) { - Optional favOptional; - favOptional = userGeneralDataService.getByUserIdAndKey(aimeId, "favorite_music"); - if(favOptional.isPresent()) { - String val = favOptional.get().getPropertyValue(); - if(StringUtils.isNotBlank(val) && val.contains(",")) { - String[] records = val.split(","); - for (String record : records) { - if (record.equals(id)) return true; - } - } - } - return false; - } - - @GetMapping("character") - public ReducedPageResponse getCharacter(@RequestParam String aimeId, - @RequestParam(required = false, defaultValue = "0") int page, - @RequestParam(required = false, defaultValue = "10") int size) { - Page characters = userCharacterService.getByUserId(aimeId, page, size); - return new ReducedPageResponse<>(characters.getContent(), characters.getPageable().getPageNumber(), characters.getTotalPages(), characters.getTotalElements()); - } - - @GetMapping("course") - public List getCourse(@RequestParam String aimeId) { - return userCourseService.getByUserId(aimeId); - } - - @GetMapping("duel") - public List getDuel(@RequestParam String aimeId) { - return userDuelService.getByUserId(aimeId); - } - - @GetMapping("item") - public ReducedPageResponse getItem(@RequestParam String aimeId, - @RequestParam(required = false, defaultValue = "0") int page, - @RequestParam(required = false, defaultValue = "10") int size) { - Page items = userItemService.getByUserId(aimeId, page, size); - return new ReducedPageResponse<>(items.getContent(), items.getPageable().getPageNumber(), items.getTotalPages(), items.getTotalElements()); - } - - @GetMapping("item/{itemKind}") - public List getItemByKind(@RequestParam String aimeId, @PathVariable int itemKind) { - return userItemService.getByUserAndItemKind(aimeId, itemKind); - } - - @GetMapping("general") - public ResponseEntity getGeneralData(@RequestParam String aimeId, @RequestParam String key) { - Optional userGeneralDataOptional = userGeneralDataService.getByUserIdAndKey(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 String aimeId) { - Chu3DataExport data = new Chu3DataExport(); - try { - data.setGameId("SDHD"); - data.setUserData(userDataService.getUserByExtId(aimeId).orElseThrow()); - data.setUserActivityList(userActivityService.getByUserId(aimeId)); - data.setUserCharacterList(userCharacterService.getByUserId(aimeId)); - data.setUserChargeList(userChargeService.getByUserId(aimeId)); - data.setUserCourseList(userCourseService.getByUserId(aimeId)); - data.setUserDuelList(userDuelService.getByUserId(aimeId)); - data.setUserGameOption(userGameOptionService.getByUserId(aimeId).orElseThrow()); - data.setUserItemList(userItemService.getByUserId(aimeId)); - data.setUserMapList(userMapAreaService.getByUserId(aimeId)); - data.setUserMusicDetailList(userMusicDetailService.getByUserId(aimeId)); - data.setUserPlaylogList(userPlaylogService.getByUserId(aimeId)); - } catch (NoSuchElementException e) { - return ResponseEntity.status(HttpStatus.NOT_FOUND) - .body(new MessageResponse("User not found")); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(new MessageResponse("Error during data export. Reason: " + e.getMessage())); - } - // Set filename - HttpHeaders headers = new HttpHeaders(); - headers.set("content-disposition", "attachment; filename=chusan_" + aimeId + "_exported.json"); - return new ResponseEntity<>(data, headers, HttpStatus.OK); - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt index fa4f5749..ac59b974 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.chusan import ext.* import icu.samnyan.aqua.sega.allnet.TokenChecker import icu.samnyan.aqua.sega.chusan.model.request.UserCMissionResp -import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney +import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanMatchingApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanMatchingApis.kt index b7ca820b..7a19baad 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanMatchingApis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanMatchingApis.kt @@ -6,7 +6,7 @@ import ext.JDict import ext.int import ext.millis import ext.parsing -import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingWaitState +import icu.samnyan.aqua.sega.chusan.model.request.MatchingWaitState import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq import kotlin.collections.MutableList import kotlin.collections.find diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt similarity index 86% rename from src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt rename to src/main/java/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt index 42c1f0da..8614c37f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/MatchingWaitState.kt @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.model.response.data +package icu.samnyan.aqua.sega.chusan.model.request import com.fasterxml.jackson.annotation.JsonProperty import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt new file mode 100644 index 00000000..c3b47267 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UserEmoney.kt @@ -0,0 +1,11 @@ +package icu.samnyan.aqua.sega.chusan.model.request + +class UserEmoney( + var type: Int = 0, + var emoneyCredit: Int = 69, + var emoneyBrand: Int = 2, + var ext1: Int = 0, + var ext2: Int = 0, + var ext3: Int = 0 +) + diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GameRanking.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GameRanking.java deleted file mode 100644 index b58834d1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GameRanking.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.response.data; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameRanking { - private int id; - private long point; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/SymbolChatInfo.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/SymbolChatInfo.java deleted file mode 100644 index fd4c9b21..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/SymbolChatInfo.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.response.data; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class SymbolChatInfo { - - private int sceneId; - private int symbolChatId; - private int orderId; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserEmoney.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserEmoney.java deleted file mode 100644 index 9517e9b4..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserEmoney.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.response.data; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserEmoney { - - private int type = 0; - private int emoneyCredit = 69; - private int emoneyBrand = 2; - private int ext1 = 0; - private int ext2 = 0; - private int ext3 = 0; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserFavorite.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserFavorite.java deleted file mode 100644 index 596286d7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/UserFavorite.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.model.response.data; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserFavorite { - - private int id; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt index 7d8551fb..1aa0488e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3NetBattleLog.kt @@ -6,44 +6,44 @@ import jakarta.persistence.Table @Entity(name = "ChusanNetBattleLog") @Table(name = "chusan_net_battle_log") class Chu3NetBattleLog( - val roomId: Long = 0, - val track: Long = 0, - val selectUserId: Long = 0, - val selectUserName: String = "", - val opponentUserId1: Long = 0, - val opponentUserId2: Long = 0, - val opponentUserId3: Long = 0, - val opponentUserName1: String = "", - val opponentUserName2: String = "", - val opponentUserName3: String = "", - val opponentRegionId1: Int = 0, - val opponentRegionId2: Int = 0, - val opponentRegionId3: Int = 0, - val opponentRating1: Int = 0, - val opponentRating2: Int = 0, - val opponentRating3: Int = 0, - val opponentBattleRankId1: Int = 0, - val opponentBattleRankId2: Int = 0, - val opponentBattleRankId3: Int = 0, - val opponentClassEmblemMedal1: Int = 0, - val opponentClassEmblemMedal2: Int = 0, - val opponentClassEmblemMedal3: Int = 0, - val opponentClassEmblemBase1: Int = 0, - val opponentClassEmblemBase2: Int = 0, - val opponentClassEmblemBase3: Int = 0, - val opponentScore1: Int = 0, - val opponentScore2: Int = 0, - val opponentScore3: Int = 0, - val opponentCharaIllustId1: Int = 0, - val opponentCharaIllustId2: Int = 0, - val opponentCharaIllustId3: Int = 0, - val opponentCharaLv1: Int = 0, - val opponentCharaLv2: Int = 0, - val opponentCharaLv3: Int = 0, - val opponentRatingEffectColorId1: Int = 0, - val opponentRatingEffectColorId2: Int = 0, - val opponentRatingEffectColorId3: Int = 0, - val battleRuleId: Int = 0, - val monthPoLong: Int = 0, - val eventPoLong: Int = 0 + var roomId: Long = 0, + var track: Long = 0, + var selectUserId: Long = 0, + var selectUserName: String = "", + var opponentUserId1: Long = 0, + var opponentUserId2: Long = 0, + var opponentUserId3: Long = 0, + var opponentUserName1: String = "", + var opponentUserName2: String = "", + var opponentUserName3: String = "", + var opponentRegionId1: Int = 0, + var opponentRegionId2: Int = 0, + var opponentRegionId3: Int = 0, + var opponentRating1: Int = 0, + var opponentRating2: Int = 0, + var opponentRating3: Int = 0, + var opponentBattleRankId1: Int = 0, + var opponentBattleRankId2: Int = 0, + var opponentBattleRankId3: Int = 0, + var opponentClassEmblemMedal1: Int = 0, + var opponentClassEmblemMedal2: Int = 0, + var opponentClassEmblemMedal3: Int = 0, + var opponentClassEmblemBase1: Int = 0, + var opponentClassEmblemBase2: Int = 0, + var opponentClassEmblemBase3: Int = 0, + var opponentScore1: Int = 0, + var opponentScore2: Int = 0, + var opponentScore3: Int = 0, + var opponentCharaIllustId1: Int = 0, + var opponentCharaIllustId2: Int = 0, + var opponentCharaIllustId3: Int = 0, + var opponentCharaLv1: Int = 0, + var opponentCharaLv2: Int = 0, + var opponentCharaLv3: Int = 0, + var opponentRatingEffectColorId1: Int = 0, + var opponentRatingEffectColorId2: Int = 0, + var opponentRatingEffectColorId3: Int = 0, + var battleRuleId: Int = 0, + var monthPoLong: Int = 0, + var eventPoLong: Int = 0 ) : Chu3UserEntity() diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt index 1d7af85c..b357c9e5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt @@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonSerialize import icu.samnyan.aqua.net.games.BaseEntity import icu.samnyan.aqua.net.games.IUserData -import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney +import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer import jakarta.persistence.* diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt index 16cad5d2..ce55c47a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.kt @@ -11,15 +11,15 @@ import jakarta.persistence.UniqueConstraint class UserCharacter : Chu3UserEntity() { @Column(name = "character_id") var characterId = 0 - val playCount = 0 - val level = 1 - val friendshipExp = 0 + var playCount = 0 + var level = 1 + var friendshipExp = 0 @JsonProperty("isValid") - val isValid = true + var isValid = true @JsonProperty("isNewMark") - val isNewMark = true - val exMaxLv = 0 - val assignIllust = 0 - val param1 = 0 - val param2 = 0 + var isNewMark = true + var exMaxLv = 0 + var assignIllust = 0 + var param1 = 0 + var param2 = 0 } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.kt index 5d4e1f70..94fd554f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.kt @@ -10,7 +10,7 @@ import jakarta.persistence.UniqueConstraint class UserItem( var itemKind: Int = 0, var itemId: Int = 0, - val stock: Int = 1, + var stock: Int = 1, @JsonProperty("isValid") - val isValid: Boolean = true + var isValid: Boolean = true ) : Chu3UserEntity() 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 deleted file mode 100644 index ea579989..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3GameLoginBonusPresetsRepo; -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service("ChusanGameLoginBonusPresetService") -public class GameLoginBonusPresetService { - private final Chu3GameLoginBonusPresetsRepo gameLoginBonusPresetsRepository; - - @Autowired - public GameLoginBonusPresetService(Chu3GameLoginBonusPresetsRepo gameLoginBonusPresetsRepository){ - this.gameLoginBonusPresetsRepository = gameLoginBonusPresetsRepository; - } - - public List getGameLoginBonusPresets(int version){ - return this.gameLoginBonusPresetsRepository.findLoginBonusPresets(version, 1); - } -} 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 deleted file mode 100644 index f20c813e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusService.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - - -import icu.samnyan.aqua.sega.chusan.model.Chu3GameLoginBonusRepo; -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service("ChusanGameLoginBonusService") -public class GameLoginBonusService { - private final Chu3GameLoginBonusRepo gameLoginBonusRepository; - - @Autowired - public GameLoginBonusService(Chu3GameLoginBonusRepo gameLoginBonusRepository){ - this.gameLoginBonusRepository = gameLoginBonusRepository; - } - - public List getAllGameLoginBonus(int presetId){ - return this.gameLoginBonusRepository.findGameLoginBonus(1, presetId); - } - - public Optional getGameLoginBonusByDay(int presetId, int day){ - return this.gameLoginBonusRepository.findByRequiredDays(1, presetId, day); - } -} 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 deleted file mode 100644 index d616fb6b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserActivityService.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserActivityRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserActivity; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserActivityService") -public class UserActivityService { - - private final Chu3UserActivityRepo userActivityRepository; - - @Autowired - public UserActivityService(Chu3UserActivityRepo userActivityRepository) { - this.userActivityRepository = userActivityRepository; - } - - public List getByUserId(String 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 deleted file mode 100644 index 37503da1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCharacterService.java +++ /dev/null @@ -1,49 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserCharacterRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -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; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserCharacterService") -public class UserCharacterService { - - private final Chu3UserCharacterRepo userCharacterRepository; - - @Autowired - public UserCharacterService(Chu3UserCharacterRepo userCharacterRepository) { - this.userCharacterRepository = userCharacterRepository; - } - - public UserCharacter save(UserCharacter userCharacter) { - return userCharacterRepository.save(userCharacter); - } - - public List saveAll(Iterable userCharacter) { - return userCharacterRepository.saveAll(userCharacter); - } - - public List getByUserId(String 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(Long.parseLong(userId), pageable); - } - - public Optional getByUserAndCharacterId(Chu3UserData user, int characterId) { - return userCharacterRepository.findTopByUserAndCharacterIdOrderByIdDesc(user, characterId); - } - -} 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 deleted file mode 100644 index 1abfb80c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserChargeService.java +++ /dev/null @@ -1,39 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserChargeRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserChargeService") -public class UserChargeService { - - private final Chu3UserChargeRepo userChargeRepository; - - public UserChargeService(Chu3UserChargeRepo userChargeRepository) { - this.userChargeRepository = userChargeRepository; - } - - public UserCharge save(UserCharge userCharge) { - return userChargeRepository.save(userCharge); - } - - public List saveAll(List newUserChargeList) { - return userChargeRepository.saveAll(newUserChargeList); - } - - public List getByUserId(String userId) { - return userChargeRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } - - public Optional getByUserAndChargeId(Chu3UserData user, int chargeId) { - return userChargeRepository.findByUserAndChargeId(user, chargeId); - } - -} 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 deleted file mode 100644 index 00459404..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserCourseService.java +++ /dev/null @@ -1,44 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserCourseRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserCourse; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -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; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserCourseService") -public class UserCourseService { - - private final Chu3UserCourseRepo userCourseRepository; - - @Autowired - public UserCourseService(Chu3UserCourseRepo userCourseRepository) { - this.userCourseRepository = userCourseRepository; - } - - public UserCourse save(UserCourse userCourse) { - return userCourseRepository.save(userCourse); - } - - public List saveAll(Iterable userMusicDetail) { - return userCourseRepository.saveAll(userMusicDetail); - } - - public List getByUserId(String 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(Long.parseLong(userId), page); - } -} 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 deleted file mode 100644 index 43552acd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserDuelService.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserDuelRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserDuel; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserDuelService") -public class UserDuelService { - - private final Chu3UserDuelRepo userDuelRepository; - - @Autowired - public UserDuelService(Chu3UserDuelRepo userDuelRepository) { - this.userDuelRepository = userDuelRepository; - } - - public List getByUserId(String userId) { - return userDuelRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } -} 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 deleted file mode 100644 index d59d6416..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserGachaRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserGachaService") -public class UserGachaService { - - private final Chu3UserGachaRepo userGachaRepository; - - public UserGachaService(Chu3UserGachaRepo userGachaRepository) { - this.userGachaRepository = userGachaRepository; - } - - public UserGacha save(UserGacha userGacha) { - return userGachaRepository.save(userGacha); - } - - public List saveAll(List newUserGachaList) { - return userGachaRepository.saveAll(newUserGachaList); - } - - public List getByUserId(String userId) { - return userGachaRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } -} 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 deleted file mode 100644 index 3e618cb5..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGameOptionService.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserGameOptionRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanGameOptionService") -public class UserGameOptionService { - - private final Chu3UserGameOptionRepo userGameOptionRepository; - - @Autowired - public UserGameOptionService(Chu3UserGameOptionRepo userGameOptionRepository) { - this.userGameOptionRepository = userGameOptionRepository; - } - - public UserGameOption save(UserGameOption userGameOption) { - return userGameOptionRepository.save(userGameOption); - } - - public Optional getByUser(Chu3UserData user) { - return userGameOptionRepository.findSingleByUser(user); - } - - public Optional getByUserId(String 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 deleted file mode 100644 index 614fe680..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGeneralDataService.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserGeneralDataRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserGeneralDataService") -public class UserGeneralDataService { - - private final Chu3UserGeneralDataRepo userGeneralDataRepository; - - public UserGeneralDataService(Chu3UserGeneralDataRepo userGeneralDataRepository) { - this.userGeneralDataRepository = userGeneralDataRepository; - } - - public UserGeneralData save(UserGeneralData userGeneralData) { - return userGeneralDataRepository.save(userGeneralData); - } - - public Optional getByUserAndKey(Chu3UserData user, String key) { - return userGeneralDataRepository.findByUserAndPropertyKey(user, key); - } - - public Optional getByUserIdAndKey(String userId, String key) { - return userGeneralDataRepository.findByUser_Card_ExtIdAndPropertyKey(Long.parseLong(userId), key); - } - -} 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 deleted file mode 100644 index 0f661729..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserLoginBonusService.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserLoginBonusRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service("ChusanUserLoginBonusService") -public class UserLoginBonusService { - private final Chu3UserLoginBonusRepo chusanUserLoginBonusRepository; - - @Autowired - public UserLoginBonusService(Chu3UserLoginBonusRepo chusanUserLoginBonusRepository){ - this.chusanUserLoginBonusRepository = chusanUserLoginBonusRepository; - } - - public Optional getUserLoginBonus(int userId, int preset_id){ - return this.chusanUserLoginBonusRepository.findLoginBonus(userId, 1, preset_id); - } - - public List getAllUserLoginBonus(int userId){ - return this.chusanUserLoginBonusRepository.findAllLoginBonus(userId, 1, 0); - } - - public void saveUserLoginBonus(UserLoginBonus userLoginBonus){ - this.chusanUserLoginBonusRepository.save(userLoginBonus); - } - - public void saveAll(Iterable userLoginBonuses) { - this.chusanUserLoginBonusRepository.saveAll(userLoginBonuses); - } -} 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 deleted file mode 100644 index e7300e7e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMapAreaService.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserMapRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserMap; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserMapAreaService") -public class UserMapAreaService { - - private final Chu3UserMapRepo userMapRepository; - - @Autowired - public UserMapAreaService(Chu3UserMapRepo userMapRepository) { - this.userMapRepository = userMapRepository; - } - - public List getByUserId(String userId) { - return userMapRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } -} 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 deleted file mode 100644 index a115ff06..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserMusicDetailService.java +++ /dev/null @@ -1,38 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserMusicDetailRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserMusicDetailService") -public class UserMusicDetailService { - - private final Chu3UserMusicDetailRepo userMusicDetailRepository; - - @Autowired - public UserMusicDetailService(Chu3UserMusicDetailRepo userMusicDetailRepository) { - this.userMusicDetailRepository = userMusicDetailRepository; - } - - public List getByUserId(String userId) { - return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } - - public Page getByUserId(String userId, Pageable page) { - return userMusicDetailRepository.findByUser_Card_ExtId(Long.parseLong(userId), page); - } - - public List getByUserIdAndMusicId(String userId, int musicId) { - return userMusicDetailRepository.findByUser_Card_ExtIdAndMusicId(Long.parseLong(userId), musicId); - } -} 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 deleted file mode 100644 index 6d3d664c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.chusan.service; - -import icu.samnyan.aqua.sega.chusan.model.Chu3UserPlaylogRepo; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; -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.data.domain.Sort; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChusanUserPlaylogService") -public class UserPlaylogService { - - private final Chu3UserPlaylogRepo userPlaylogRepository; - - @Autowired - public UserPlaylogService(Chu3UserPlaylogRepo userPlaylogRepository) { - this.userPlaylogRepository = userPlaylogRepository; - } - - public Page getRecentPlays(String userId, Pageable page) { - return userPlaylogRepository.findByUserCardExtId(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(Long.parseLong(userId), 5, page); - } - - public List getByUserId(String userId) { - return userPlaylogRepository.findByUserCardExtId(Long.parseLong(userId)); - } - - public List getByUserIdAndMusicIdAndLevel(String userId, int id, int level) { - return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Long.parseLong(userId), id, level); - } -}