lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[O] Refactor maimai2 repositories

pull/23/head
Azalea 2024-03-16 19:50:05 -04:00
parent e07de72fa4
commit 54b1174e1b
32 changed files with 231 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java
View File

@ -232,7 +232,7 @@ public class ApiMaimai2PlayerDataController {
public ReducedPageResponse<UserPlaylog> getRecent(@RequestParam long aimeId,
@RequestParam(required = false, defaultValue = "0") int page,
@RequestParam(required = false, defaultValue = "10") int size) {
Page<UserPlaylog> playlogs = userPlaylogRepository.findByUser_Card_ExtId(aimeId, PageRequest.of(page, size, Sort.Direction.DESC, "id"));
Page<UserPlaylog> playlogs = userPlaylogRepository.findByUserCardExtId(aimeId, PageRequest.of(page, size, Sort.Direction.DESC, "id"));
return new ReducedPageResponse<>(playlogs.getContent(), playlogs.getPageable().getPageNumber(), playlogs.getTotalPages(), playlogs.getTotalElements());
}
@ -303,7 +303,7 @@ public class ApiMaimai2PlayerDataController {
data.setUserItemList(userItemRepository.findByUser_Card_ExtId(aimeId));
data.setUserLoginBonusList(userLoginBonusRepository.findByUser_Card_ExtId(aimeId));
data.setUserMusicDetailList(userMusicDetailRepository.findByUser_Card_ExtId(aimeId));
data.setUserPlaylogList(userPlaylogRepository.findByUser_Card_ExtId(aimeId));
data.setUserPlaylogList(userPlaylogRepository.findByUserCardExtId(aimeId));
data.setMapEncountNpcList(mapEncountNpcRepository.findByUser_Card_ExtId(aimeId));
data.setUserActList(userActRepository.findByUser_Card_ExtId(aimeId));
data.setUserChargeList(userChargeRepository.findByUser_Card_ExtId(aimeId));

4
src/main/java/icu/samnyan/aqua/net/CardController.kt
View File

@ -113,7 +113,7 @@ class CardController(
*
* Assumption: The card is already linked to the user.
*/
suspend fun <T : IGenericUserData> migrateCard(repo: GenericUserDataRepo<T, *>, card: Card): Bool
suspend fun <T : IGenericUserData> migrateCard(repo: GenericUserDataRepo<T>, card: Card): Bool
{
// Check if data already exists in the user's ghost card
async { repo.findByCard(card.aquaUser!!.ghostCard) }?.let {
@ -130,7 +130,7 @@ suspend fun <T : IGenericUserData> migrateCard(repo: GenericUserDataRepo<T, *>,
return true
}
suspend fun getSummaryFor(repo: GenericUserDataRepo<*, *>, card: Card): Map<Str, Any>?
suspend fun getSummaryFor(repo: GenericUserDataRepo<*>, card: Card): Map<Str, Any>?
{
val data = async { repo.findByCard(card) } ?: return null
return mapOf(

8
src/main/java/icu/samnyan/aqua/net/games/Chusan.kt
View File

@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.RestController
@RestController
@API("api/v2/game/chu3")
class Chusan(
val us: AquaUserServices,
override val us: AquaUserServices,
override val playlogRepo: UserPlaylogRepository,
override val userDataRepo: UserDataRepository,
val userGeneralDataRepository: UserGeneralDataRepository
): GameApiController("chu3")
{
override suspend fun trend(@RP username: Str): List<TrendOut> = us.cardByName(username) { card ->
findTrend(playlogRepo.findByUser_Card_ExtId(card.extId)
findTrend(playlogRepo.findByUserCardExtId(card.extId)
.map { TrendLog(it.playDate.toString(), it.playerRating) })
}
@ -39,8 +39,4 @@ class Chusan(
genericUserSummary(card, ratingComposition)
}
override suspend fun recent(@RP username: Str) = us.cardByName(username) { card ->
playlogRepo.findByUser_Card_ExtId(card.extId)
}
}

5
src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt
View File

@ -40,11 +40,6 @@ fun findTrend(log: List<TrendLog>): List<TrendOut> {
return trend
}
interface GenericPlaylogRepo {
fun findByUserCardExtId(extId: Long): List<IGenericGamePlaylog>
fun findById(id: Long): Optional<IGenericGamePlaylog>
}
fun List<IGenericGamePlaylog>.acc() = if (isEmpty()) 0.0 else sumOf { it.achievement }.toDouble() / size / 10000.0
fun GameApiController.genericUserSummary(

12
src/main/java/icu/samnyan/aqua/net/games/Maimai2.kt
View File

@ -5,22 +5,20 @@ import ext.RP
import ext.Str
import icu.samnyan.aqua.net.db.AquaUserServices
import icu.samnyan.aqua.net.utils.*
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserDataRepository
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserGeneralDataRepository
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserPlaylogRepository
import icu.samnyan.aqua.sega.maimai2.dao.userdata.*
import org.springframework.web.bind.annotation.RestController
@RestController
@API("api/v2/game/mai2")
class Maimai2(
val us: AquaUserServices,
override val us: AquaUserServices,
override val playlogRepo: UserPlaylogRepository,
override val userDataRepo: UserDataRepository,
val userGeneralDataRepository: UserGeneralDataRepository
): GameApiController("mai2")
{
override suspend fun trend(@RP username: Str): List<TrendOut> = us.cardByName(username) { card ->
findTrend(playlogRepo.findByUser_Card_ExtId(card.extId)
findTrend(playlogRepo.findByUserCardExtId(card.extId)
.map { TrendLog(it.playDate, it.afterRating) })
}
@ -38,8 +36,4 @@ class Maimai2(
genericUserSummary(card, ratingComposition)
}
override suspend fun recent(@RP username: Str) = us.cardByName(username) { card ->
playlogRepo.findByUser_Card_ExtId(card.extId)
}
}

41
src/main/java/icu/samnyan/aqua/net/games/Models.kt
View File

@ -1,12 +1,14 @@
package icu.samnyan.aqua.net.games
import ext.*
import icu.samnyan.aqua.net.db.AquaUserServices
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.jpa.repository.Query
import org.springframework.data.repository.NoRepositoryBean
import java.util.*
import kotlin.jvm.optionals.getOrNull
data class TrendOut(val date: String, val rating: Int, val plays: Int)
@ -78,14 +80,6 @@ interface IGenericUserData {
var card: Card?
}
@NoRepositoryBean
interface GenericUserDataRepo<T : IGenericUserData, ID> : JpaRepository<T, ID> {
fun findByCard(card: Card): T?
@Query("select count(*) from #{#entityName} where playerRating > :rating")
fun getRanking(rating: Int): Long
}
interface IGenericGamePlaylog {
val musicId: Int
val level: Int
@ -98,6 +92,19 @@ interface IGenericGamePlaylog {
val isAllPerfect: Boolean
}
@NoRepositoryBean
interface GenericUserDataRepo<T : IGenericUserData> : JpaRepository<T, Long> {
fun findByCard(card: Card): T?
@Query("select count(*) from #{#entityName} where playerRating > :rating")
fun getRanking(rating: Int): Long
}
@NoRepositoryBean
interface GenericPlaylogRepo<T: IGenericGamePlaylog> : JpaRepository<T, Long> {
fun findByUserCardExtId(extId: Long): List<T>
}
abstract class GameApiController(name: String) {
val musicMapping: Map<Int, GenericMusicMeta> = GameApiController::class.java
.getResourceAsStream("/meta/$name/music.json")
@ -106,24 +113,26 @@ abstract class GameApiController(name: String) {
?.mapKeys { it.key.toInt() }
?: emptyMap()
abstract val userDataRepo: GenericUserDataRepo<*, *>
abstract val playlogRepo: GenericPlaylogRepo
abstract val us: AquaUserServices
abstract val userDataRepo: GenericUserDataRepo<*>
abstract val playlogRepo: GenericPlaylogRepo<*>
abstract val shownRanks: List<Pair<Int, String>>
@API("trend")
abstract suspend fun trend(@RP username: String): List<TrendOut>
@API("user-summary")
abstract suspend fun userSummary(@RP username: String): GenericGameSummary
@API("recent")
abstract suspend fun recent(@RP username: String): List<IGenericGamePlaylog>
suspend fun recent(@RP username: String): List<IGenericGamePlaylog> = us.cardByName(username) { card ->
playlogRepo.findByUserCardExtId(card.extId)
}
private val rankingCache = mutableMapOf<String, Pair<Long, List<GenericRankingPlayer>>>()
private var rankingCache: Pair<Long, List<GenericRankingPlayer>>? = null
@API("ranking")
fun ranking(): List<GenericRankingPlayer> {
// Read from cache if we just computed it less than 2 minutes ago
val cacheKey = playlogRepo::class.java.name
rankingCache[cacheKey]?.let { (t, r) ->
rankingCache?.let { (t, r) ->
if (millis() - t < 120_000) return r
}
@ -142,7 +151,7 @@ abstract class GameApiController(name: String) {
lastSeen = user.lastPlayDate.toString(),
username = user.card!!.aquaUser?.username ?: "user${user.card!!.id}"
)
}.also { rankingCache[cacheKey] = millis() to it } // Update the cache
}.also { rankingCache = millis() to it } // Update the cache
}
@API("playlog")

6
src/main/java/icu/samnyan/aqua/net/games/Ongeki.kt
View File

@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController
@RestController
@API("api/v2/game/ongeki")
class Ongeki(
val us: AquaUserServices,
override val us: AquaUserServices,
override val playlogRepo: UserPlaylogRepository,
override val userDataRepo: UserDataRepository,
val userGeneralDataRepository: UserGeneralDataRepository
@ -31,8 +31,4 @@ class Ongeki(
genericUserSummary(card, mapOf())
}
override suspend fun recent(username: String) = us.cardByName(username) { card ->
playlogRepo.findByUser_Card_ExtId(card.extId)
}
}

2
src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserDataRepository.java
View File

@ -11,7 +11,7 @@ import java.util.Optional;
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("ChusanUserDataRepository")
public interface UserDataRepository extends GenericUserDataRepo<UserData, Long> {
public interface UserDataRepository extends GenericUserDataRepo<UserData> {
Optional<UserData> findByCard_ExtId(Long extId);
}

7
src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserPlaylogRepository.java
View File

@ -4,7 +4,6 @@ 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;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -13,12 +12,10 @@ import java.util.List;
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("ChusanUserPlaylogRepository")
public interface UserPlaylogRepository extends JpaRepository<UserPlaylog, Long>, GenericPlaylogRepo {
public interface UserPlaylogRepository extends GenericPlaylogRepo<UserPlaylog> {
List<UserPlaylog> findByUser_Card_ExtIdAndLevelNot(Long extId, int levelNot, Pageable page);
Page<UserPlaylog> findByUser_Card_ExtId(Long extId, Pageable page);
Page<UserPlaylog> findByUserCardExtId(Long extId, Pageable page);
List<UserPlaylog> findByUser_Card_ExtIdAndMusicIdAndLevel(Long extId, int musicId, int level);
List<UserPlaylog> findByUser_Card_ExtId(Long extId);
}

4
src/main/java/icu/samnyan/aqua/sega/chusan/service/UserPlaylogService.java
View File

@ -33,7 +33,7 @@ public class UserPlaylogService {
}
public Page<UserPlaylog> getRecentPlays(String userId, Pageable page) {
return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId), page);
return userPlaylogRepository.findByUserCardExtId(Long.parseLong(userId), page);
}
public List<UserPlaylog> getRecent30Plays(String userId) {
@ -42,7 +42,7 @@ public class UserPlaylogService {
}
public List<UserPlaylog> getByUserId(String userId) {
return userPlaylogRepository.findByUser_Card_ExtId(Long.parseLong(userId));
return userPlaylogRepository.findByUserCardExtId(Long.parseLong(userId));
}
public List<UserPlaylog> getByUserIdAndMusicIdAndLevel(String userId, int id, int level) {

30
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/MapEncountNpcRepository.java
View File

@ -1,30 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.MapEncountNpc;
import java.util.List;
import java.util.Optional;
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 org.springframework.transaction.annotation.Transactional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2MapEncountNpcRepository")
public interface MapEncountNpcRepository extends JpaRepository<MapEncountNpc, Long> {
List<MapEncountNpc> findByUser_Card_ExtId(long userId);
Optional<MapEncountNpc> findByUserAndMusicId(UserDetail user, int musicId);
Page<MapEncountNpc> findByUser_Card_ExtIdAndMusicId(long userId, int musicId, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

189
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/Repos.kt 100644
View File

@ -0,0 +1,189 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata
import icu.samnyan.aqua.net.games.GenericPlaylogRepo
import icu.samnyan.aqua.net.games.GenericUserDataRepo
import icu.samnyan.aqua.sega.general.model.Card
import icu.samnyan.aqua.sega.maimai2.model.userdata.*
import org.springframework.data.domain.Page
import org.springframework.data.domain.Pageable
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.data.repository.NoRepositoryBean
import org.springframework.stereotype.Repository
import org.springframework.transaction.annotation.Transactional
import java.util.*
@NoRepositoryBean
interface Deletable {
@Transactional
fun deleteByUser(user: UserDetail)
}
@Repository("Maimai2MapEncountNpcRepository")
interface MapEncountNpcRepository : JpaRepository<MapEncountNpc, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<MapEncountNpc>
fun findByUserAndMusicId(user: UserDetail, musicId: Int): Optional<MapEncountNpc>
fun findByUser_Card_ExtIdAndMusicId(userId: Long, musicId: Int, page: Pageable): Page<MapEncountNpc>
}
@Repository("Maimai2UserActRepository")
interface UserActRepository : JpaRepository<UserAct, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserAct>
fun findByUserAndKindAndActivityId(user: UserDetail, kind: Int, id: Int): Optional<UserAct>
fun findByUser_Card_ExtIdAndKind(userId: Long, kind: Int): List<UserAct>
}
@Repository("Maimai2UserCardRepository")
interface UserCardRepository : JpaRepository<UserCard, Long>, Deletable {
fun findByUserAndCardId(user: UserDetail, cardId: Int): Optional<UserCard>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserCard>
}
@Repository("Maimai2UserCharacterRepository")
interface UserCharacterRepository : JpaRepository<UserCharacter, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserCharacter>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserCharacter>
fun findByUserAndCharacterId(user: UserDetail, characterId: Int): Optional<UserCharacter>
}
@Repository("Maimai2UserChargeRepository")
interface UserChargeRepository : JpaRepository<UserCharge, Long>, Deletable {
fun findByUser_Card_ExtId(extId: Long): List<UserCharge>
fun findByUserAndChargeId(extId: UserDetail, chargeId: Int): Optional<UserCharge>
}
@Repository("Maimai2UserCourseRepository")
interface UserCourseRepository : JpaRepository<UserCourse, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserCourse>
fun findByUserAndCourseId(user: UserDetail, courseId: Int): Optional<UserCourse>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserCourse>
}
@Repository("Maimai2UserDataRepository")
interface UserDataRepository : GenericUserDataRepo<UserDetail> {
fun findByCardExtId(userId: Long): Optional<UserDetail>
@Transactional
fun deleteByCard(card: Card)
}
@Repository("Maimai2UserExtendRepository")
interface UserExtendRepository : JpaRepository<UserExtend, Long>, Deletable {
fun findByUser(user: UserDetail): Optional<UserExtend>
fun findByUser_Card_ExtId(extId: Long): Optional<UserExtend>
}
@Repository("Maimai2UserFavoriteRepository")
interface UserFavoriteRepository : JpaRepository<UserFavorite, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserFavorite>
fun findByUserAndItemKind(user: UserDetail, kind: Int): Optional<UserFavorite>
//Optional<UserFavorite> findByUserIdAndItemKind(long userId, int kind);
fun findByUserIdAndItemKind(userId: Long, kind: Int): List<UserFavorite>
}
@Repository("Maimai2UserFriendSeasonRankingRepository")
interface UserFriendSeasonRankingRepository : JpaRepository<UserFriendSeasonRanking, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserFriendSeasonRanking>
fun findByUserAndSeasonId(user: UserDetail, seasonId: Int): Optional<UserFriendSeasonRanking>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserFriendSeasonRanking>
}
@Repository("Maimai2UserGeneralDataRepository")
interface UserGeneralDataRepository : JpaRepository<UserGeneralData, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserGeneralData>
fun findByUserAndPropertyKey(user: UserDetail, key: String): Optional<UserGeneralData>
fun findByUser_Card_ExtIdAndPropertyKey(userId: Long, key: String): Optional<UserGeneralData>
}
@Repository("Maimai2UserItemRepository")
interface UserItemRepository : JpaRepository<UserItem, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserItem>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserItem>
fun findByUserAndItemKindAndItemId(user: UserDetail, itemKind: Int, itemId: Int): Optional<UserItem>
fun findByUser_Card_ExtIdAndItemKind(userId: Long, kind: Int, page: Pageable): Page<UserItem>
}
@Repository("Maimai2UserLoginBonusRepository")
interface UserLoginBonusRepository : JpaRepository<UserLoginBonus, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserLoginBonus>
fun findByUserAndBonusId(user: UserDetail, bonusId: Int): Optional<UserLoginBonus>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserLoginBonus>
}
@Repository("Maimai2UserMapRepository")
interface UserMapRepository : JpaRepository<UserMap, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserMap>
fun findByUserAndMapId(user: UserDetail, mapId: Int): Optional<UserMap>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserMap>
}
@Repository("Maimai2UserMusicDetailRepository")
interface UserMusicDetailRepository : JpaRepository<UserMusicDetail, Long>, Deletable {
fun findByUser_Card_ExtId(userId: Long): List<UserMusicDetail>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserMusicDetail>
fun findByUser_Card_ExtIdAndMusicId(userId: Long, id: Int): List<UserMusicDetail>
fun findByUserAndMusicIdAndLevel(user: UserDetail, musicId: Int, level: Int): Optional<UserMusicDetail>
}
@Repository("Maimai2UserOptionRepository")
interface UserOptionRepository : JpaRepository<UserOption, Long>, Deletable {
fun findByUser(user: UserDetail): Optional<UserOption>
fun findByUser_Card_ExtId(extId: Long): Optional<UserOption>
}
@Repository("Maimai2UserPlaylogRepository")
interface UserPlaylogRepository : GenericPlaylogRepo<UserPlaylog>, Deletable {
fun findByUserCardExtId(userId: Long, page: Pageable): Page<UserPlaylog>
fun findByUser_Card_ExtIdAndMusicIdAndLevel(userId: Long, musicId: Int, level: Int): List<UserPlaylog>
}
@Repository("Maimai2UserPrintDetailRepository")
interface UserPrintDetailRepository : JpaRepository<UserPrintDetail, Long>
@Repository("Maimai2UserUdemaeRepository")
interface UserUdemaeRepository : JpaRepository<UserUdemae, Long>, Deletable {
fun findByUser(user: UserDetail): Optional<UserUdemae>
fun findByUser_Card_ExtId(extId: Long): Optional<UserUdemae>
}

27
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserActRepository.java
View File

@ -1,27 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserAct;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserActRepository")
public interface UserActRepository extends JpaRepository<UserAct, Long> {
List<UserAct> findByUser_Card_ExtId(long userId);
Optional<UserAct> findByUserAndKindAndActivityId(UserDetail user, int kind, int id);
List<UserAct> findByUser_Card_ExtIdAndKind(long userId, int kind);
@Transactional
void deleteByUser(UserDetail user);
}

22
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserCardRepository.java
View File

@ -1,22 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCard;
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.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserCardRepository")
public interface UserCardRepository extends JpaRepository<UserCard, Long> {
Optional<UserCard> findByUserAndCardId(UserDetail user, int cardId);
Page<UserCard> findByUser_Card_ExtId(long userId, Pageable page);
}

30
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserCharacterRepository.java
View File

@ -1,30 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharacter;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
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 org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserCharacterRepository")
public interface UserCharacterRepository extends JpaRepository<UserCharacter, Long> {
List<UserCharacter> findByUser_Card_ExtId(long userId);
Page<UserCharacter> findByUser_Card_ExtId(long userId, Pageable page);
Optional<UserCharacter> findByUserAndCharacterId(UserDetail user, int characterId);
@Transactional
void deleteByUser(UserDetail user);
}

23
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserChargeRepository.java
View File

@ -1,23 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharge;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserChargeRepository")
public interface UserChargeRepository extends JpaRepository<UserCharge, Long> {
List<UserCharge> findByUser_Card_ExtId(Long extId);
Optional<UserCharge> findByUserAndChargeId(UserDetail extId, int chargeId);
@Transactional
void deleteByUser(UserDetail user);
}

29
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserCourseRepository.java
View File

@ -1,29 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCourse;
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 org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserCourseRepository")
public interface UserCourseRepository extends JpaRepository<UserCourse, Long> {
List<UserCourse> findByUser_Card_ExtId(long userId);
Optional<UserCourse> findByUserAndCourseId(UserDetail user, int courseId);
Page<UserCourse> findByUser_Card_ExtId(long userId, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

17
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserDataRepository.kt
View File

@ -1,17 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata
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.stereotype.Repository
import org.springframework.transaction.annotation.Transactional
import java.util.*
@Repository("Maimai2UserDataRepository")
interface UserDataRepository : GenericUserDataRepo<UserDetail, Long> {
fun findByCardExtId(userId: Long): Optional<UserDetail>
@Transactional
fun deleteByCard(card: Card)
}

23
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserExtendRepository.java
View File

@ -1,23 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserExtend;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserExtendRepository")
public interface UserExtendRepository extends JpaRepository<UserExtend, Long> {
Optional<UserExtend> findByUser(UserDetail user);
Optional<UserExtend> findByUser_Card_ExtId(Long extId);
@Transactional
void deleteByUser(UserDetail user);
}

27
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserFavoriteRepository.java
View File

@ -1,27 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFavorite;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserFavoriteRepository")
public interface UserFavoriteRepository extends JpaRepository<UserFavorite, Long> {
List<UserFavorite> findByUser_Card_ExtId(long userId);
Optional<UserFavorite> findByUserAndItemKind(UserDetail user, int kind);
//Optional<UserFavorite> findByUserIdAndItemKind(long userId, int kind);
List<UserFavorite> findByUserIdAndItemKind(long userId, int kind);
@Transactional
void deleteByUser(UserDetail user);
}

29
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserFriendSeasonRankingRepository.java
View File

@ -1,29 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFriendSeasonRanking;
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 org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserFriendSeasonRankingRepository")
public interface UserFriendSeasonRankingRepository extends JpaRepository<UserFriendSeasonRanking, Long> {
List<UserFriendSeasonRanking> findByUser_Card_ExtId(long userId);
Optional<UserFriendSeasonRanking> findByUserAndSeasonId(UserDetail user, int seasonId);
Page<UserFriendSeasonRanking> findByUser_Card_ExtId(long userId, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

26
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserGeneralDataRepository.java
View File

@ -1,26 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserGeneralData;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserGeneralDataRepository")
public interface UserGeneralDataRepository extends JpaRepository<UserGeneralData, Long> {
List<UserGeneralData> findByUser_Card_ExtId(long userId);
Optional<UserGeneralData> findByUserAndPropertyKey(UserDetail user, String key);
Optional<UserGeneralData> findByUser_Card_ExtIdAndPropertyKey(long userId, String key);
@Transactional
void deleteByUser(UserDetail user);
}

32
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserItemRepository.java
View File

@ -1,32 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserItem;
import java.util.List;
import java.util.Optional;
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 org.springframework.transaction.annotation.Transactional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserItemRepository")
public interface UserItemRepository extends JpaRepository<UserItem, Long> {
List<UserItem> findByUser_Card_ExtId(long userId);
Page<UserItem> findByUser_Card_ExtId(long userId, Pageable page);
Optional<UserItem> findByUserAndItemKindAndItemId(UserDetail user, int itemKind, int itemId);
Page<UserItem> findByUser_Card_ExtIdAndItemKind(long userId, int kind, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

30
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserLoginBonusRepository.java
View File

@ -1,30 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserLoginBonus;
import java.util.List;
import java.util.Optional;
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 org.springframework.transaction.annotation.Transactional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserLoginBonusRepository")
public interface UserLoginBonusRepository extends JpaRepository<UserLoginBonus, Long> {
List<UserLoginBonus> findByUser_Card_ExtId(long userId);
Optional<UserLoginBonus> findByUserAndBonusId(UserDetail user, int bonusId);
Page<UserLoginBonus> findByUser_Card_ExtId(long userId, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

30
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserMapRepository.java
View File

@ -1,30 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMap;
import java.util.List;
import java.util.Optional;
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 org.springframework.transaction.annotation.Transactional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserMapRepository")
public interface UserMapRepository extends JpaRepository<UserMap, Long> {
List<UserMap> findByUser_Card_ExtId(long userId);
Optional<UserMap> findByUserAndMapId(UserDetail user, int mapId);
Page<UserMap> findByUser_Card_ExtId(long userId, Pageable page);
@Transactional
void deleteByUser(UserDetail user);
}

32
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserMusicDetailRepository.java
View File

@ -1,32 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.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 org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserMusicDetailRepository")
public interface UserMusicDetailRepository extends JpaRepository<UserMusicDetail, Long> {
List<UserMusicDetail> findByUser_Card_ExtId(long userId);
Page<UserMusicDetail> findByUser_Card_ExtId(long userId, Pageable page);
List<UserMusicDetail> findByUser_Card_ExtIdAndMusicId(long userId, int id);
Optional<UserMusicDetail> findByUserAndMusicIdAndLevel(UserDetail user, int musicId, int level);
@Transactional
void deleteByUser(UserDetail user);
}

23
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserOptionRepository.java
View File

@ -1,23 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserOption;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserOptionRepository")
public interface UserOptionRepository extends JpaRepository<UserOption, Long> {
Optional<UserOption> findByUser(UserDetail user);
Optional<UserOption> findByUser_Card_ExtId(Long extId);
@Transactional
void deleteByUser(UserDetail user);
}

30
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java
View File

@ -1,30 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
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;
import java.util.List;
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 org.springframework.transaction.annotation.Transactional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserPlaylogRepository")
public interface UserPlaylogRepository extends JpaRepository<UserPlaylog, Long>, GenericPlaylogRepo {
List<UserPlaylog> findByUser_Card_ExtId(long userId);
Page<UserPlaylog> findByUser_Card_ExtId(long userId, Pageable page);
List<UserPlaylog> findByUser_Card_ExtIdAndMusicIdAndLevel(long userId, int musicId, int level);
@Transactional
void deleteByUser(UserDetail user);
}

13
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPrintDetailRepository.java
View File

@ -1,13 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserPrintDetail;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserPrintDetailRepository")
public interface UserPrintDetailRepository extends JpaRepository<UserPrintDetail, Long> {
}

23
src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserUdemaeRepository.java
View File

@ -1,23 +0,0 @@
package icu.samnyan.aqua.sega.maimai2.dao.userdata;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail;
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserUdemae;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("Maimai2UserUdemaeRepository")
public interface UserUdemaeRepository extends JpaRepository<UserUdemae, Long> {
Optional<UserUdemae> findByUser(UserDetail user);
Optional<UserUdemae> findByUser_Card_ExtId(Long extId);
@Transactional
void deleteByUser(UserDetail user);
}

2
src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt
View File

@ -11,7 +11,7 @@ import java.util.*
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("OngekiUserDataRepository")
interface UserDataRepository : GenericUserDataRepo<UserData, Long> {
interface UserDataRepository : GenericUserDataRepo<UserData> {
fun findByCard_ExtIdIn(userIds: Collection<Long>): List<UserData>
fun findByCard_ExtId(aimeId: Long): Optional<UserData>

3
src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserPlaylogRepository.kt
View File

@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.ongeki.model.userdata.UserData
import icu.samnyan.aqua.sega.ongeki.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.stereotype.Repository
import org.springframework.transaction.annotation.Transactional
@ -13,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("OngekiUserPlaylogRepository")
interface UserPlaylogRepository : JpaRepository<UserPlaylog, Long>, GenericPlaylogRepo {
interface UserPlaylogRepository : GenericPlaylogRepo<UserPlaylog> {
fun findByUser_Card_ExtId(userId: Long): List<UserPlaylog>
fun findByUser_Card_ExtId(userId: Long, page: Pageable): Page<UserPlaylog>