diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java deleted file mode 100644 index 17d5c5d7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java +++ /dev/null @@ -1,269 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.controller; - - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chunithm.handler.impl.*; -import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@RestController -@RequestMapping("/g/chu2/{ROM_VERSION}/{CLIENT_ID}/ChuniServlet") -@AllArgsConstructor -public class ChuniServletController { - - private final GameLoginHandler gameLoginHandler; - private final GameLogoutHandler gameLogoutHandler; - private final GetGameChargeHandler getGameChargeHandler; - private final GetGameEventHandler getGameEventHandler; - private final GetGameIdlistHandler getGameIdlistHandler; - private final GetGameMessageHandler getGameMessageHandler; - private final GetGameRankingHandler getGameRankingHandler; - private final GetGameSaleHandler getGameSaleHandler; - private final GetGameSettingHandler getGameSettingHandler; - private final GetTeamCourseRuleHandler getTeamCourseRuleHandler; - private final GetTeamCourseSettingHandler getTeamCourseSettingHandler; - private final GetUserActivityHandler getUserActivityHandler; - private final GetUserCharacterHandler getUserCharacterHandler; - private final GetUserChargeHandler getUserChargeHandler; - private final GetUserCourseHandler getUserCourseHandler; - private final GetUserDataExHandler getUserDataExHandler; - private final GetUserDataHandler getUserDataHandler; - private final GetUserDuelHandler getUserDuelHandler; - private final GetUserFavoriteItemHandler getUserFavoriteItemHandler; - private final GetUserFavoriteMusicHandler getUserFavoriteMusicHandler; - private final GetUserItemHandler getUserItemHandler; - private final GetUserLoginBonusHandler getUserLoginBonusHandler; - private final GetUserMapHandler getUserMapHandler; - private final GetUserMusicHandler getUserMusicHandler; - private final GetUserOptionExHandler getUserOptionExHandler; - private final GetUserOptionHandler getUserOptionHandler; - private final GetUserPreviewHandler getUserPreviewHandler; - private final GetUserRecentRatingHandler getUserRecentRatingHandler; - private final GetUserRegionHandler getUserRegionHandler; - private final GetUserRivalDataHandler getUserRivalDataHandler; - private final GetUserRivalMusicHandler getUserRivalMusicHandler; - private final GetUserTeamHandler getUserTeamHandler; - private final UpsertClientSettingHandler upsertClientSettingHandler; - private final UpsertUserAllHandler upsertUserAllHandler; - private final UpsertUserChargelogHandler upsertUserChargelogHandler; - - - @PostMapping("GameLoginApi") - String gameLogin(@ModelAttribute Map request) throws JsonProcessingException { - return gameLoginHandler.handle(request); - } - - @PostMapping("GameLogoutApi") - String gameLogout(@ModelAttribute Map request) throws JsonProcessingException { - return gameLogoutHandler.handle(request); - } - - @PostMapping("GetGameChargeApi") - String getGameCharge(@ModelAttribute Map request) throws JsonProcessingException { - return getGameChargeHandler.handle(request); - } - - @PostMapping("GetGameEventApi") - String getGameEvent(@ModelAttribute Map request) throws JsonProcessingException { - return getGameEventHandler.handle(request); - } - - @PostMapping("GetGameIdlistApi") - String getGameIdList(@ModelAttribute Map request) throws JsonProcessingException { - return getGameIdlistHandler.handle(request); - } - - @PostMapping("GetGameMessageApi") - String getGameMessage(@ModelAttribute Map request) throws JsonProcessingException { - return getGameMessageHandler.handle(request); - } - - @PostMapping("GetGameRankingApi") - String getGameRanking(@ModelAttribute Map request) throws JsonProcessingException { - return getGameRankingHandler.handle(request); - } - - @PostMapping("GetGameSaleApi") - String getGameSale(@ModelAttribute Map request) throws JsonProcessingException { - return getGameSaleHandler.handle(request); - } - - /** - * The game start up request - * - * @return json of GameSetting object - */ - @PostMapping("GetGameSettingApi") - String getGameSetting(@ModelAttribute Map request) throws JsonProcessingException { - return getGameSettingHandler.handle(request); - } - - @PostMapping("GetTeamCourseRuleApi") - String getTeamCourseRule(@ModelAttribute Map request) throws JsonProcessingException { - return getTeamCourseRuleHandler.handle(request); - } - @PostMapping("GetTeamCourseSettingApi") - String getTeamCourseSetting(@ModelAttribute Map request) throws JsonProcessingException { - return getTeamCourseSettingHandler.handle(request); - } - - @PostMapping("GetUserActivityApi") - String getUserActivity(@ModelAttribute Map request) throws JsonProcessingException { - return getUserActivityHandler.handle(request); - } - - @PostMapping("GetUserCharacterApi") - String getUserCharacter(@ModelAttribute Map request) throws JsonProcessingException { - return getUserCharacterHandler.handle(request); - } - - @PostMapping("GetUserChargeApi") - String getUserCharge(@ModelAttribute Map request) throws JsonProcessingException { - return getUserChargeHandler.handle(request); - } - - @PostMapping("GetUserCourseApi") - String getUserCourse(@ModelAttribute Map request) throws JsonProcessingException { - return getUserCourseHandler.handle(request); - } - - @PostMapping("GetUserDataApi") - String getUserData(@ModelAttribute Map request) throws JsonProcessingException { - return getUserDataHandler.handle(request); - } - - @PostMapping("GetUserDataExApi") - String getUserDataEx(@ModelAttribute Map request) throws JsonProcessingException { - return getUserDataExHandler.handle(request); - } - - @PostMapping("GetUserDuelApi") - String getUserDuel(@ModelAttribute Map request) throws JsonProcessingException { - return getUserDuelHandler.handle(request); - } - - @PostMapping("GetUserFavoriteItemApi") - String getUserFavoriteItem(@ModelAttribute Map request) throws JsonProcessingException { - return getUserFavoriteItemHandler.handle(request); - } - - @PostMapping("GetUserFavoriteMusicApi") - public String getUserFavoriteMusic(@ModelAttribute Map request) throws JsonProcessingException { - return getUserFavoriteMusicHandler.handle(request); - } - - @PostMapping("GetUserItemApi") - String getUserItem(@ModelAttribute Map request) throws JsonProcessingException { - return getUserItemHandler.handle(request); - } - - @PostMapping("GetUserLoginBonusApi") - String getUserLoginBonus(@ModelAttribute Map request) throws JsonProcessingException { - return getUserLoginBonusHandler.handle(request); - } - - @PostMapping("GetUserMapApi") - String getUserMap(@ModelAttribute Map request) throws JsonProcessingException { - return getUserMapHandler.handle(request); - } - - @PostMapping("GetUserMusicApi") - String getUserMusic(@ModelAttribute Map request) throws JsonProcessingException { - return getUserMusicHandler.handle(request); - } - - @PostMapping("GetUserOptionApi") - String getUserOption(@ModelAttribute Map request) throws JsonProcessingException { - return getUserOptionHandler.handle(request); - } - - @PostMapping("GetUserOptionExApi") - String getUserOptionEx(@ModelAttribute Map request) throws JsonProcessingException { - return getUserOptionExHandler.handle(request); - } - - // Call when login. Return null if no profile exist - @PostMapping("GetUserPreviewApi") - String getUserPreview(@ModelAttribute Map request) throws JsonProcessingException { - return getUserPreviewHandler.handle(request); - } - - @PostMapping("GetUserRecentRatingApi") - String getUserRecentRating(@ModelAttribute Map request) throws JsonProcessingException { - return getUserRecentRatingHandler.handle(request); - } - - /** - * For older version chunithm - */ - @PostMapping("GetUserRecentPlayerApi") - String getUserRecentPlayerApi(@ModelAttribute Map request) throws JsonProcessingException { - return getUserRecentRatingHandler.handle(request); - } - - @PostMapping("GetUserRegionApi") - String getUserRegion(@ModelAttribute Map request) throws JsonProcessingException { - return getUserRegionHandler.handle(request); - } - - @PostMapping("GetUserRivalDataApi") - String getUserRivalData(@ModelAttribute Map request) throws JsonProcessingException { - return getUserRivalDataHandler.handle(request); - } - @PostMapping("GetUserRivalMusicApi") - String getUserRivalMusic(@ModelAttribute Map request) throws JsonProcessingException { - return getUserRivalMusicHandler.handle(request); - } - - @PostMapping("GetUserTeamApi") - String getUserTeam(@ModelAttribute Map request) throws JsonProcessingException { - return getUserTeamHandler.handle(request); - } - - @PostMapping("UpsertClientBookkeepingApi") - String upsertClientBookkeeping(@ModelAttribute Map request) { - return "{\"returnCode\":\"1\"}"; - } - - @PostMapping("UpsertClientDevelopApi") - String upsertClientDevelop(@ModelAttribute Map request) { - return "{\"returnCode\":\"1\"}"; - } - - @PostMapping("UpsertClientErrorApi") - String upsertClientError(@ModelAttribute Map request) { - return "{\"returnCode\":\"1\"}"; - } - - @PostMapping("UpsertClientSettingApi") - String upsertClientSetting(@ModelAttribute Map request) throws JsonProcessingException { - return upsertClientSettingHandler.handle(request); - } - - @PostMapping("UpsertClientTestmodeApi") - String upsertClientTestmode(@ModelAttribute Map request) { - return "{\"returnCode\":\"1\"}"; - } - - @PostMapping("UpsertUserAllApi") - String upsertUserAll(@ModelAttribute Map request) throws JsonProcessingException { - return upsertUserAllHandler.handle(request); - } - - @PostMapping("UpsertUserChargelogApi") - String upsertUserChargelog(@ModelAttribute Map request) throws JsonProcessingException { - return upsertUserChargelogHandler.handle(request); - } - - @PostMapping("Ping") - String ping(@ModelAttribute Map request) { - return "{\"returnCode\":\"1\"}"; - } - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletControllerAdvice.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletControllerAdvice.java deleted file mode 100644 index 71eebbb1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletControllerAdvice.java +++ /dev/null @@ -1,47 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.controller; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.servlet.HandlerMapping; - -import jakarta.servlet.http.HttpServletRequest; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Map; - -import static icu.samnyan.aqua.sega.util.AquaConst.*; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@RestControllerAdvice(basePackages = "icu.samnyan.aqua.sega.chunithm") -public class ChuniServletControllerAdvice { - - private static final Logger logger = LoggerFactory.getLogger(ChuniServletControllerAdvice.class); - - - /** - * Get the map object from json string - * - * @param request HttpServletRequest - */ - @ModelAttribute - public Map preHandle(HttpServletRequest request) throws IOException { - var pathVar = (Map) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); - byte[] src = request.getInputStream().readAllBytes(); - String outputString = new String(src, StandardCharsets.UTF_8).trim(); - logger.info("Request " + request.getRequestURI() + ": " + outputString); - ObjectMapper mapper = new ObjectMapper(); - - Map result = mapper.readValue(outputString, new TypeReference<>() { - }); - result.put(SERIAL_KEY, pathVar.getOrDefault(SERIAL_KEY, DEFAULT_KEYCHIP_ID)); - result.put(VERSION_KEY, pathVar.getOrDefault(VERSION_KEY, CHUNI_DEFAULT_VERSION)); - return result; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterRepository.java deleted file mode 100644 index 46aac95c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.Character; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameCharacterRepository") -public interface GameCharacterRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterSkillRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterSkillRepository.java deleted file mode 100644 index dff9a385..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameCharacterSkillRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.CharacterSkill; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameCharacterSkillRepository") -public interface GameCharacterSkillRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameChargeRepository.java deleted file mode 100644 index c5bdea1f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameChargeRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameCharge; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameChargeRepository") -public interface GameChargeRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameEventRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameEventRepository.java deleted file mode 100644 index 8029e45f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameEventRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameEvent; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameEventRepository") -public interface GameEventRepository extends JpaRepository { - - List findByEnable(boolean enable); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMessageRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMessageRepository.java deleted file mode 100644 index b8417543..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMessageRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameMessage; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameMessageRepository") -public interface GameMessageRepository extends JpaRepository { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMusicRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMusicRepository.java deleted file mode 100644 index aab8fbf3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/gamedata/GameMusicRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.gamedata; - -import icu.samnyan.aqua.sega.chunithm.model.gamedata.Music; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniGameMusicRepository") -public interface GameMusicRepository extends JpaRepository { - - Optional findByMusicId(int musicId); -} 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 deleted file mode 100644 index e04c90d0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserActivityRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserActivity; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserActivityRepository extends JpaRepository { - - Optional findTopByUserAndActivityIdAndKindOrderByIdDesc(UserData user, int activityId, int kind); - - List findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long extId, int kind); - - List findAllByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java deleted file mode 100644 index d58c0f55..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCharacterRepository.java +++ /dev/null @@ -1,27 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharacter; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserCharacterRepository extends JpaRepository { - - Page findByUser_Card_ExtId(Long extId, Pageable pageable); - - List findByUser_Card_ExtId(Long extId); - - Optional findTopByUserAndCharacterIdOrderByIdDesc(UserData user, int characterId); - - Optional findByUser_Card_ExtIdAndCharacterId(Long extId, int characterId); - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java deleted file mode 100644 index 883d6bf1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserChargeRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserChargeRepository extends JpaRepository { - List findByUser_Card_ExtId(Long extId); - - Optional findByUserAndChargeId(UserData extId, int chargeId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java deleted file mode 100644 index b1b6da5a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserCourseRepository.java +++ /dev/null @@ -1,23 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCourse; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserCourseRepository extends JpaRepository { - Optional findTopByUserAndCourseIdOrderByIdDesc(UserData user, int courseId); - - Page findByUser_Card_ExtId(Long extId, Pageable page); - - List findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java deleted file mode 100644 index 2db81cb6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataExRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -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.UserDataEx; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserDataExRepository extends JpaRepository { - - Optional findByUser(UserData user); - - 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 deleted file mode 100644 index 76095442..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDataRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.general.model.Card; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserDataRepository extends JpaRepository { - - Optional findByCard(Card card); - - 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 deleted file mode 100644 index 342cae6c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserDuelRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -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.UserDuel; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserDuelRepository extends JpaRepository { - - Optional findTopByUserAndDuelIdOrderByIdDesc(UserData user, int duelId); - - List findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java deleted file mode 100644 index 43c16117..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionExRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -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.UserGameOptionEx; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserGameOptionExRepository extends JpaRepository { - Optional findByUser(UserData user); - - 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 deleted file mode 100644 index e895a741..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGameOptionRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -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.UserGameOption; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserGameOptionRepository extends JpaRepository { - - Optional findByUser(UserData user); - - Optional findByUser_Card_ExtId(Long extId); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java deleted file mode 100644 index ab3450ff..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserGeneralDataRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -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.UserGeneralData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository("ChuniUserGeneralDataRepository") -public interface UserGeneralDataRepository extends JpaRepository { - - Optional findByUserAndPropertyKey(UserData user, 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 deleted file mode 100644 index d51aa237..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserItemRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -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.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserItemRepository extends JpaRepository { - - Optional findTopByUserAndItemIdAndItemKindOrderByIdDesc(UserData user, int itemId, int itemKind); - - Page findAllByUser_Card_ExtIdAndItemKind(Long extId, int itemKind, Pageable pageable); - - List findAllByUser_Card_ExtId(Long extId); - - 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 deleted file mode 100644 index 43660cb2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMapRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -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.UserMap; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserMapRepository extends JpaRepository { - List findAllByUser(UserData user); - - 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 deleted file mode 100644 index 245f5121..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserMusicDetailRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -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.UserMusicDetail; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserMusicDetailRepository extends JpaRepository { - - Optional findTopByUserAndMusicIdAndLevelOrderByIdDesc(UserData user, int musicId, int level); - - List findByUser_Card_ExtId(Long extId); - - List findByUser_Card_ExtIdAndMusicId(Long extId, int musicId); - - Page findByUser_Card_ExtId(Long extId, Pageable page); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java deleted file mode 100644 index 10acfacd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/dao/userdata/UserPlaylogRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.dao.userdata; - -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameRanking; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserPlaylog; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Repository -public interface UserPlaylogRepository extends JpaRepository { - List findByUser_Card_ExtIdAndLevelNot(Long extId, int levelNot, Pageable page); - - Page findByUser_Card_ExtId(Long extId, Pageable page); - - List findByUser_Card_ExtIdAndMusicIdAndLevel(Long extId, int musicId, int level); - - List findByUser_Card_ExtId(Long extId); - - @Query("SELECT NEW icu.samnyan.aqua.sega.chunithm.model.response.data.GameRanking(c.musicId, COUNT(c.musicId)) FROM ChuniUserPlaylog c WHERE NOT c.level = 4 GROUP BY c.musicId ORDER BY COUNT(c.musicId) DESC") - Page findGameRankingByPlaylog(Pageable page); -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLoginHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLoginHandler.java deleted file mode 100644 index 7f67a5ff..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLoginHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.service.UserDataService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.Map; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GameLoginHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GameLoginHandler.class); - - private final StringMapper mapper; - - private final UserDataService userDataService; - - public GameLoginHandler(StringMapper mapper, UserDataService userDataService) { - this.mapper = mapper; - this.userDataService = userDataService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Optional userDataOptional = userDataService.getUserByExtId(userId); - userDataOptional.ifPresent(userDataService::updateLoginTime); - - String json = mapper.write(new CodeResp(1)); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLogoutHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLogoutHandler.java deleted file mode 100644 index fb378912..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GameLogoutHandler.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GameLogoutHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GameLogoutHandler.class); - - private final StringMapper mapper; - - public GameLogoutHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - - String json = mapper.write(new CodeResp(1)); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameChargeHandler.java deleted file mode 100644 index 0303a1b7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameChargeHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chunithm.dao.gamedata.GameChargeRepository; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameCharge; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameChargeHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameChargeHandler.class); - private final GameChargeRepository gameChargeRepository; - private final StringMapper mapper; - - @Autowired - public GetGameChargeHandler(GameChargeRepository gameChargeRepository, StringMapper mapper) { - this.gameChargeRepository = gameChargeRepository; - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - - List gameChargeList = gameChargeRepository.findAll(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("length", gameChargeList.size()); - resultMap.put("gameChargeList", gameChargeList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameEventHandler.java deleted file mode 100644 index 72d2c495..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameEventHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chunithm.dao.gamedata.GameEventRepository; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameEvent; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameEventHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameEventHandler.class); - - private final GameEventRepository gameEventRepository; - - private final StringMapper mapper; - - @Autowired - public GetGameEventHandler(GameEventRepository gameEventRepository, StringMapper mapper) { - this.gameEventRepository = gameEventRepository; - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String type = (String) request.get("type"); - - List gameEventList = gameEventRepository.findByEnable(true); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("type", type); - resultMap.put("length", gameEventList.size()); - resultMap.put("gameEventList", gameEventList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameIdlistHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameIdlistHandler.java deleted file mode 100644 index 1b0ef14e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameIdlistHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -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.stereotype.Component; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameIdlistHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameIdlistHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetGameIdlistHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String type = (String) request.get("type"); - - List gameIdlistList = new ArrayList<>(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("type", type); - resultMap.put("length", 0); - resultMap.put("gameIdlistList", gameIdlistList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameMessageHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameMessageHandler.java deleted file mode 100644 index e19de897..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameMessageHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chunithm.dao.gamedata.GameMessageRepository; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.gamedata.GameMessage; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameMessageHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameMessageHandler.class); - - private final GameMessageRepository gameMessageRepository; - - private final StringMapper mapper; - - @Autowired - public GetGameMessageHandler(GameMessageRepository gameMessageRepository, StringMapper mapper) { - this.gameMessageRepository = gameMessageRepository; - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String type = (String) request.get("type"); - - List gameMessageList = gameMessageRepository.findAll(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("type", type); - resultMap.put("length", gameMessageList.size()); - resultMap.put("gameMessageList", gameMessageList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameRankingHandler.java deleted file mode 100644 index 55d5c784..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameRankingHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserPlaylogRepository; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameRanking; -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.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameRankingHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameRankingHandler.class); - - private final UserPlaylogRepository userPlaylogRepository; - - private final StringMapper mapper; - - @Autowired - public GetGameRankingHandler(StringMapper mapper, UserPlaylogRepository userPlaylogRepository) { - this.userPlaylogRepository = userPlaylogRepository; - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String type = (String) request.get("type"); - - Page rankingPage = userPlaylogRepository.findGameRankingByPlaylog(PageRequest.of(0, 10)); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("type", type); - resultMap.put("gameRankingList", rankingPage.getContent()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSaleHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSaleHandler.java deleted file mode 100644 index 3a20f8cc..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSaleHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameSale; -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.stereotype.Component; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameSaleHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameSaleHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetGameSaleHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String type = (String) request.get("type"); - - List gameSaleList = new ArrayList<>(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("type", type); - resultMap.put("length", 0); - resultMap.put("gameSaleList", gameSaleList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSettingHandler.java deleted file mode 100644 index 0352e79b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetGameSettingHandler.java +++ /dev/null @@ -1,66 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.GetGameSettingResp; -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameSetting; -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.stereotype.Component; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetGameSettingHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetGameSettingHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetGameSettingHandler(StringMapper mapper) { - this.mapper = mapper; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - - // Fixed reboot time triggers chunithm maintenance lockout, so let's try minime method which sets it dynamically - // Special thanks to skogaby - - // Hardcode so that the reboot time always started 3 hours ago and ended 2 hours ago - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss"); - LocalDateTime rebootStartTime = LocalDateTime.now().minusHours(3); - LocalDateTime rebootEndTime = LocalDateTime.now().minusHours(2); - - GameSetting gameSetting = new GameSetting( - 1, - false, - 10, - rebootStartTime.format(formatter), - rebootEndTime.format(formatter), - false, - 300, - 300, - 300); - - GetGameSettingResp resp = new GetGameSettingResp( - gameSetting, - false, - true - ); - - String json = mapper.write(resp); - - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseRuleHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseRuleHandler.java deleted file mode 100644 index 03a8ff4d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseRuleHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameSale; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.service.UserDataService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.*; - -@Component -public class GetTeamCourseRuleHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetTeamCourseRuleHandler.class); - - private final StringMapper mapper; - - - public GetTeamCourseRuleHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("nextIndex", 0); - resultMap.put("teamCourseRuleList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseSettingHandler.java deleted file mode 100644 index 15393c45..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetTeamCourseSettingHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GetTeamCourseSettingHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetTeamCourseSettingHandler.class); - - private final StringMapper mapper; - - - public GetTeamCourseSettingHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("nextIndex", 0); - resultMap.put("teamCourseSettingList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserActivityHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserActivityHandler.java deleted file mode 100644 index 7a9e7637..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserActivityHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserActivity; -import icu.samnyan.aqua.sega.chunithm.service.UserActivityService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserActivityHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserActivityHandler.class); - - private final StringMapper mapper; - - private final UserActivityService userActivityService; - - @Autowired - public GetUserActivityHandler(StringMapper mapper, UserActivityService userActivityService) { - this.mapper = mapper; - this.userActivityService = userActivityService; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - String kind = (String) request.get("kind"); - - List userActivityList = userActivityService.getAllByUserIdAndKind(userId, kind); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userActivityList.size()); - resultMap.put("kind", kind); - resultMap.put("userActivityList", userActivityList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCharacterHandler.java deleted file mode 100644 index 9c8c1250..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCharacterHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharacter; -import icu.samnyan.aqua.sega.chunithm.service.UserCharacterService; -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.data.domain.Page; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * Handle getUserCharacter request - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserCharacterHandler implements BaseHandler { - - - private static final Logger logger = LoggerFactory.getLogger(GetUserCharacterHandler.class); - - private final StringMapper mapper; - - private final UserCharacterService userCharacterService; - - - @Autowired - public GetUserCharacterHandler(StringMapper mapper, UserCharacterService userCharacterService) { - this.mapper = mapper; - this.userCharacterService = userCharacterService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - int nextIndex = Integer.parseInt((String) request.get("nextIndex")); - int maxCount = Integer.parseInt((String) request.get("maxCount")); - - int pageNum = nextIndex / maxCount; - - Page dbPage = userCharacterService.getByUserId(userId, pageNum, maxCount); - - long currentIndex = maxCount * pageNum + dbPage.getNumberOfElements(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", dbPage.getNumberOfElements()); - resultMap.put("nextIndex", dbPage.getNumberOfElements() < maxCount ? -1 : currentIndex); - resultMap.put("userCharacterList", dbPage.getContent()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserChargeHandler.java deleted file mode 100644 index 7017ba04..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserChargeHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chunithm.service.UserChargeService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserChargeHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserChargeHandler.class); - - private final StringMapper mapper; - - private final UserChargeService userChargeService; - - @Autowired - public GetUserChargeHandler(StringMapper mapper, UserChargeService userChargeService) { - this.mapper = mapper; - this.userChargeService = userChargeService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - List userChargeList = userChargeService.getByUserId(userId); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userChargeList.size()); - resultMap.put("userChargeList", userChargeList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCourseHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCourseHandler.java deleted file mode 100644 index 03d2385e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserCourseHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCourse; -import icu.samnyan.aqua.sega.chunithm.service.UserCourseService; -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.data.domain.Page; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handle GetUserCourse request - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserCourseHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserCourseHandler.class); - - private final StringMapper mapper; - - private final UserCourseService userCourseService; - - @Autowired - public GetUserCourseHandler(StringMapper mapper, UserCourseService userCourseService) { - this.mapper = mapper; - this.userCourseService = userCourseService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - - if(request.containsKey("nextIndex")) { - int nextIndex = Integer.parseInt((String) request.get("nextIndex")); - int maxCount = Integer.parseInt((String) request.get("maxCount")); - - int pageNum = nextIndex / maxCount; - - Page dbPage = userCourseService.getByUserId(userId, pageNum, maxCount); - - long currentIndex = maxCount * pageNum + dbPage.getNumberOfElements(); - - resultMap.put("length", dbPage.getNumberOfElements()); - resultMap.put("nextIndex", dbPage.getNumberOfElements() < maxCount ? -1 : currentIndex); - resultMap.put("userCourseList", dbPage.getContent()); - } else { - List courseList = userCourseService.getByUserId(userId); - resultMap.put("length", courseList.size()); - resultMap.put("userCourseList", courseList); - } - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataExHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataExHandler.java deleted file mode 100644 index 150634c0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataExHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserDataEx; -import icu.samnyan.aqua.sega.chunithm.service.UserDataExService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserDataExHandler implements BaseHandler { - private static final Logger logger = LoggerFactory.getLogger(GetUserDataExHandler.class); - - private final StringMapper mapper; - - private final UserDataExService userDataExService; - - @Autowired - public GetUserDataExHandler(StringMapper mapper, UserDataExService userDataExService) { - this.mapper = mapper; - this.userDataExService = userDataExService; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Optional userDataExOptional = userDataExService.getByExtId(userId); - - if (userDataExOptional.isPresent()) { - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("userDataEx", userDataExOptional.get()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } - - return null; - } - -} 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 deleted file mode 100644 index 40f9974b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDataHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; - -import static icu.samnyan.aqua.sega.util.AquaConst.SERIAL_KEY; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserDataHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class); - - private final StringMapper mapper; - - private final ClientSettingService clientSettingService; - - private final UserDataService userDataService; - - @Autowired - public GetUserDataHandler(StringMapper mapper, - ClientSettingService clientSettingService, UserDataService userDataService - ) { - this.mapper = mapper; - this.clientSettingService = clientSettingService; - this.userDataService = userDataService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Optional userDataOptional = userDataService.getUserByExtId(userId); - - if (userDataOptional.isPresent()) { - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - UserData user = userDataOptional.get(); - - var vo = clientSettingService.getSetting((String) request.get(SERIAL_KEY)); - if (vo.isPresent()) { - var version = vo.get(); - user.setLastRomVersion(VersionUtil.getTargetVersion(user.getLastRomVersion(), version.getRomVersion())); - user.setLastDataVersion(VersionUtil.getTargetVersion(user.getLastDataVersion(), version.getDataVersion())); - } - - resultMap.put("userData", user); - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } - - return null; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDuelHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDuelHandler.java deleted file mode 100644 index b0635da7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserDuelHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserDuel; -import icu.samnyan.aqua.sega.chunithm.service.UserDuelService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handle GetUserDuel request - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserDuelHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserDuelHandler.class); - - private final StringMapper mapper; - - private final UserDuelService userDuelService; - - @Autowired - public GetUserDuelHandler(StringMapper mapper, UserDuelService userDuelService) { - this.mapper = mapper; - this.userDuelService = userDuelService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - String duelId = (String) request.get("duelId"); - String isAllDuel = (String) request.get("isAllDuel"); - - // TODO: - - List userDuelList = userDuelService.getByUserId(userId); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userDuelList.size()); - resultMap.put("userDuelList", userDuelList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteItemHandler.java deleted file mode 100644 index 82e5dfc1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteItemHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handle GetUserFavoriteItem request - * @author yueou (yueou.xu@gmail.com) - */ - -@Component -public class GetUserFavoriteItemHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserFavoriteItemHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetUserFavoriteItemHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - String kind = (String) request.get("kind"); - - // TODO: - - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("kind", kind); - resultMap.put("nextIndex", -1); - resultMap.put("userFavoriteItemList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteMusicHandler.java deleted file mode 100644 index eb98b684..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserFavoriteMusicHandler.java +++ /dev/null @@ -1,49 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserDuel; -import icu.samnyan.aqua.sega.chunithm.service.UserDuelService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handle GetUserDuel request - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserFavoriteMusicHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserFavoriteMusicHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetUserFavoriteMusicHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - // TODO: - - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("userFavoriteMusicList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserItemHandler.java deleted file mode 100644 index a383103c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserItemHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserItem; -import icu.samnyan.aqua.sega.chunithm.service.UserItemService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handler for getting user item. - * This get call before profile create. - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserItemHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserItemHandler.class); - - private final StringMapper mapper; - - private final UserItemService userItemService; - - public GetUserItemHandler(StringMapper mapper, UserItemService userItemService) { - this.mapper = mapper; - this.userItemService = userItemService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Long nextIndexVal = Long.parseLong((String) request.get("nextIndex")); - int maxCount = Integer.parseInt((String) request.get("maxCount")); - - Long mul = 10000000000L; - - int kind = (int) (nextIndexVal / mul); - int nextIndex = (int) (nextIndexVal % mul); - int pageNum = nextIndex / maxCount; - - Page userItemPage = userItemService.getByUserAndItemKind(userId, kind, pageNum, maxCount); - - List userItemList = userItemPage.getContent(); - - long currentIndex = kind * mul + maxCount * pageNum + userItemPage.getNumberOfElements(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userItemPage.getNumberOfElements()); - resultMap.put("nextIndex", userItemPage.getNumberOfElements() < maxCount ? -1 : currentIndex); - resultMap.put("itemKind", kind); - resultMap.put("userItemList", userItemList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserLoginBonusHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserLoginBonusHandler.java deleted file mode 100644 index 101a7ccc..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserLoginBonusHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GetUserLoginBonusHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserLoginBonusHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetUserLoginBonusHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - // TODO: - - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("userLoginBonusList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMapHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMapHandler.java deleted file mode 100644 index 727e7c7d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMapHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMap; -import icu.samnyan.aqua.sega.chunithm.service.UserMapService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * Handle GetUserMap request - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserMapHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserItemHandler.class); - - private final StringMapper mapper; - - private final UserMapService userMapService; - - @Autowired - public GetUserMapHandler(StringMapper mapper, UserMapService userMapService) { - this.mapper = mapper; - this.userMapService = userMapService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - List userMapList = userMapService.getByUserId(userId); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userMapList.size()); - resultMap.put("userMapList", userMapList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMusicHandler.java deleted file mode 100644 index 16197f44..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserMusicHandler.java +++ /dev/null @@ -1,97 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.data.UserMusicListItem; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMusicDetail; -import icu.samnyan.aqua.sega.chunithm.service.GameMusicService; -import icu.samnyan.aqua.sega.chunithm.service.UserMusicDetailService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import icu.samnyan.aqua.spring.data.OffsetPageRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Sort; -import org.springframework.stereotype.Component; - -import java.util.*; - -/** - * Response: - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserMusicHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserMusicHandler.class); - - private final StringMapper mapper; - - private final UserMusicDetailService userMusicDetailService; - - private final GameMusicService gameMusicService; - - @Autowired - public GetUserMusicHandler(StringMapper mapper, UserMusicDetailService userMusicDetailService, GameMusicService gameMusicService) { - this.mapper = mapper; - this.userMusicDetailService = userMusicDetailService; - this.gameMusicService = gameMusicService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - int currentIndex = Integer.parseInt((String) request.get("nextIndex")); - int maxCount = Integer.parseInt((String) request.get("maxCount")); - if(currentIndex < 0) { - currentIndex = 0; - } - - Page dbPage = userMusicDetailService - .getByUserId(userId, OffsetPageRequest.of(currentIndex, maxCount, Sort.by("musicId"))); - - - // Convert to result format - // Result Map - Map userMusicMap = new LinkedHashMap<>(); - - dbPage.getContent().forEach(userMusicDetail -> { - UserMusicListItem list; - if (userMusicMap.containsKey(userMusicDetail.getMusicId())) { - list = userMusicMap.get(userMusicDetail.getMusicId()); - } else { - list = new UserMusicListItem(0, new ArrayList<>()); - userMusicMap.put(userMusicDetail.getMusicId(), list); - } - list.getUserMusicDetailList().add(userMusicDetail); - list.setLength(list.getUserMusicDetailList().size()); - }); - - // Remove the last music id if the result length is the same as maxCount, - // to prevent a music id split across multiple page, which will cause some - // problem with the game. - int lastListSize = 0; - if(dbPage.getNumberOfElements() >= maxCount) { - // Get last key - int lastMusicId = userMusicMap.keySet().stream().reduce((a, b) -> b).orElseThrow(); - List lastList = userMusicMap.get(lastMusicId).getUserMusicDetailList(); - lastListSize = lastList.size(); - // Remove last one from map - userMusicMap.remove(lastMusicId); - } - - long nextIndex = currentIndex + dbPage.getNumberOfElements() - lastListSize; - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", userMusicMap.size()); - resultMap.put("nextIndex", dbPage.getNumberOfElements() < maxCount ? -1 : nextIndex); - resultMap.put("userMusicList", userMusicMap.values()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionExHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionExHandler.java deleted file mode 100644 index 8c126a5d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionExHandler.java +++ /dev/null @@ -1,53 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGameOptionEx; -import icu.samnyan.aqua.sega.chunithm.service.UserGameOptionExService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserOptionExHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserOptionExHandler.class); - - private final StringMapper mapper; - - private final UserGameOptionExService userGameOptionExService; - - @Autowired - public GetUserOptionExHandler(StringMapper mapper, UserGameOptionExService userGameOptionExService) { - this.mapper = mapper; - this.userGameOptionExService = userGameOptionExService; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Optional userGameOptionEx = userGameOptionExService.getByUserId(userId); - - if (userGameOptionEx.isPresent()) { - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("userGameOptionEx", userGameOptionEx.get()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } - - return null; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionHandler.java deleted file mode 100644 index baab2567..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserOptionHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGameOption; -import icu.samnyan.aqua.sega.chunithm.service.UserGameOptionService; -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.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserOptionHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserOptionHandler.class); - - private final StringMapper mapper; - - private final UserGameOptionService userGameOptionService; - - @Autowired - public GetUserOptionHandler(StringMapper mapper, UserGameOptionService userGameOptionService) { - this.mapper = mapper; - this.userGameOptionService = userGameOptionService; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - Optional userGameOption = userGameOptionService.getByUserId(userId); - - if (userGameOption.isPresent()) { - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("userGameOption", userGameOption.get()); - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } - - return null; - } -} 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 deleted file mode 100644 index 9b0cebee..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserPreviewHandler.java +++ /dev/null @@ -1,114 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -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.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.stereotype.Component; - -import java.util.Map; -import java.util.Optional; - -import static icu.samnyan.aqua.sega.util.AquaConst.SERIAL_KEY; - -/** - * The handler for loading basic profile information. - *

- * return null if no profile exist - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserPreviewHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserPreviewHandler.class); - - private final StringMapper mapper; - - private final ClientSettingService clientSettingService; - - private final UserDataService userDataService; - private final UserCharacterService userCharacterService; - private final UserGameOptionService userGameOptionService; - - @Autowired - public GetUserPreviewHandler(StringMapper mapper, - ClientSettingService clientSettingService, UserDataService userDataService, - UserCharacterService userCharacterService, - UserGameOptionService userGameOptionService - ) { - this.mapper = mapper; - this.clientSettingService = clientSettingService; - this.userDataService = userDataService; - this.userCharacterService = userCharacterService; - this.userGameOptionService = userGameOptionService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - - Optional userData = userDataService.getUserByExtId(userId); - - if (userData.isEmpty()) { - return null; - } - - - UserData user = userData.get(); - - GetUserPreviewResp resp = new GetUserPreviewResp(); - resp.setUserId(userId); - resp.setLogin(false); - resp.setLastLoginDate(user.getLastLoginDate()); - resp.setUserName(user.getUserName()); - resp.setReincarnationNum(user.getReincarnationNum()); - resp.setLevel(user.getLevel()); - resp.setExp(user.getExp()); - resp.setPlayerRating(user.getPlayerRating()); - resp.setLastGameId(user.getLastGameId()); - - var vo = clientSettingService.getSetting((String) request.get(SERIAL_KEY)); - if (vo.isPresent()) { - var version = vo.get(); - resp.setLastRomVersion(VersionUtil.getTargetVersion(user.getLastRomVersion(), version.getRomVersion())); - resp.setLastDataVersion(VersionUtil.getTargetVersion(user.getLastDataVersion(), version.getDataVersion())); - } else { - resp.setLastRomVersion(user.getLastRomVersion()); - resp.setLastDataVersion(user.getLastDataVersion()); - } - - resp.setLastPlayDate(user.getLastPlayDate()); - resp.setTrophyId(user.getTrophyId()); - - Optional userCharacterOptional = userCharacterService.getByUserAndCharacterId(user, user.getCharacterId()); - userCharacterOptional.ifPresent(resp::setUserCharacter); - - Optional userGameOptionOptional = userGameOptionService.getByUser(user); - userGameOptionOptional.ifPresent(userGameOption -> { - resp.setPlayerLevel(userGameOption.getPlayerLevel()); - resp.setRating(userGameOption.getRating()); - resp.setHeadphone(userGameOption.getHeadphone()); - }); - - resp.setChargeState(1); - resp.setUserNameEx(user.getUserName()); - - String json = mapper.write(resp); - logger.info("Response: " + json); - return json; - - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRecentRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRecentRatingHandler.java deleted file mode 100644 index 8f4d41f2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRecentRatingHandler.java +++ /dev/null @@ -1,80 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGeneralData; -import icu.samnyan.aqua.sega.chunithm.service.UserGeneralDataService; -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserPlaylog; -import icu.samnyan.aqua.sega.chunithm.service.UserPlaylogService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * Return the recent play to calculate rating. Rating base on top 30 songs plus top 10 in recent 30 plays. - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserRecentRatingHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserRecentRatingHandler.class); - - private final StringMapper mapper; - - private final UserPlaylogService userPlaylogService; - private final UserGeneralDataService userGeneralDataService; - - @Autowired - public GetUserRecentRatingHandler(StringMapper mapper, UserPlaylogService userPlaylogService, UserGeneralDataService userGeneralDataService) { - this.mapper = mapper; - this.userPlaylogService = userPlaylogService; - this.userGeneralDataService = userGeneralDataService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - Optional recentOptional = userGeneralDataService.getByUserIdAndKey(userId, "recent_rating_list"); - - List ratingList; - if(recentOptional.isPresent()) { - ratingList = new LinkedList<>(); - String val = recentOptional.get().getPropertyValue(); - if(StringUtils.isNotBlank(val) && val.contains(",")) { - String[] records = val.split(","); - for (String record : - records) { - String[] value = record.split(":"); - ratingList.add(new UserRecentRating( - Integer.parseInt(value[0]), - Integer.parseInt(value[1]), - "1030000", - Integer.parseInt(value[2]) - )); - } - } - } else { - List top = userPlaylogService.getRecent30Plays(userId); - ratingList = top.stream().map(log -> new UserRecentRating(log.getMusicId(), log.getLevel(), "1030000", log.getScore())) - .collect(Collectors.toList()); - } - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", ratingList.size()); - resultMap.put("userRecentRatingList", ratingList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRegionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRegionHandler.java deleted file mode 100644 index b671e28e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRegionHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -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.stereotype.Component; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class GetUserRegionHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserRegionHandler.class); - - private final StringMapper mapper; - - @Autowired - public GetUserRegionHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - List userRegionList = new ArrayList<>(); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("userRegionList", userRegionList); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalDataHandler.java deleted file mode 100644 index bf905454..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalDataHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GetUserRivalDataHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserRivalDataHandler.class); - - private final StringMapper mapper; - - - public GetUserRivalDataHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("length", 0); - resultMap.put("userRivalData", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalMusicHandler.java deleted file mode 100644 index 8e681595..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserRivalMusicHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GetUserRivalMusicHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserRivalMusicHandler.class); - - private final StringMapper mapper; - - - public GetUserRivalMusicHandler(StringMapper mapper) { - this.mapper = mapper; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - resultMap.put("rivalId", 0); - resultMap.put("length", 0); - resultMap.put("nextIndex", 0); - resultMap.put("userRivalMusicList", List.of()); - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserTeamHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserTeamHandler.java deleted file mode 100644 index 91281932..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/GetUserTeamHandler.java +++ /dev/null @@ -1,58 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; - -@Component -public class GetUserTeamHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(GetUserTeamHandler.class); - - private final StringMapper mapper; - - private final String teamName; - - - public GetUserTeamHandler(StringMapper mapper, @Value("${game.chunithm.team-name:#{null}}") String teamName) { - this.mapper = mapper; - this.teamName = teamName; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - String playDate = (String) request.get("playDate"); - - Map resultMap = new LinkedHashMap<>(); - resultMap.put("userId", userId); - - if (teamName != null && !teamName.isEmpty()) { - resultMap.put("teamId", 1); - resultMap.put("teamRank", 1); - resultMap.put("teamName", teamName); - - Map userTeamMap = new LinkedHashMap<>(); - userTeamMap.put("userId", userId); - userTeamMap.put("teamId", 1); - userTeamMap.put("orderId", 1); - userTeamMap.put("teamPoint", 1); - userTeamMap.put("aggrDate", playDate); - - resultMap.put("userTeamPoint", userTeamMap); - } else { - resultMap.put("teamId", 0); - } - - String json = mapper.write(resultMap); - logger.info("Response: " + json); - return json; - } -} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientSettingHandler.java deleted file mode 100644 index 84ff6e00..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientSettingHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.requet.ClientSettingRequest; -import icu.samnyan.aqua.sega.general.model.GameVersion; -import icu.samnyan.aqua.sega.general.service.ClientSettingService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.Map; - -import static icu.samnyan.aqua.sega.util.AquaConst.DEFAULT_KEYCHIP_ID; -import static icu.samnyan.aqua.sega.util.AquaConst.SERIAL_KEY; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertClientSettingHandler implements BaseHandler { - - private final StringMapper mapper; - - private final ClientSettingService clientSettingService; - - public UpsertClientSettingHandler(StringMapper mapper, ClientSettingService clientSettingService) { - this.mapper = mapper; - this.clientSettingService = clientSettingService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - var req = mapper.convert(request, ClientSettingRequest.class); - var set = req.getClientSetting(); - var serial = (String) request.get(SERIAL_KEY); - if (!serial.equals(DEFAULT_KEYCHIP_ID)) { - clientSettingService.writeSetting(new GameVersion(serial, set.getRomVersion(), set.getDataVersion(), LocalDateTime.now())); - } - return "{\"returnCode\":\"1\"}"; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserAllHandler.java deleted file mode 100644 index 32891d87..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserAllHandler.java +++ /dev/null @@ -1,343 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.requet.UpsertUserAll; -import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.chunithm.model.userdata.*; -import icu.samnyan.aqua.sega.chunithm.service.*; -import icu.samnyan.aqua.sega.general.model.Card; -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; -import icu.samnyan.aqua.sega.general.service.CardService; -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.stereotype.Component; - -import java.nio.charset.StandardCharsets; -import java.util.*; - -/** - * The handler for save user data. Only send in the end of the session. - * - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertUserAllHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(UpsertUserAllHandler.class); - - private final StringMapper mapper; - - private final CardService cardService; - - private final UserDataService userDataService; - private final UserCharacterService userCharacterService; - private final UserGameOptionService userGameOptionService; - private final UserGameOptionExService userGameOptionExService; - private final UserMapService userMapService; - private final UserItemService userItemService; - private final UserMusicDetailService userMusicDetailService; - private final UserActivityService userActivityService; - private final UserPlaylogService userPlaylogService; - private final UserChargeService userChargeService; - private final UserDataExService userDataExService; - private final UserCourseService userCourseService; - private final UserDuelService userDuelService; - private final UserGeneralDataService userGeneralDataService; - - @Autowired - public UpsertUserAllHandler(StringMapper mapper, CardService cardService, UserDataService userDataService, UserCharacterService userCharacterService, UserGameOptionService userGameOptionService, UserGameOptionExService userGameOptionExService, UserMapService userMapService, UserItemService userItemService, UserMusicDetailService userMusicDetailService, UserActivityService userActivityService, UserPlaylogService userPlaylogService, UserChargeService userChargeService, UserDataExService userDataExService, UserCourseService userCourseService, UserDuelService userDuelService, UserGeneralDataService userGeneralDataService) { - this.mapper = mapper; - this.cardService = cardService; - this.userDataService = userDataService; - this.userCharacterService = userCharacterService; - this.userGameOptionService = userGameOptionService; - this.userGameOptionExService = userGameOptionExService; - this.userMapService = userMapService; - this.userItemService = userItemService; - this.userMusicDetailService = userMusicDetailService; - this.userActivityService = userActivityService; - this.userPlaylogService = userPlaylogService; - this.userChargeService = userChargeService; - this.userDataExService = userDataExService; - this.userCourseService = userCourseService; - this.userDuelService = userDuelService; - this.userGeneralDataService = userGeneralDataService; - } - - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - UpsertUserAll upsertUserAll = mapper.convert(request.get("upsertUserAll"), UpsertUserAll.class); - - // Not all field will be sent. Check if they are exist first. - - UserData userData; - UserData newUserData; - // UserData - if (upsertUserAll.getUserData() == null) { - return null; - } else { - newUserData = upsertUserAll.getUserData().get(0); - - Optional userOptional = userDataService.getUserByExtId(userId); - - if (userOptional.isPresent()) { - userData = userOptional.get(); - } else { - userData = new UserData(); - Card card = cardService.getCardByExtId(userId).orElseThrow(); - userData.setCard(card); - } - - newUserData.setId(userData.getId()); - newUserData.setCard(userData.getCard()); - - - // Decode Username - String userName = new String(newUserData.getUserName() - .getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); - - - newUserData.setUserName(userName); - userDataService.saveAndFlushUserData(newUserData); - } - - // userGameOption - if (upsertUserAll.getUserGameOption() != null) { - UserGameOption newUserGameOption = upsertUserAll.getUserGameOption().get(0); - - Optional userGameOptionOptional = userGameOptionService.getByUser(newUserData); - - UserGameOption userGameOption = userGameOptionOptional.orElseGet(() -> new UserGameOption(newUserData)); - - newUserGameOption.setId(userGameOption.getId()); - newUserGameOption.setUser(userGameOption.getUser()); - - userGameOptionService.save(newUserGameOption); - } - - // userGameOptionEx - if (upsertUserAll.getUserGameOptionEx() != null) { - UserGameOptionEx newUserGameOptionEx = upsertUserAll.getUserGameOptionEx().get(0); - - Optional userGameOptionExOptional = userGameOptionExService.getByUser(newUserData); - UserGameOptionEx userGameOptionEx = userGameOptionExOptional.orElseGet(() -> new UserGameOptionEx(newUserData)); - - newUserGameOptionEx.setId(userGameOptionEx.getId()); - newUserGameOptionEx.setUser(userGameOptionEx.getUser()); - - userGameOptionExService.save(newUserGameOptionEx); - } - - // userMapList - if (upsertUserAll.getUserMapList() != null) { - List userMapList = upsertUserAll.getUserMapList(); - Map newUserMapMap = new HashMap<>(); - - userMapList.forEach(newUserMap -> { - int mapId = newUserMap.getMapId(); - UserMap userMap; - Optional userMapOptional = userMapService.getByUserAndMapId(newUserData, mapId); - userMap = userMapOptional.orElseGet(() -> new UserMap(newUserData)); - - newUserMap.setId(userMap.getId()); - newUserMap.setUser(userMap.getUser()); - - newUserMapMap.put(mapId, newUserMap); - }); - userMapService.saveAll(newUserMapMap.values()); - } - - // userCharacterList - if (upsertUserAll.getUserCharacterList() != null) { - List userCharacterList = upsertUserAll.getUserCharacterList(); - Map newCharacterMap = new HashMap<>(); - - userCharacterList.forEach(newUserCharacter -> { - int characterId = newUserCharacter.getCharacterId(); - - Optional userCharacterOptional = userCharacterService.getByUserAndCharacterId(newUserData, characterId); - UserCharacter userCharacter = userCharacterOptional.orElseGet(() -> new UserCharacter(newUserData)); - - newUserCharacter.setId(userCharacter.getId()); - newUserCharacter.setUser(userCharacter.getUser()); - - newCharacterMap.put(characterId, newUserCharacter); - }); - userCharacterService.saveAll(newCharacterMap.values()); - } - - // userItemList - if (upsertUserAll.getUserItemList() != null) { - List userItemList = upsertUserAll.getUserItemList(); - Map newUserItemMap = new HashMap<>(); - - userItemList.forEach(newUserItem -> { - int itemId = newUserItem.getItemId(); - int itemKind = newUserItem.getItemKind(); - - - Optional userItemOptional = userItemService.getByUserAndItemIdAndKind(newUserData, itemId, itemKind); - UserItem userItem = userItemOptional.orElseGet(() -> new UserItem(newUserData)); - - newUserItem.setId(userItem.getId()); - newUserItem.setUser(userItem.getUser()); - - newUserItemMap.put(itemId + "-" + itemKind, newUserItem); - }); - userItemService.saveAll(newUserItemMap.values()); - } - - // userMusicDetailList - if (upsertUserAll.getUserMusicDetailList() != null) { - - List userMusicDetailList = upsertUserAll.getUserMusicDetailList(); - Map newUserMusicDetailMap = new HashMap<>(); - - userMusicDetailList.forEach(newUserMusicDetail -> { - int musicId = newUserMusicDetail.getMusicId(); - int level = newUserMusicDetail.getLevel(); - - Optional userMusicDetailOptional = userMusicDetailService.getByUserAndMusicIdAndLevel(newUserData, musicId, level); - UserMusicDetail userMusicDetail = userMusicDetailOptional.orElseGet(() -> new UserMusicDetail(newUserData)); - - newUserMusicDetail.setId(userMusicDetail.getId()); - newUserMusicDetail.setUser(userMusicDetail.getUser()); - - newUserMusicDetailMap.put(musicId + "-" + level, newUserMusicDetail); - }); - userMusicDetailService.saveAll(newUserMusicDetailMap.values()); - } - - // userActivityList - if (upsertUserAll.getUserActivityList() != null) { - List userActivityList = upsertUserAll.getUserActivityList(); - List newUserActivityList = new LinkedList<>(); - - userActivityList.forEach(newUserActivity -> { - // No need to rename to activityId. jackson auto handle that - int activityId = newUserActivity.getActivityId(); - int kind = newUserActivity.getKind(); - - Optional userActivityOptional = userActivityService.getByUserAndActivityIdAndKind(newUserData, activityId, kind); - UserActivity userActivity = userActivityOptional.orElseGet(() -> new UserActivity(newUserData)); - - newUserActivity.setId(userActivity.getId()); - newUserActivity.setUser(userActivity.getUser()); - - newUserActivityList.add(newUserActivity); - }); - userActivityService.saveAll(newUserActivityList); - } - - // userRecentRatingList - if(upsertUserAll.getUserRecentRatingList() != null) { - List userRecentRatingList = upsertUserAll.getUserRecentRatingList(); - - StringBuilder sb = new StringBuilder(); - userRecentRatingList.forEach(userRecentRating -> { - sb.append(userRecentRating.getMusicId()).append(":"); - sb.append(userRecentRating.getDifficultId()).append(":"); - sb.append(userRecentRating.getScore()).append(","); - }); - if(sb.length() > 0) { - sb.deleteCharAt(sb.length() - 1); - } - UserGeneralData userGeneralData = userGeneralDataService.getByUserAndKey(newUserData, "recent_rating_list") - .orElseGet(() -> new UserGeneralData(newUserData, "recent_rating_list")); - userGeneralData.setPropertyValue(sb.toString()); - userGeneralDataService.save(userGeneralData); - } - - // userChargeList - if (upsertUserAll.getUserChargeList() != null) { - List userChargeList = upsertUserAll.getUserChargeList(); - List newUserChargeList = new ArrayList<>(); - - userChargeList.forEach(newUserCharge -> { - int chargeId = newUserCharge.getChargeId(); - - Optional userChargeOptional = userChargeService.getByUserAndChargeId(newUserData, chargeId); - UserCharge userCharge = userChargeOptional.orElseGet(() -> new UserCharge(newUserData)); - - newUserCharge.setId(userCharge.getId()); - newUserCharge.setUser(userCharge.getUser()); - - newUserChargeList.add(newUserCharge); - }); - userChargeService.saveAll(newUserChargeList); - } - - // userPlaylogList - if (upsertUserAll.getUserPlaylogList() != null) { - List userPlaylogList = upsertUserAll.getUserPlaylogList(); - List newUserPlaylogList = new ArrayList<>(); - - userPlaylogList.forEach(newUserPlaylog -> { - newUserPlaylog.setUser(newUserData); - - newUserPlaylogList.add(newUserPlaylog); - }); - if (newUserPlaylogList.size() > 0) userPlaylogService.saveAll(newUserPlaylogList); - } - - - // userCourseList - if (upsertUserAll.getUserCourseList() != null) { - List userCourseList = upsertUserAll.getUserCourseList(); - - userCourseList.forEach(newUserCourse -> { - int courseId = newUserCourse.getCourseId(); - - Optional userCourseOptional = userCourseService.getByUserAndCourseId(newUserData, courseId); - UserCourse userCourse = userCourseOptional.orElseGet(() -> new UserCourse(newUserData)); - - newUserCourse.setId(userCourse.getId()); - newUserCourse.setUser(userCourse.getUser()); - - userCourseService.save(newUserCourse); - }); - } - - - // userDataEx - if (upsertUserAll.getUserDataEx() != null) { - UserDataEx newUserDataEx = upsertUserAll.getUserDataEx().get(0); - - Optional userDataExOptional = userDataExService.getByUser(newUserData); - UserDataEx userDataEx = userDataExOptional.orElseGet(() -> new UserDataEx(newUserData)); - - newUserDataEx.setId(userDataEx.getId()); - newUserDataEx.setUser(userDataEx.getUser()); - - userDataExService.save(newUserDataEx); - } - - // userDuelList - if (upsertUserAll.getUserDuelList() != null) { - List userDuelList = upsertUserAll.getUserDuelList(); - Map newUserDuelMap = new HashMap<>(); - - userDuelList.forEach(newUserDuel -> { - int duelId = newUserDuel.getDuelId(); - - Optional userDuelOptional = userDuelService.getByUserAndDuelId(newUserData, duelId); - UserDuel userDuel = userDuelOptional.orElseGet(() -> new UserDuel(newUserData)); - - newUserDuel.setId(userDuel.getId()); - newUserDuel.setUser(userDuel.getUser()); - - newUserDuelMap.put(duelId, newUserDuel); - }); - userDuelService.saveAll(newUserDuelMap.values()); - } - - String json = mapper.write(new CodeResp(1)); - logger.info("Response: " + json); - return json; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserChargelogHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserChargelogHandler.java deleted file mode 100644 index ccce9dab..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertUserChargelogHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.general.BaseHandler; -import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.service.UserChargeService; -import icu.samnyan.aqua.sega.chunithm.service.UserDataService; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertUserChargelogHandler implements BaseHandler { - - private static final Logger logger = LoggerFactory.getLogger(UpsertUserChargelogHandler.class); - - private final StringMapper mapper; - - private final UserDataService userDataService; - private final UserChargeService userChargeService; - - public UpsertUserChargelogHandler(StringMapper mapper, UserDataService userDataService, UserChargeService userChargeService) { - this.mapper = mapper; - this.userDataService = userDataService; - this.userChargeService = userChargeService; - } - - @Override - public String handle(Map request) throws JsonProcessingException { - String userId = (String) request.get("userId"); - UserData user = userDataService.getUserByExtId(userId).orElseThrow(); - - Map userChargeMap = (Map) request.get("userCharge"); - String chargeId = (String) userChargeMap.get("chargeId"); - UserCharge charge = mapper.convert(userChargeMap, UserCharge.class); - - UserCharge userCharge = userChargeService.getByUserAndChargeId(user, Integer.parseInt(chargeId)).orElseGet(() -> new UserCharge(user)); - userCharge.setChargeId(charge.getChargeId()); - userCharge.setStock(charge.getStock()); - userCharge.setPurchaseDate(charge.getPurchaseDate()); - userCharge.setValidDate(charge.getValidDate()); - userCharge.setParam1(charge.getParam1()); - userCharge.setParam2(charge.getParam2()); - userCharge.setParamDate(charge.getParamDate()); - - userChargeService.save(userCharge); - - String json = mapper.write(new CodeResp(1)); - logger.info("Response: " + json); - return json; - } -} 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 deleted file mode 100644 index d414a6b7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Character.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniCharacter") -@Table(name = "chuni_game_character") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Character implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private long id; - - private String name; - - private String releaseTag; - - private String worksName; - - private String illustratorName; - - private String firstSkillId; - - // Format: level:skillId,level:skillId - // Keep 0 skillId - private String skills; - - private String addImages; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/CharacterSkill.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/CharacterSkill.java deleted file mode 100644 index 2d9a142f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/CharacterSkill.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import lombok.*; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniCharacterSkill") -@Table(name = "chuni_game_skill") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CharacterSkill implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private long id; - - private String name; - - private String category; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Diff.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Diff.java deleted file mode 100644 index 1d756fa8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Diff.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum Diff { - - BASIC("BASIC"), - ADVANCED("ADVANCED"), - EXPERT("EXPERT"), - MASTER("MASTER"), - WE("WORLD'S END"); - - private String displayName; - - Diff(String displayName) { - this.displayName = displayName; - } - - public String displayName() { - return displayName; - } - - @Override - public String toString() { - return displayName; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameCharge.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameCharge.java deleted file mode 100644 index 008ba386..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameCharge.java +++ /dev/null @@ -1,46 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniGameCharge") -@Table(name = "chuni_game_charge") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameCharge implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - private int orderId; - - @Column(unique = true) - private int chargeId; - - private int price; - - private LocalDateTime startDate; - - private LocalDateTime endDate; - - private int salePrice; - - private LocalDateTime saleStartDate; - - private LocalDateTime saleEndDate; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameEvent.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameEvent.java deleted file mode 100644 index bf91b65a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameEvent.java +++ /dev/null @@ -1,37 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniGameEvent") -@Table(name = "chuni_game_event") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameEvent implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private int id; - - private int type; - - private LocalDateTime startDate; - - private LocalDateTime endDate; - - @JsonIgnore - private boolean enable; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameMessage.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameMessage.java deleted file mode 100644 index 2583d69b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/GameMessage.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniGameMessage") -@Table(name = "chuni_game_message") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameMessage implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private int id; - - private int type; - - private String message; - - private LocalDateTime startDate; - - private LocalDateTime endDate; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Genre.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Genre.java deleted file mode 100644 index 46206410..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Genre.java +++ /dev/null @@ -1,33 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public enum Genre { - POPS_ANIME("POPS & ANIME"), - GAME("GAME"), - NICONICO("niconico"), - TOUHOU("東方Project"), - RESERVE2("Reserve2"), - ORIGINAL("Original"), - VARIETY("Variety"), - IRODORI("イロドリミドリ"), - KOTONOHA("言ノ葉Project"), - GEKICHUMA("ゲキマイ"); - - - private String displayName; - - Genre(String displayName) { - this.displayName = displayName; - } - - public String displayName() { - return displayName; - } - - @Override - public String toString() { - return displayName; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Level.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Level.java deleted file mode 100644 index 9e106bfc..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Level.java +++ /dev/null @@ -1,40 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniMusicLevel") -@Table(name = "chuni_music_level") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Level implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "music_id") - private Music music; - - private boolean enable; - - private int level; - - private int levelDecimal; - - private int diff; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Music.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Music.java deleted file mode 100644 index 0b5760d3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/gamedata/Music.java +++ /dev/null @@ -1,43 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.gamedata; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniMusic") -@Table(name = "chuni_music") -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Music implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - private int musicId; - - private String name; - - private String sortName; - - // Copyright info - private String copyright; - - private String artistName; - - private Genre genre; - - private String releaseVersion; - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "music") - @MapKey(name = "diff") - private Map levels; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSetting.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSetting.java deleted file mode 100644 index 9c127f1e..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSetting.java +++ /dev/null @@ -1,21 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.requet; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ClientSetting { - private String placeId; - private String clientId; - private String placeName; - private String regionId; - private String regionName; - private String allNetId; - private String bordId; - private String romVersion; - private String dataVersion; - private String dumpFileNum; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSettingRequest.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSettingRequest.java deleted file mode 100644 index fab337b8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/ClientSettingRequest.java +++ /dev/null @@ -1,12 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.requet; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class ClientSettingRequest { - private ClientSetting clientSetting; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/UpsertUserAll.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/UpsertUserAll.java deleted file mode 100644 index f6161ca2..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/requet/UpsertUserAll.java +++ /dev/null @@ -1,88 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.requet; - -import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.sega.chunithm.model.userdata.*; -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.lang.Nullable; - -import java.io.Serializable; -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UpsertUserAll implements Serializable { - - @Nullable - private List userData; - - @Nullable - private List userGameOption; - - @Nullable - private List userGameOptionEx; - - @Nullable - private List userMapList; - - @Nullable - private List userCharacterList; - - @Nullable - private List userItemList; - - @Nullable - private List userMusicDetailList; - - @Nullable - private List userActivityList; - - @Nullable - private List userRecentRatingList; - - @Nullable - private List userChargeList; - - @Nullable - private List userPlaylogList; - - @Nullable - private List userCourseList; - - @Nullable - private List userDataEx; - - @Nullable - private List userDuelList; - - @Nullable - @JsonProperty("isNewMapList") - private String isNewMapList; - - @Nullable - @JsonProperty("isNewCharacterList") - private String isNewCharacterList; - - @Nullable - @JsonProperty("isNewMusicDetailList") - private String isNewMusicDetailList; - - @Nullable - @JsonProperty("isNewItemList") - private String isNewItemList; - - @Nullable - @JsonProperty("isNewCourseList") - private String isNewCourseList; - - @Nullable - @JsonProperty("isNewDuelList") - private String isNewDuelList; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/CodeResp.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/CodeResp.java deleted file mode 100644 index 90e7845f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/CodeResp.java +++ /dev/null @@ -1,15 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CodeResp { - private int returnCode; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetGameSettingResp.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetGameSettingResp.java deleted file mode 100644 index 77abd88c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetGameSettingResp.java +++ /dev/null @@ -1,22 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response; - -import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.sega.chunithm.model.response.data.GameSetting; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GetGameSettingResp { - - private GameSetting gameSetting; - @JsonProperty("isDumpUpload") - private boolean isDumpUpload; - @JsonProperty("isAou") - private boolean isAou; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetUserPreviewResp.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetUserPreviewResp.java deleted file mode 100644 index aa3a6a0c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/GetUserPreviewResp.java +++ /dev/null @@ -1,40 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response; - -import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharacter; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GetUserPreviewResp { - - private String userId; - @JsonProperty("isLogin") - private boolean isLogin; - private LocalDateTime lastLoginDate; - private String userName; - private int reincarnationNum; - private int level; - private String exp; - private int playerRating; - private String lastGameId; - private String lastRomVersion; - private String lastDataVersion; - private LocalDateTime lastPlayDate; - private int trophyId; - private UserCharacter userCharacter; - private int playerLevel; - private int rating; - private int headphone; - private int chargeState; - private String userNameEx; - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/AllMusicMapItem.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/AllMusicMapItem.java deleted file mode 100644 index 5f8ed7a7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/AllMusicMapItem.java +++ /dev/null @@ -1,8 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response.data; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public class AllMusicMapItem { - -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameRanking.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameRanking.java deleted file mode 100644 index 30fda0a3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameRanking.java +++ /dev/null @@ -1,16 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.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/chunithm/model/response/data/GameSale.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameSale.java deleted file mode 100644 index 1914b5fd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameSale.java +++ /dev/null @@ -1,28 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response.data; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameSale { - - private int orderId; - - private int type; - - private int id; - // should be float number?? - private int rate; - - private LocalDateTime startDate; - - private LocalDateTime endDate; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameSetting.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameSetting.java deleted file mode 100644 index 14a48ca6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/GameSetting.java +++ /dev/null @@ -1,26 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response.data; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class GameSetting { - private int dataVersion; - @JsonProperty("isMaintenance") - private boolean isMaintenance; - private int requestInterval; - private String rebootStartTime; - private String rebootEndTime; - @JsonProperty("isBackgroundDistribute") - private boolean isBackgroundDistribute; - private int maxCountCharacter; - private int maxCountItem; - private int maxCountMusic; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/UserMusicListItem.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/UserMusicListItem.java deleted file mode 100644 index 7fd74ad7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/response/data/UserMusicListItem.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.response.data; - -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMusicDetail; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserMusicListItem { - private int length; - private List userMusicDetailList; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserActivity.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserActivity.java deleted file mode 100644 index 2cb11b79..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserActivity.java +++ /dev/null @@ -1,55 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserActivity") -@Table(name = "chuni_user_activity", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "kind", "activity_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({"kind", "id", "sortNumber", "param1", "param2", "param3", "param4"}) -public class UserActivity implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private int kind; - - @JsonProperty("id") - @Column(name = "activity_id") - private int activityId; - - private int sortNumber; - - private int param1; - - private int param2; - - private int param3; - - private int param4; - - public UserActivity(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharacter.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharacter.java deleted file mode 100644 index 51b67bb3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharacter.java +++ /dev/null @@ -1,60 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserCharacter") -@Table(name = "chuni_user_character", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "character_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({"characterId", "playCount", "level", "skillId", "friendshipExp", "isValid", "isNewMark", "param1", "param2"}) -public class UserCharacter implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "character_id") - private int characterId; - - private int playCount = 0; - - private int level = 1; - - private int skillId = 0; - - private int friendshipExp = 0; - - @JsonProperty("isValid") - private boolean isValid = true; - - @JsonProperty("isNewMark") - private boolean isNewMark = true; - - private int param1 = 0; - - private int param2 = 0; - - public UserCharacter(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharge.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharge.java deleted file mode 100644 index fdc6f2fa..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCharge.java +++ /dev/null @@ -1,54 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserCharge") -@Table(name = "chuni_user_charge", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "charge_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({"chargeId", "stock", "purchaseDate", "validDate", "param1", "param2", "paramDate"}) -public class UserCharge implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "charge_id") - private int chargeId; - - private int stock; - - private LocalDateTime purchaseDate; - - private LocalDateTime validDate; - - private int param1; - - private int param2; - - private LocalDateTime paramDate; - - public UserCharge(UserData user) { - this.user = user; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCourse.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCourse.java deleted file mode 100644 index 47746797..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserCourse.java +++ /dev/null @@ -1,74 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserCourse") -@Table(name = "chuni_user_course", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "course_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserCourse { - - @Id - @JsonIgnore - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "course_id") - private int courseId; - - private int classId; - - private int playCount; - - private int scoreMax; - - @JsonProperty("isFullCombo") - private boolean isFullCombo; - - @JsonProperty("isAllJustice") - private boolean isAllJustice; - - @JsonProperty("isSuccess") - private boolean isSuccess; - - private int scoreRank; - - private int eventId; - - private LocalDateTime lastPlayDate; - - private int param1; - - private int param2; - - private int param3; - - private int param4; - - @JsonProperty("isClear") - private boolean isClear; - - public UserCourse(UserData userData) { - user = userData; - } - - public UserCourse(int classId) { - this.classId = classId; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserData.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserData.java deleted file mode 100644 index 06058ffe..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserData.java +++ /dev/null @@ -1,188 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import icu.samnyan.aqua.sega.general.model.Card; -import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserData") -@Table(name = "chuni_user_data") -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "accessCode", - "userName", - "isWebJoin", - "webLimitDate", "level", - "reincarnationNum", - "exp", - "point", - "totalPoint", - "playCount", - "multiPlayCount", - "multiWinCount", - "requestResCount", - "acceptResCount", - "successResCount", - "playerRating", - "highestRating", - "nameplateId", - "frameId", - "characterId", - "trophyId", - "playedTutorialBit", - "firstTutorialCancelNum", - "masterTutorialCancelNum", - "totalRepertoireCount", - "totalMapNum", - "totalHiScore", - "totalBasicHighScore", - "totalAdvancedHighScore", - "totalExpertHighScore", - "totalMasterHighScore", - "eventWatchedDate", - "friendCount", - "isMaimai", - "firstGameId", - "firstRomVersion", - "firstDataVersion", - "firstPlayDate", - "lastGameId", - "lastRomVersion", - "lastDataVersion", - "lastPlayDate", - "lastPlaceId", - "lastPlaceName", - "lastRegionId", - "lastRegionName", - "lastAllNetId", - "lastClientId"}) -public class UserData implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonSerialize(using = AccessCodeSerializer.class) - @JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY) - @OneToOne - @JoinColumn(name = "card_id") - private Card card; - // Access code in card - - private String userName; - - private LocalDateTime lastLoginDate; - - @JsonProperty("isWebJoin") - private boolean isWebJoin; - - private String webLimitDate; - - private int level; - - private int reincarnationNum; - - private String exp; - - private long point; - - private long totalPoint; - - private int playCount; - - private int multiPlayCount; - - private int multiWinCount; - - private int requestResCount; - - private int acceptResCount; - - private int successResCount; - - private int playerRating; - - private int highestRating; - - private int nameplateId; - - private int frameId; - - // Currently selected UserCharacter - private int characterId; - - private int trophyId; - - private int playedTutorialBit; - - private int firstTutorialCancelNum; - - private int masterTutorialCancelNum; - - private int totalRepertoireCount; - - private int totalMapNum; - - private long totalHiScore; - - private long totalBasicHighScore; - - private long totalAdvancedHighScore; - - private long totalExpertHighScore; - - private long totalMasterHighScore; - - private LocalDateTime eventWatchedDate; - - private int friendCount; - - @JsonProperty("isMaimai") - private boolean isMaimai; - - private String firstGameId; - - private String firstRomVersion; - - private String firstDataVersion; - - private LocalDateTime firstPlayDate; - - private String lastGameId; - - private String lastRomVersion; - - private String lastDataVersion; - - private LocalDateTime lastPlayDate; - - private int lastPlaceId; - - private String lastPlaceName; - - private String lastRegionId; - - private String lastRegionName; - - private String lastAllNetId; - - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private String lastClientId; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDataEx.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDataEx.java deleted file mode 100644 index a0688de7..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDataEx.java +++ /dev/null @@ -1,142 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserDataEx") -@Table(name = "chuni_user_data_ex") -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "compatibleCmVersion", - "medal", - "mapIconId", - "voiceId", - "ext1", - "ext2", - "ext3", - "ext4", - "ext5", - "ext6", - "ext7", - "ext8", - "ext9", - "ext10", - "ext11", - "ext12", - "ext13", - "ext14", - "ext15", - "ext16", - "ext17", - "ext18", - "ext19", - "ext20", - "extStr1", - "extStr2", - "extStr3", - "extStr4", - "extStr5", - "extLong1", - "extLong2", - "extLong3", - "extLong4", - "extLong5" -}) -public class UserDataEx implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private String compatibleCmVersion; - - private int medal; - - private int mapIconId; - - private int voiceId; - - private int ext1; - - private int ext2; - - private int ext3; - - private int ext4; - - private int ext5; - - private int ext6; - - private int ext7; - - private int ext8; - - private int ext9; - - private int ext10; - - private int ext11; - - private int ext12; - - private int ext13; - - private int ext14; - - private int ext15; - - private int ext16; - - private int ext17; - - private int ext18; - - private int ext19; - - private int ext20; - - private String extStr1; - - private String extStr2; - - private String extStr3; - - private String extStr4; - - private String extStr5; - - private long extLong1; - - private long extLong2; - - private long extLong3; - - private long extLong4; - - private long extLong5; - - - public UserDataEx(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDuel.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDuel.java deleted file mode 100644 index 3d3acea8..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserDuel.java +++ /dev/null @@ -1,55 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserDuel") -@Table(name = "chuni_user_duel", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "duel_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserDuel { - - @Id - @JsonIgnore - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "duel_id") - private int duelId; - - private int progress; - - private int point; - - @JsonProperty("isClear") - private boolean isClear; - - private LocalDateTime lastPlayDate; - - private int param1; - - private int param2; - - private int param3; - - private int param4; - - public UserDuel(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOption.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOption.java deleted file mode 100644 index fcfb2d21..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOption.java +++ /dev/null @@ -1,106 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserGameOption") -@Table(name = "chuni_user_game_option") -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "bgInfo", - "fieldColor", - "guideSound", - "soundEffect", - "guideLine", - "speed", - "optionSet", - "matching", - "judgePos", - "rating", - "judgeJustice", - "judgeAttack", - "headphone", - "playerLevel", - "successTap", - "successExTap", - "successSlideHold", - "successAir", - "successFlick", - "successSkill", - "successTapTimbre", - "privacy" -}) -public class UserGameOption implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @JsonIgnore - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private int bgInfo; - - private int fieldColor; - - private int guideSound; - - private int soundEffect; - - private int guideLine; - - private int speed; - - private int optionSet; - - private int matching; - - private int judgePos; - - private int rating; - - private int judgeJustice; - - private int judgeAttack; - - private int headphone; - - private int playerLevel; - - private int successTap; - - private int successExTap; - - private int successSlideHold; - - private int successAir; - - private int successFlick; - - private int successSkill; - - private int successTapTimbre; - - private int privacy; - - - public UserGameOption(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOptionEx.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOptionEx.java deleted file mode 100644 index 00b67836..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGameOptionEx.java +++ /dev/null @@ -1,100 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserGameOptionEx") -@Table(name = "chuni_user_game_option_ex") -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "ext1", - "ext2", - "ext3", - "ext4", - "ext5", - "ext6", - "ext7", - "ext8", - "ext9", - "ext10", - "ext11", - "ext12", - "ext13", - "ext14", - "ext15", - "ext16", - "ext17", - "ext18", - "ext19", - "ext20" -}) -public class UserGameOptionEx implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private int ext1; - - private int ext2; - - private int ext3; - - private int ext4; - - private int ext5; - - private int ext6; - - private int ext7; - - private int ext8; - - private int ext9; - - private int ext10; - - private int ext11; - - private int ext12; - - private int ext13; - - private int ext14; - - private int ext15; - - private int ext16; - - private int ext17; - - private int ext18; - - private int ext19; - - private int ext20; - - - public UserGameOptionEx(UserData userData) { - user = userData; - } -} 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 deleted file mode 100644 index 784cb47a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserGeneralData.java +++ /dev/null @@ -1,44 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * This is for storing the other data that doesn't need to save it in a separate table - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserGeneralData") -@Table(name = "chuni_user_general_data") -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserGeneralData implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private String propertyKey; - - @Column(columnDefinition = "TEXT") - private String propertyValue; - - public UserGeneralData(UserData userData, String key) { - this.user = userData; - this.propertyKey = key; - this.propertyValue = ""; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserItem.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserItem.java deleted file mode 100644 index 89cb7939..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserItem.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserItem") -@Table(name = "chuni_user_item", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "item_id", "item_kind"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({"itemKind", "itemId", "stock", "isValid"}) -public class UserItem implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - // Kind ,Type - @Column(name = "item_kind") - private int itemKind; - - @Column(name = "item_id") - private int itemId; - - private int stock = 1; - - @JsonProperty("isValid") - private boolean isValid = true; - - public UserItem(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMap.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMap.java deleted file mode 100644 index 7aa93b01..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMap.java +++ /dev/null @@ -1,70 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserMap") -@Table(name = "chuni_user_map", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "map_id"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "mapId", - "position", - "isClear", - "areaId", - "routeNumber", - "eventId", - "rate", - "statusCount", - "isValid" -}) -public class UserMap implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "map_id") - private int mapId; - - private int position; - - @JsonProperty("isClear") - private boolean isClear; - - private int areaId; - - private int routeNumber; - - private int eventId; - - private int rate; - - private int statusCount; - - @JsonProperty("isValid") - private boolean isValid; - - public UserMap(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMusicDetail.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMusicDetail.java deleted file mode 100644 index f0a29a53..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserMusicDetail.java +++ /dev/null @@ -1,113 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserMusicDetail") -@Table(name = "chuni_user_music_detail", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "music_id", "level"})}) -@Data -@NoArgsConstructor -@AllArgsConstructor -@JsonPropertyOrder({ - "musicId", - "level", - "playCount", - "scoreMax", - "resRequestCount", - "resAcceptCount", - "resSuccessCount", - "missCount", - "maxComboCount", - "isFullCombo", - "isAllJustice", - "isSuccess", - "fullChain", - "maxChain", - "scoreRank", - "isLock" -}) -public class UserMusicDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - @Column(name = "music_id") - private int musicId; - - private int level; - - private int playCount; - - private int scoreMax; - - private int resRequestCount; - - private int resAcceptCount; - - private int resSuccessCount; - - private int missCount; - - private int maxComboCount; - - @JsonProperty("isFullCombo") - private boolean isFullCombo; - - @JsonProperty("isAllJustice") - private boolean isAllJustice; - - @JsonProperty("isSuccess") - private boolean isSuccess; - - private int fullChain; - - private int maxChain; - - private int scoreRank; - - @JsonProperty("isLock") - private boolean isLock; - - - public UserMusicDetail(UserData userData) { - user = userData; - } - - public UserMusicDetail(int musicId, int level, int playCount, int scoreMax, int resRequestCount, int resAcceptCount, int resSuccessCount, int missCount, int maxComboCount, boolean isFullCombo, boolean isAllJustice, boolean isSuccess, int fullChain, int maxChain, int scoreRank, boolean isLock) { - this.musicId = musicId; - this.level = level; - this.playCount = playCount; - this.scoreMax = scoreMax; - this.resRequestCount = resRequestCount; - this.resAcceptCount = resAcceptCount; - this.resSuccessCount = resSuccessCount; - this.missCount = missCount; - this.maxComboCount = maxComboCount; - this.isFullCombo = isFullCombo; - this.isAllJustice = isAllJustice; - this.isSuccess = isSuccess; - this.fullChain = fullChain; - this.maxChain = maxChain; - this.scoreRank = scoreRank; - this.isLock = isLock; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserPlaylog.java deleted file mode 100644 index ae9d74e0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/model/userdata/UserPlaylog.java +++ /dev/null @@ -1,147 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.model.userdata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import jakarta.persistence.*; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Entity(name = "ChuniUserPlaylog") -@Table(name = "chuni_user_playlog") -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserPlaylog implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @JsonIgnore - private long id; - - @JsonIgnore - @ManyToOne - @JoinColumn(name = "user_id") - private UserData user; - - private int orderId; - - private int sortNumber; - - private int placeId; - - private LocalDateTime playDate; - - private LocalDateTime userPlayDate; - - private int musicId; - - private int level; - - private int customId; - - private int playedUserId1; - - private int playedUserId2; - - private int playedUserId3; - - private String playedUserName1; - - private String playedUserName2; - - private String playedUserName3; - - private int playedMusicLevel1; - - private int playedMusicLevel2; - - private int playedMusicLevel3; - - private int playedCustom1; - - private int playedCustom2; - - private int playedCustom3; - - private int track; - - private int score; - - @Column(name = "\"rank\"") - private int rank; - - private int maxCombo; - - private int maxChain; - - private int rateTap; - - private int rateHold; - - private int rateSlide; - - private int rateAir; - - private int rateFlick; - - private int judgeGuilty; - - private int judgeAttack; - - private int judgeJustice; - - private int judgeCritical; - - private int eventId; - - private int playerRating; - - @JsonProperty("isNewRecord") - private boolean isNewRecord; - - @JsonProperty("isFullCombo") - private boolean isFullCombo; - - private int fullChainKind; - - @JsonProperty("isAllJustice") - private boolean isAllJustice; - - @JsonProperty("isContinue") - private boolean isContinue; - - @JsonProperty("isFreeToPlay") - private boolean isFreeToPlay; - - private int characterId; - - private int skillId; - - private int playKind; - - @JsonProperty("isClear") - private boolean isClear; - - private int skillLevel; - - private int skillEffect; - - private String placeName; - - @JsonProperty("isMaimai") - private boolean isMaimai; - - - public UserPlaylog(UserData userData) { - user = userData; - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/GameMusicService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/GameMusicService.java deleted file mode 100644 index c0617dcd..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/GameMusicService.java +++ /dev/null @@ -1,37 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.gamedata.GameMusicRepository; -import icu.samnyan.aqua.sega.chunithm.model.gamedata.Music; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class GameMusicService { - - private final GameMusicRepository gameMusicRepository; - - @Autowired - public GameMusicService(GameMusicRepository gameMusicRepository) { - this.gameMusicRepository = gameMusicRepository; - } - - @Cacheable("music") - public List getAll() { - return gameMusicRepository.findAll(); - } - - public Map getIdMap() { - Map musicMap = new LinkedHashMap<>(); - getAll().forEach(music -> musicMap.put(music.getMusicId(), music)); - return musicMap; - } -} 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 deleted file mode 100644 index 3cba1438..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserActivityService.java +++ /dev/null @@ -1,44 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserActivityRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserActivity; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -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 -public class UserActivityService { - - private final UserActivityRepository userActivityRepository; - - @Autowired - public UserActivityService(UserActivityRepository userActivityRepository) { - this.userActivityRepository = userActivityRepository; - } - - public UserActivity save(UserActivity userActivity) { - return userActivityRepository.save(userActivity); - } - - public List saveAll(List userActivityList) { - return userActivityRepository.saveAll(userActivityList); - } - - public Optional getByUserAndActivityIdAndKind(UserData user, int activityId, int kind) { - return userActivityRepository.findTopByUserAndActivityIdAndKindOrderByIdDesc(user, activityId, kind); - } - - public List getAllByUserIdAndKind(String userId, String kind) { - return userActivityRepository.findAllByUser_Card_ExtIdAndKindOrderBySortNumberDesc(Long.parseLong(userId), Integer.parseInt(kind)); - } - - public List getByUserId(String 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 deleted file mode 100644 index db8efeb0..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCharacterService.java +++ /dev/null @@ -1,49 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserCharacterRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharacter; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -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 -public class UserCharacterService { - - private final UserCharacterRepository userCharacterRepository; - - @Autowired - public UserCharacterService(UserCharacterRepository 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(UserData user, int characterId) { - return userCharacterRepository.findTopByUserAndCharacterIdOrderByIdDesc(user, 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 deleted file mode 100644 index 2f13f1db..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserChargeService.java +++ /dev/null @@ -1,39 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserChargeRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCharge; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class UserChargeService { - - private final UserChargeRepository userChargeRepository; - - public UserChargeService(UserChargeRepository 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(UserData user, int chargeId) { - return userChargeRepository.findByUserAndChargeId(user, 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 deleted file mode 100644 index 4df29de3..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserCourseService.java +++ /dev/null @@ -1,48 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserCourseRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserCourse; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -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 -public class UserCourseService { - - private final UserCourseRepository userCourseRepository; - - @Autowired - public UserCourseService(UserCourseRepository 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); - } - - public Optional getByUserAndCourseId(UserData user, int courseId) { - return userCourseRepository.findTopByUserAndCourseIdOrderByIdDesc(user, 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 deleted file mode 100644 index b1d82b86..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataExService.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserDataExRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserDataEx; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class UserDataExService { - - private final UserDataExRepository userDataExRepository; - - @Autowired - public UserDataExService(UserDataExRepository userDataExRepository) { - this.userDataExRepository = userDataExRepository; - } - - public UserDataEx save(UserDataEx userDataEx) { - return userDataExRepository.save(userDataEx); - } - - public Optional getByUser(UserData user) { - return userDataExRepository.findByUser(user); - } - - public Optional getByExtId(String 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 deleted file mode 100644 index d0e50e35..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDataService.java +++ /dev/null @@ -1,45 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserDataRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.general.model.Card; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class UserDataService { - - private final UserDataRepository userDataRepository; - - @Autowired - public UserDataService(UserDataRepository userDataRepository) { - this.userDataRepository = userDataRepository; - } - - public UserData saveUserData(UserData userData) { - return userDataRepository.save(userData); - } - - public UserData saveAndFlushUserData(UserData userData) { - return userDataRepository.saveAndFlush(userData); - } - - public Optional getUserByExtId(String aimeId) { - return userDataRepository.findByCard_ExtId(Long.parseLong(aimeId)); - } - - public Optional getUserByCard(Card card) { - return userDataRepository.findByCard(card); - } - - public void updateLoginTime(UserData userData) { - userData.setLastLoginDate(LocalDateTime.now()); - userDataRepository.save(userData); - } -} 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 deleted file mode 100644 index 9250809a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserDuelService.java +++ /dev/null @@ -1,40 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserDuelRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.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 -public class UserDuelService { - - private final UserDuelRepository userDuelRepository; - - @Autowired - public UserDuelService(UserDuelRepository userDuelRepository) { - this.userDuelRepository = userDuelRepository; - } - - public Optional getByUserAndDuelId(UserData user, int duelId) { - return userDuelRepository.findTopByUserAndDuelIdOrderByIdDesc(user, duelId); - } - - public UserDuel save(UserDuel userDuel) { - return userDuelRepository.save(userDuel); - } - - public List saveAll(Iterable userDuel) { - return userDuelRepository.saveAll(userDuel); - } - - public List getByUserId(String 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 deleted file mode 100644 index a6fb25af..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionExService.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserGameOptionExRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGameOptionEx; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class UserGameOptionExService { - - private final UserGameOptionExRepository userGameOptionExRepository; - - @Autowired - public UserGameOptionExService(UserGameOptionExRepository userGameOptionExRepository) { - this.userGameOptionExRepository = userGameOptionExRepository; - } - - public UserGameOptionEx save(UserGameOptionEx userGameOptionEx) { - return userGameOptionExRepository.save(userGameOptionEx); - } - - public Optional getByUser(UserData userData) { - return userGameOptionExRepository.findByUser(userData); - } - - public Optional getByUserId(String 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 deleted file mode 100644 index 76e50642..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGameOptionService.java +++ /dev/null @@ -1,35 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserGameOptionRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.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 -public class UserGameOptionService { - - private final UserGameOptionRepository userGameOptionRepository; - - @Autowired - public UserGameOptionService(UserGameOptionRepository userGameOptionRepository) { - this.userGameOptionRepository = userGameOptionRepository; - } - - public UserGameOption save(UserGameOption userGameOption) { - return userGameOptionRepository.save(userGameOption); - } - - public Optional getByUser(UserData user) { - return userGameOptionRepository.findByUser(user); - } - - public Optional getByUserId(String 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 deleted file mode 100644 index 863e6ee5..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserGeneralDataService.java +++ /dev/null @@ -1,34 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserGeneralDataRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserGeneralData; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service("ChuniUserGeneralDataService") -public class UserGeneralDataService { - - private final UserGeneralDataRepository userGeneralDataRepository; - - public UserGeneralDataService(UserGeneralDataRepository userGeneralDataRepository) { - this.userGeneralDataRepository = userGeneralDataRepository; - } - - public UserGeneralData save(UserGeneralData userGeneralData) { - return userGeneralDataRepository.save(userGeneralData); - } - - public Optional getByUserAndKey(UserData 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/chunithm/service/UserItemService.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java deleted file mode 100644 index 6e8df9a9..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserItemService.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserItemRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserItem; -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 -public class UserItemService { - private final UserItemRepository userItemRepository; - - @Autowired - public UserItemService(UserItemRepository userItemRepository) { - this.userItemRepository = userItemRepository; - } - - public UserItem save(UserItem userItem) { - return userItemRepository.save(userItem); - } - - public List saveAll(Iterable userItem) { - return userItemRepository.saveAll(userItem); - } - - public List getByUserId(String userId) { - return userItemRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); - } - - public Optional getByUserAndItemIdAndKind(UserData user, int itemId, int itemKind) { - return userItemRepository.findTopByUserAndItemIdAndItemKindOrderByIdDesc(user, itemId, itemKind); - } - - public Page getByUserAndItemKind(String userId, int kind, int pageNumber, int maxCount) { - Pageable page = PageRequest.of(pageNumber, maxCount); - return userItemRepository.findAllByUser_Card_ExtIdAndItemKind(Long.parseLong(userId), kind, page); - } - - public Page getByUserId(String userId, int page, int 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 deleted file mode 100644 index bb287028..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMapService.java +++ /dev/null @@ -1,44 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserMapRepository; -import icu.samnyan.aqua.sega.chunithm.model.userdata.UserData; -import icu.samnyan.aqua.sega.chunithm.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 -public class UserMapService { - - private final UserMapRepository userMapRepository; - - @Autowired - public UserMapService(UserMapRepository userMapRepository) { - this.userMapRepository = userMapRepository; - } - - public UserMap save(UserMap userMap) { - return userMapRepository.save(userMap); - } - - public List saveAll(Iterable userMap) { - return userMapRepository.saveAll(userMap); - } - - public List getByUser(UserData user) { - return userMapRepository.findAllByUser(user); - } - - public List getByUserId(String userId) { - return userMapRepository.findAllByUser_Card_ExtId(Long.parseLong(userId)); - } - - public Optional getByUserAndMapId(UserData user, int mapId) { - return userMapRepository.findTopByUserAndMapIdOrderByIdDesc(user, 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 deleted file mode 100644 index 2ca0d1c6..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserMusicDetailService.java +++ /dev/null @@ -1,50 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserMusicDetailRepository; -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.Pageable; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Service -public class UserMusicDetailService { - - private final UserMusicDetailRepository userMusicDetailRepository; - - @Autowired - public UserMusicDetailService(UserMusicDetailRepository userMusicDetailRepository) { - this.userMusicDetailRepository = userMusicDetailRepository; - } - - public UserMusicDetail save(UserMusicDetail userMusicDetail) { - return userMusicDetailRepository.save(userMusicDetail); - } - - public List saveAll(Iterable userMusicDetail) { - return userMusicDetailRepository.saveAll(userMusicDetail); - } - - 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); - } - - public Optional getByUserAndMusicIdAndLevel(UserData user, int musicId, int level) { - return userMusicDetailRepository.findTopByUserAndMusicIdAndLevelOrderByIdDesc(user, musicId, 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 deleted file mode 100644 index 2b945f8b..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/service/UserPlaylogService.java +++ /dev/null @@ -1,51 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.service; - -import icu.samnyan.aqua.sega.chunithm.dao.userdata.UserPlaylogRepository; -import icu.samnyan.aqua.sega.chunithm.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 -public class UserPlaylogService { - - private final UserPlaylogRepository userPlaylogRepository; - - @Autowired - public UserPlaylogService(UserPlaylogRepository userPlaylogRepository) { - this.userPlaylogRepository = userPlaylogRepository; - } - - public UserPlaylog save(UserPlaylog userPlaylog) { - return userPlaylogRepository.save(userPlaylog); - } - - public List saveAll(List userPlaylogList) { - return userPlaylogRepository.saveAll(userPlaylogList); - } - - public Page getRecentPlays(String userId, Pageable 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(Long.parseLong(userId), 4, page); - } - - public List getByUserId(String userId) { - return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId)); - } - - public List getByUserIdAndMusicIdAndLevel(String userId, int id, int level) { - return userPlaylogRepository.findByUser_Card_ExtIdAndMusicIdAndLevel(Long.parseLong(userId), id, level); - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.java index 0da2d875..8d7fba8c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.java @@ -5,8 +5,7 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler; import icu.samnyan.aqua.sega.diva.model.gamedata.Contest; import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; import icu.samnyan.aqua.sega.diva.model.response.databank.ContestInfoResponse; -import icu.samnyan.aqua.sega.diva.util.DivaMapper; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.java index bbe9e7c4..3f0aea40 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.java @@ -6,8 +6,7 @@ import icu.samnyan.aqua.sega.diva.model.gamedata.DivaCustomize; import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; import icu.samnyan.aqua.sega.diva.model.response.databank.CstmzItmCtlgResponse; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; -import icu.samnyan.aqua.sega.diva.util.DivaMapper; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.java index cad23cef..87c4b7c1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.java @@ -8,8 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.common.collection.PsRankingCollection; import icu.samnyan.aqua.sega.diva.model.request.databank.PsRankingRequest; import icu.samnyan.aqua.sega.diva.model.response.databank.PsRankingResponse; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvRecord; -import icu.samnyan.aqua.sega.diva.util.DivaMapper; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.java index c4e0426e..5924705b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.java @@ -6,8 +6,7 @@ import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.gamedata.PvEntry; import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; import icu.samnyan.aqua.sega.diva.model.response.databank.PvListResponse; -import icu.samnyan.aqua.sega.diva.util.DivaMapper; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.java b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.java index 2d478d87..de885a5d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.java @@ -5,8 +5,7 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler; import icu.samnyan.aqua.sega.diva.model.gamedata.DivaModule; import icu.samnyan.aqua.sega.diva.model.request.BaseRequest; import icu.samnyan.aqua.sega.diva.model.response.databank.ShopCatalogResponse; -import icu.samnyan.aqua.sega.diva.util.DivaMapper; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 c8e1816b..64a7b253 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 @@ -12,8 +12,7 @@ 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; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java index 15ec7675..c02bc310 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/common/collection/FestaCollection.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.model.common.collection; import icu.samnyan.aqua.sega.diva.model.gamedata.Festa; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.Data; import java.util.List; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java index 9605925c..3f448410 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.common.ContestLeague; import icu.samnyan.aqua.sega.diva.model.common.ContestNormaType; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java index 5f3e113c..21b771b1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java index 92b4d684..e3bd9a15 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java index db75d6b7..5f39f8e9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java @@ -1,7 +1,7 @@ package icu.samnyan.aqua.sega.diva.model.response.operation; import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; -import icu.samnyan.aqua.sega.util.URIEncoder; +import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaDateTimeUtil.java b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaDateTimeUtil.java index 6ae4ed58..1107bb44 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaDateTimeUtil.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaDateTimeUtil.java @@ -1,7 +1,5 @@ package icu.samnyan.aqua.sega.diva.util; -import icu.samnyan.aqua.sega.util.URIEncoder; - import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/util/URIEncoder.kt b/src/main/java/icu/samnyan/aqua/sega/diva/util/URIEncoder.kt new file mode 100644 index 00000000..66ee8684 --- /dev/null +++ b/src/main/java/icu/samnyan/aqua/sega/diva/util/URIEncoder.kt @@ -0,0 +1,12 @@ +package icu.samnyan.aqua.sega.diva.util + +import java.net.URLEncoder +import java.nio.charset.StandardCharsets + +/** + * @author samnyan (privateamusement@protonmail.com) + */ +object URIEncoder { + @JvmStatic + fun encode(str: String) = URLEncoder.encode(str, StandardCharsets.UTF_8).replace("\\+".toRegex(), "%20") +} \ No newline at end of file diff --git a/src/main/java/icu/samnyan/aqua/sega/general/service/ClientSettingService.java b/src/main/java/icu/samnyan/aqua/sega/general/service/ClientSettingService.java deleted file mode 100644 index 6b789310..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/general/service/ClientSettingService.java +++ /dev/null @@ -1,42 +0,0 @@ -package icu.samnyan.aqua.sega.general.service; - -import icu.samnyan.aqua.sega.general.dao.GameVersionRepository; -import icu.samnyan.aqua.sega.general.model.GameVersion; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.Optional; - -import static icu.samnyan.aqua.sega.util.AquaConst.DEFAULT_KEYCHIP_ID; - -@Service -public class ClientSettingService { - - private final GameVersionRepository gameVersionRepository; - - public ClientSettingService(GameVersionRepository gameVersionRepository) { - this.gameVersionRepository = gameVersionRepository; - } - - public void writeSetting(GameVersion setting) { - gameVersionRepository.save(setting); - } - - public Optional getSetting(String serial) { - if (serial.equals(DEFAULT_KEYCHIP_ID)) { - return Optional.empty(); - } - try { - var vo = gameVersionRepository.findByUuid(serial); - if (vo.isPresent()) { - var v = vo.get(); - v.setLastTime(LocalDateTime.now()); - gameVersionRepository.save(v); - return Optional.of(v); - } - return Optional.empty(); - } catch (Exception e) { - return Optional.empty(); - } - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/util/AquaConst.java b/src/main/java/icu/samnyan/aqua/sega/util/AquaConst.java deleted file mode 100644 index bc5de58f..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/util/AquaConst.java +++ /dev/null @@ -1,8 +0,0 @@ -package icu.samnyan.aqua.sega.util; - -public class AquaConst { - public static String SERIAL_KEY = "CLIENT_ID"; - public static String VERSION_KEY = "ROM_VERSION"; - public static String CHUNI_DEFAULT_VERSION = "1.30"; - public static String DEFAULT_KEYCHIP_ID = "A69E01A8888"; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/util/URIEncoder.java b/src/main/java/icu/samnyan/aqua/sega/util/URIEncoder.java deleted file mode 100644 index 8916984c..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/util/URIEncoder.java +++ /dev/null @@ -1,14 +0,0 @@ -package icu.samnyan.aqua.sega.util; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -public class URIEncoder { - - public static String encode(String str) { - return URLEncoder.encode(str, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); - } -} diff --git a/src/main/java/icu/samnyan/aqua/sega/util/VersionInfo.java b/src/main/java/icu/samnyan/aqua/sega/util/VersionInfo.java deleted file mode 100644 index dd4afb97..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/util/VersionInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.util; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author sam_nya (privateamusement@protonmail.com) - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class VersionInfo { - private Integer majorVersion; - private Integer minorVersion; - private Integer releaseVersion; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/util/VersionUtil.java b/src/main/java/icu/samnyan/aqua/sega/util/VersionUtil.java deleted file mode 100644 index 49a13069..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/util/VersionUtil.java +++ /dev/null @@ -1,45 +0,0 @@ -package icu.samnyan.aqua.sega.util; - -public class VersionUtil { - - public static VersionInfo parseVersion(String version) { - var vs = version.split("\\."); - try { - VersionInfo v = new VersionInfo(); - if (vs.length > 0) { - v.setMajorVersion(Integer.parseInt(vs[0])); - } - if (vs.length > 1) { - v.setMinorVersion(Integer.parseInt(vs[1])); - } - if (vs.length > 2) { - v.setReleaseVersion(Integer.parseInt(vs[2])); - } - return v; - } catch (Exception e) { - return new VersionInfo(0, 0, 0); - } - - } - - public static String getTargetVersion(String savedVersion, String currentVersion) { - var v1s = savedVersion.split("\\."); - var v2s = currentVersion.split("\\."); - try { - for (int i = 0; i < v1s.length; i++) { - int v1n = Integer.parseInt(v1s[i]); - int v2n = Integer.parseInt(v2s[i]); - if (v1n > v2n) { - return currentVersion; - } - if (v1n < v2n) { - return savedVersion; - } - } - // if all same - return savedVersion; - } catch (Exception e) { - return savedVersion; - } - } -}