From 13b4af373416252e01713d0b124be30df9ce68f0 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 16 Mar 2024 19:10:22 -0400 Subject: [PATCH] [M] Move files --- .../icu/samnyan/aqua/net/CardController.kt | 4 +- .../aqua/net/{utils => games}/GameHelper.kt | 39 +------------------ .../java/icu/samnyan/aqua/net/games/Models.kt | 34 ++++++++++++++++ .../dao/userdata/UserDataRepository.java | 3 +- .../dao/userdata/UserPlaylogRepository.java | 2 +- .../sega/chusan/model/userdata/UserData.java | 2 +- .../chusan/model/userdata/UserPlaylog.java | 4 +- .../dao/userdata/UserDataRepository.kt | 2 +- .../dao/userdata/UserPlaylogRepository.java | 2 +- .../sega/maimai2/model/userdata/UserDetail.kt | 2 +- .../maimai2/model/userdata/UserPlaylog.java | 3 +- .../ongeki/dao/userdata/UserDataRepository.kt | 3 +- .../dao/userdata/UserPlaylogRepository.kt | 2 +- .../sega/ongeki/model/userdata/UserData.java | 2 +- .../ongeki/model/userdata/UserPlaylog.java | 3 +- 15 files changed, 49 insertions(+), 58 deletions(-) rename src/main/java/icu/samnyan/aqua/net/{utils => games}/GameHelper.kt (75%) diff --git a/src/main/java/icu/samnyan/aqua/net/CardController.kt b/src/main/java/icu/samnyan/aqua/net/CardController.kt index 3afffef8..ad9396ca 100644 --- a/src/main/java/icu/samnyan/aqua/net/CardController.kt +++ b/src/main/java/icu/samnyan/aqua/net/CardController.kt @@ -4,8 +4,8 @@ import ext.* import icu.samnyan.aqua.net.components.JWT import icu.samnyan.aqua.net.db.AquaUserServices import icu.samnyan.aqua.net.utils.AquaNetProps -import icu.samnyan.aqua.net.utils.GenericUserDataRepo -import icu.samnyan.aqua.net.utils.IGenericUserData +import icu.samnyan.aqua.net.games.GenericUserDataRepo +import icu.samnyan.aqua.net.games.IGenericUserData import icu.samnyan.aqua.net.utils.SUCCESS import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.general.model.Card diff --git a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt b/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt similarity index 75% rename from src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt rename to src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt index cb7c8f39..244c6cc6 100644 --- a/src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt @@ -1,14 +1,8 @@ -package icu.samnyan.aqua.net.utils +package icu.samnyan.aqua.net.games import ext.isoDate import ext.minus -import icu.samnyan.aqua.net.games.GameApiController -import icu.samnyan.aqua.net.games.GenericGameSummary -import icu.samnyan.aqua.net.games.RankCount -import icu.samnyan.aqua.net.games.TrendOut import icu.samnyan.aqua.sega.general.model.Card -import org.springframework.data.jpa.repository.JpaRepository -import org.springframework.data.repository.NoRepositoryBean import java.time.LocalDate import java.util.* @@ -46,37 +40,6 @@ fun findTrend(log: List): List { return trend } -// Here are some interfaces to generalize across multiple games -interface IGenericUserData { - val userName: String - val iconId: Int - val playerRating: Int - val highestRating: Int - val firstPlayDate: Any - val lastPlayDate: Any - val lastRomVersion: String - val totalScore: Long - var card: Card? -} - -@NoRepositoryBean -interface GenericUserDataRepo : JpaRepository { - fun findByCard(card: Card): T? - fun getRanking(rating: Int): Long -} - -interface IGenericGamePlaylog { - val musicId: Int - val level: Int - val userPlayDate: Any - val achievement: Int - val maxCombo: Int - val isFullCombo: Boolean - val beforeRating: Int - val afterRating: Int - val isAllPerfect: Boolean -} - interface GenericPlaylogRepo { fun findByUserCardExtId(extId: Long): List fun findById(id: Long): Optional diff --git a/src/main/java/icu/samnyan/aqua/net/games/Models.kt b/src/main/java/icu/samnyan/aqua/net/games/Models.kt index 31d0f265..c8becd39 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/Models.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/Models.kt @@ -2,7 +2,10 @@ package icu.samnyan.aqua.net.games import ext.* import icu.samnyan.aqua.net.utils.* +import icu.samnyan.aqua.sega.general.model.Card import kotlinx.serialization.Serializable +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.repository.NoRepositoryBean import kotlin.jvm.optionals.getOrNull data class TrendOut(val date: String, val rating: Int, val plays: Int) @@ -61,6 +64,37 @@ data class GenericNoteMeta( val lvId: Int ) +// Here are some interfaces to generalize across multiple games +interface IGenericUserData { + val userName: String + val iconId: Int + val playerRating: Int + val highestRating: Int + val firstPlayDate: Any + val lastPlayDate: Any + val lastRomVersion: String + val totalScore: Long + var card: Card? +} + +@NoRepositoryBean +interface GenericUserDataRepo : JpaRepository { + fun findByCard(card: Card): T? + fun getRanking(rating: Int): Long +} + +interface IGenericGamePlaylog { + val musicId: Int + val level: Int + val userPlayDate: Any + val achievement: Int + val maxCombo: Int + val isFullCombo: Boolean + val beforeRating: Int + val afterRating: Int + val isAllPerfect: Boolean +} + abstract class GameApiController(name: String) { val musicMapping: Map = GameApiController::class.java .getResourceAsStream("/meta/$name/music.json") diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java index 753bd60d..c51c6853 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java @@ -1,9 +1,8 @@ package icu.samnyan.aqua.sega.chusan.dao.userdata; -import icu.samnyan.aqua.net.utils.GenericUserDataRepo; +import icu.samnyan.aqua.net.games.GenericUserDataRepo; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.general.model.Card; -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java index 53e200c7..e88eea89 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.userdata; -import icu.samnyan.aqua.net.utils.GenericPlaylogRepo; +import icu.samnyan.aqua.net.games.GenericPlaylogRepo; import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java index db2200ab..342f03e8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import icu.samnyan.aqua.net.utils.IGenericUserData; +import icu.samnyan.aqua.net.games.IGenericUserData; import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney; import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java index dc0ebd5e..c7259254 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java @@ -2,16 +2,14 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.net.utils.IGenericGamePlaylog; +import icu.samnyan.aqua.net.games.IGenericGamePlaylog; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; import java.io.Serializable; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; /** * @author samnyan (privateamusement@protonmail.com) diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt index 6d47e5e3..9472b614 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.maimai2.dao.userdata -import icu.samnyan.aqua.net.utils.GenericUserDataRepo +import icu.samnyan.aqua.net.games.GenericUserDataRepo import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail import org.springframework.data.jpa.repository.Query diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java index dce766f0..42348654 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.maimai2.dao.userdata; -import icu.samnyan.aqua.net.utils.GenericPlaylogRepo; +import icu.samnyan.aqua.net.games.GenericPlaylogRepo; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserPlaylog; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt index b61b8bf9..a13cbfc8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.annotation.JsonSerialize import ext.Str -import icu.samnyan.aqua.net.utils.IGenericUserData +import icu.samnyan.aqua.net.games.IGenericUserData import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.maimai2.util.IntegerListConverter import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java index 7c98d9d4..16d194d5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java @@ -2,13 +2,12 @@ package icu.samnyan.aqua.sega.maimai2.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.net.utils.IGenericGamePlaylog; +import icu.samnyan.aqua.net.games.IGenericGamePlaylog; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import jakarta.persistence.*; -import org.jetbrains.annotations.NotNull; import java.io.Serializable; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt index ef343bc0..63dba84f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt @@ -1,9 +1,8 @@ package icu.samnyan.aqua.sega.ongeki.dao.userdata -import icu.samnyan.aqua.net.utils.GenericUserDataRepo +import icu.samnyan.aqua.net.games.GenericUserDataRepo import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData -import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query import org.springframework.stereotype.Repository import org.springframework.transaction.annotation.Transactional diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.kt index 21ffa6ed..757153dd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.kt @@ -1,6 +1,6 @@ package icu.samnyan.aqua.sega.ongeki.dao.userdata -import icu.samnyan.aqua.net.utils.GenericPlaylogRepo +import icu.samnyan.aqua.net.games.GenericPlaylogRepo import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData import icu.samnyan.aqua.sega.ongeki.model.userdata.UserPlaylog import org.springframework.data.domain.Page diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java index c4ee7e6d..1875997a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java @@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import icu.samnyan.aqua.net.utils.IGenericUserData; +import icu.samnyan.aqua.net.games.IGenericUserData; import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer; import lombok.AllArgsConstructor; diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java index 310faff0..a16ac519 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserPlaylog.java @@ -2,13 +2,12 @@ package icu.samnyan.aqua.sega.ongeki.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import icu.samnyan.aqua.net.utils.IGenericGamePlaylog; +import icu.samnyan.aqua.net.games.IGenericGamePlaylog; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import jakarta.persistence.*; -import org.jetbrains.annotations.NotNull; import java.io.Serializable;