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

[F] Fix deleting data on import

Browse Source
This commit is contained in:
Azalea
2024-03-21 01:07:25 -04:00
parent 91c605ee4b
commit cc8c125934
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
View File

@@ -4,12 +4,14 @@ import ext.*
import icu.samnyan.aqua.net.db.AquaUserServices
import icu.samnyan.aqua.net.utils.SUCCESS
import icu.samnyan.aqua.sega.general.model.Card
import org.slf4j.LoggerFactory
import kotlin.jvm.optionals.getOrNull
import kotlin.reflect.KClass
abstract class GameApiController<T : IGenericUserData>(name: String, userDataClass: KClass<T>) {
val musicMapping = resJson<Map<String, GenericMusicMeta>>("/meta/$name/music.json")
?.mapKeys { it.key.toInt() } ?: emptyMap()
val logger = LoggerFactory.getLogger(javaClass)
val itemMapping = resJson<Map<String, Map<String, GenericItemMeta>>>("/meta/$name/items.json") ?: emptyMap()

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

@@ -102,18 +102,18 @@ class Maimai2(
export.userData.card = u.ghostCard
// Check existing data
val gu = repos.userData.findByCard(u.ghostCard)?.also { gu ->
repos.userData.findByCard(u.ghostCard)?.also { gu ->
// Store a backup of the old data
val fl = "mai2-backup-${u.auId}-${LocalDateTime.now().urlSafeStr()}.json"
(Path(netProps.importBackupPath) / fl).writeText(export(u).toJson())
// Delete the old data (After migration v1000.7, all user-linked entities have ON DELETE CASCADE)
logger.info("Mai2 Import: Deleting old data for user ${u.auId}")
repos.userData.delete(gu)
repos.userData.flush()
}
trans.execute {
gu?.let {
// Delete the old data (After migration v1000.7, all user-linked entities have ON DELETE CASCADE)
repos.userData.deleteByCard(u.ghostCard)
}
// Insert new data
val nu = repos.userData.save(export.userData)
// Set user fields