From 3d716a516af97a03cced46b9b32d937325b4eba6 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sun, 25 Feb 2024 17:21:50 -0500 Subject: [PATCH] [M] Rename field --- .../ApiMaimai2PlayerDataController.java | 24 ++++++++-------- .../icu/samnyan/aqua/net/CardController.kt | 4 +-- .../dao/userdata/UserDataRepository.java | 28 ------------------- .../dao/userdata/UserDataRepository.kt | 23 +++++++++++++++ .../handler/impl/CMGetUserPreviewHandler.java | 2 +- .../handler/impl/GetUserDataHandler.java | 2 +- .../handler/impl/GetUserPreviewHandler.java | 2 +- .../handler/impl/GetUserRatingHandler.java | 2 +- .../handler/impl/GetUserRivalDataHandler.java | 2 +- .../impl/UploadUserPlaylogHandler.java | 2 +- .../handler/impl/UpsertUserAllHandler.java | 3 +- .../handler/impl/UpsertUserPrintHandler.java | 2 +- 12 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.java create mode 100644 src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java index 9f5f7e90..c31d9e27 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java @@ -129,48 +129,48 @@ public class ApiMaimai2PlayerDataController { @GetMapping("profile") public ProfileResp getProfile(@RequestParam long aimeId) { - return mapper.convert(userDataRepository.findByCard_ExtId(aimeId).orElseThrow(), new TypeReference<>() { + return mapper.convert(userDataRepository.findByCardExtId(aimeId).orElseThrow(), new TypeReference<>() { }); } @PostMapping("profile/username") public UserDetail updateName(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setUserName((String) request.get("userName")); return userDataRepository.save(profile); } @PostMapping("profile/icon") public UserDetail updateIcon(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setIconId((Integer) request.get("iconId")); return userDataRepository.save(profile); } @PostMapping("profile/plate") public UserDetail updatePlate(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setPlateId((Integer) request.get("plateId")); return userDataRepository.save(profile); } @PostMapping("profile/frame") public UserDetail updateFrame(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setFrameId((Integer) request.get("frameId")); return userDataRepository.save(profile); } @PostMapping("profile/title") public UserDetail updateTrophy(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setTitleId((Integer) request.get("titleId")); return userDataRepository.save(profile); } @PostMapping("profile/partner") public UserDetail updatePartner(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); profile.setPartnerId((Integer) request.get("partnerId")); return userDataRepository.save(profile); } @@ -205,7 +205,7 @@ public class ApiMaimai2PlayerDataController { @PostMapping("item") public ResponseEntity updateItem(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); Integer itemKind = (Integer) request.get("itemKind"); Integer itemId = (Integer) request.get("itemId"); int stock = 1; @@ -254,7 +254,7 @@ public class ApiMaimai2PlayerDataController { @PostMapping("options") public ResponseEntity updateOptions(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); ObjectMapper objectMapper = new ObjectMapper(); UserOption userOption = objectMapper.convertValue(request.get("options"), UserOption.class); userOption.setUser(profile); @@ -272,7 +272,7 @@ public class ApiMaimai2PlayerDataController { @PostMapping("general") public ResponseEntity setGeneralData(@RequestBody Map request) { - UserDetail profile = userDataRepository.findByCard_ExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); + UserDetail profile = userDataRepository.findByCardExtId(((Number) request.get("aimeId")).longValue()).orElseThrow(); String key = (String) request.get("key"); String value = (String) request.get("value"); @@ -294,7 +294,7 @@ public class ApiMaimai2PlayerDataController { Maimai2DataExport data = new Maimai2DataExport(); try { data.setGameId("SDEZ"); - data.setUserData(userDataRepository.findByCard_ExtId(aimeId).orElseThrow()); + data.setUserData(userDataRepository.findByCardExtId(aimeId).orElseThrow()); data.setUserExtend(userExtendRepository.findByUser_Card_ExtId(aimeId).orElseThrow()); data.setUserOption(userOptionRepository.findByUser_Card_ExtId(aimeId).orElseThrow()); data.setUserUdemae(userUdemaeRepository.findByUser_Card_ExtId(aimeId).orElseThrow()); @@ -336,7 +336,7 @@ public class ApiMaimai2PlayerDataController { Card card; if (cardOptional.isPresent()) { card = cardOptional.get(); - Optional existUserData = userDataRepository.findByCard(cardOptional.get()); + Optional existUserData = Optional.ofNullable(userDataRepository.findByCard(cardOptional.get())); if (existUserData.isPresent()) { // return ResponseEntity.status(HttpStatus.BAD_REQUEST) // .body(new MessageResponse("This card already has a maimai2 profile.")); diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt index 618965c7..02b33680 100644 --- a/src/main/java/icu/samnyan/aqua/net/CardController.kt +++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt @@ -108,7 +108,7 @@ class CardGameService( "maimai" -> maimai.findByCard_ExtId(crd.extId).getOrNull()?.let { maimai.save(it.apply { card = crd.aquaUser!!.ghostCard }) } - "maimai2" -> maimai2.findByCard_ExtId(crd.extId).getOrNull()?.let { + "maimai2" -> maimai2.findByCardExtId(crd.extId).getOrNull()?.let { maimai2.save(it.apply { card = crd.aquaUser!!.ghostCard }) } "chusan" -> chusan.findByCard_ExtId(crd.extId).getOrNull()?.let { @@ -136,7 +136,7 @@ class CardGameService( "lastLogin" to it.lastPlayDate, ) }, - "maimai2" to maimai2.findByCard_ExtId(card.extId).getOrNull()?.let { + "maimai2" to maimai2.findByCardExtId(card.extId).getOrNull()?.let { mapOf( "name" to it.userName, "rating" to it.playerRating, diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.java deleted file mode 100644 index cd02a529..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.maimai2.dao.userdata; - -import icu.samnyan.aqua.sega.general.model.Card; -import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("Maimai2UserDataRepository") -public interface UserDataRepository extends JpaRepository { - - Optional findByCard(Card card); - - Optional findByCard_ExtId(long userId); - - @Transactional - void deleteByCard(Card card); - - @Query("select count(*) from Maimai2UserData where playerRating > :rating") - Integer getRanking(int rating); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt new file mode 100644 index 00000000..8acce5a5 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt @@ -0,0 +1,23 @@ +package icu.samnyan.aqua.sega.maimai2.dao.userdata + +import icu.samnyan.aqua.sega.general.model.Card +import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Query +import org.springframework.stereotype.Repository +import org.springframework.transaction.annotation.Transactional +import java.util.* + + +@Repository("Maimai2UserDataRepository") +interface UserDataRepository : JpaRepository { + fun findByCard(card: Card): UserDetail? + + fun findByCardExtId(userId: Long): Optional + + @Transactional + fun deleteByCard(card: Card) + + @Query("select count(*) from Maimai2UserData where playerRating > :rating") + fun getRanking(rating: Int): Long +} diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java index 8a834832..e8765941 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java @@ -38,7 +38,7 @@ public class CMGetUserPreviewHandler implements BaseHandler { Long userId = ((Number) request.get("userId")).longValue(); String segaIdAuthKey = String.valueOf(request.get("segaIdAuthKey")); - Optional userDataOptional = userDataRepository.findByCard_ExtId(userId); + Optional userDataOptional = userDataRepository.findByCardExtId(userId); if (userDataOptional.isPresent()) { Map resultMap = new LinkedHashMap<>(); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java index a553ba72..f813dc24 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java @@ -33,7 +33,7 @@ public class GetUserDataHandler implements BaseHandler { public String handle(Map request) throws JsonProcessingException { long userId = ((Number) request.get("userId")).longValue(); - UserDetail userData = userDataRepository.findByCard_ExtId(userId).orElseThrow(); + UserDetail userData = userDataRepository.findByCardExtId(userId).orElseThrow(); Map resultMap = new LinkedHashMap<>(); resultMap.put("userId", userId); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java index 4337bf50..24eeecde 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java @@ -39,7 +39,7 @@ public class GetUserPreviewHandler implements BaseHandler { public String handle(Map request) throws JsonProcessingException { long userId = ((Number) request.get("userId")).longValue(); - Optional userDataOptional = userDataRepository.findByCard_ExtId(userId); + Optional userDataOptional = userDataRepository.findByCardExtId(userId); GetUserPreviewResp resp = new GetUserPreviewResp(); resp.setUserId(userId); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java index f620e671..b9b8878b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java @@ -52,7 +52,7 @@ public class GetUserRatingHandler implements BaseHandler { UserRating userRating = new UserRating(); - Optional userDataOptional = userDataRepository.findByCard_ExtId(userId); + Optional userDataOptional = userDataRepository.findByCardExtId(userId); if (userDataOptional.isPresent() && userDataOptional.get().getUserName() != null) { UserDetail user = userDataOptional.get(); userRating.setRating(user.getPlayerRating()); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java index 355fa95f..ca49b56f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java @@ -34,7 +34,7 @@ public class GetUserRivalDataHandler { long userId = ((Number) request.get("userId")).longValue(); long rivalId = ((Number) request.get("rivalId")).intValue(); - Optional detailOptional = userDataRepository.findByCard_ExtId(rivalId); + Optional detailOptional = userDataRepository.findByCardExtId(rivalId); UserRivalData rivalData; if (detailOptional.isPresent()) { rivalData = new UserRivalData(rivalId, detailOptional.get().getUserName()); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java index 9c64db9f..0520e947 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java @@ -38,7 +38,7 @@ public class UploadUserPlaylogHandler implements BaseHandler { public String handle(Map request) throws JsonProcessingException { UploadUserPlaylog uploadUserPlaylog = mapper.convert(request, UploadUserPlaylog.class); - Optional userOptional = userDataRepository.findByCard_ExtId(uploadUserPlaylog.getUserId()); + Optional userOptional = userDataRepository.findByCardExtId(uploadUserPlaylog.getUserId()); /* Due to how we handle userId, first user playlog can't be saved. diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java index b779f395..541525c3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java @@ -15,7 +15,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -86,7 +85,7 @@ public class UpsertUserAllHandler implements BaseHandler { return null; } else { newUserData = userAll.getUserData().get(0); - Optional userOptional = userDataRepository.findByCard_ExtId(userId); + Optional userOptional = userDataRepository.findByCardExtId(userId); if (userOptional.isPresent()) { userData = userOptional.get(); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java index 776eed6e..348a05b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java @@ -47,7 +47,7 @@ public class UpsertUserPrintHandler implements BaseHandler { UserDetail userData; - Optional userOptional = userDataRepository.findByCard_ExtId(userId); + Optional userOptional = userDataRepository.findByCardExtId(userId); if (userOptional.isPresent()) { userData = userOptional.get(); } else {