Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

[O] Generalize card migration

Browse Source
This commit is contained in:
Azalea
2024-02-27 13:17:27 -05:00
parent b44121597f
commit 5166387f34
8 changed files with 54 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ import java.util.Optional;
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("ChusanUserDataRepository")
public interface UserDataRepository extends JpaRepository<UserData, Long>, GenericUserDataRepo {
public interface UserDataRepository extends GenericUserDataRepo<UserData, Long> {
UserData findByCard(Card card);

5
src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java
View File

@@ -14,6 +14,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
@@ -126,7 +127,7 @@ import java.util.List;
"isNetBattleHost",
"netBattleEndState" })
public class UserData implements Serializable, IGenericUserData {
@Serial
private static final long serialVersionUID = 1L;
@Id
@@ -137,7 +138,7 @@ public class UserData implements Serializable, IGenericUserData {
@JsonSerialize(using = AccessCodeSerializer.class)
@JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
@OneToOne
@JoinColumn(name = "card_id")
@JoinColumn(name = "card_id", unique = true)
private Card card;
// Access code in card

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

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.maimai2.dao.userdata
import icu.samnyan.aqua.net.utils.GenericUserDataRepo
import icu.samnyan.aqua.sega.general.model.Card
import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.data.jpa.repository.Query
import org.springframework.stereotype.Repository
import org.springframework.transaction.annotation.Transactional
@@ -11,7 +10,7 @@ import java.util.*
@Repository("Maimai2UserDataRepository")
interface UserDataRepository : JpaRepository<UserDetail, Long>, GenericUserDataRepo {
interface UserDataRepository : GenericUserDataRepo<UserDetail, Long> {
override fun findByCard(card: Card): UserDetail?
fun findByCardExtId(userId: Long): Optional<UserDetail>

4
src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.kt
View File

@@ -26,8 +26,8 @@ class UserDetail(
@JsonSerialize(using = AccessCodeSerializer::class)
@JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
@OneToOne
@JoinColumn(name = "aime_card_id")
var card: Card? = null,
@JoinColumn(name = "aime_card_id", unique = true)
override var card: Card? = null,
override var userName: String = "",

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

@@ -13,7 +13,7 @@ import java.util.*
* @author samnyan (privateamusement@protonmail.com)
*/
@Repository("OngekiUserDataRepository")
interface UserDataRepository : JpaRepository<UserData, Long>, GenericUserDataRepo {
interface UserDataRepository : GenericUserDataRepo<UserData, Long> {
fun findByCard_ExtIdIn(userIds: Collection<Long>): List<UserData>
override fun findByCard(card: Card): UserData?

2
src/main/java/icu/samnyan/aqua/sega/ongeki/model/userdata/UserData.java
View File

@@ -33,7 +33,7 @@ public class UserData implements Serializable, IGenericUserData {
@JsonSerialize(using = AccessCodeSerializer.class)
@JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY)
@OneToOne
@JoinColumn(name = "aime_card_id")
@JoinColumn(name = "aime_card_id", unique = true)
private Card card;
// Access code in card