From e7643f38949dafd8a7267ca9752adc9e4fd60049 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:14:11 -0500
Subject: [PATCH] [F] Fix beans

---
 .../dao/userdata/UserDataRepository.java      |  2 +-
 .../dao/userdata/UserDataRepository.java      | 27 ------------------
 .../ongeki/dao/userdata/UserDataRepository.kt | 28 +++++++++++++++++++
 src/main/resources/application.properties     |  1 +
 4 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java
 create mode 100644 src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt

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 ed75ffa4..bb427d6f 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
@@ -20,6 +20,6 @@ public interface UserDataRepository extends JpaRepository<UserData, Long>, Gener
     Optional<UserData> findByCard_ExtId(Long extId);
 
     @Override
-    @Query("select count(*) from Maimai2UserData where playerRating > :rating")
+    @Query("select count(*) from ChusanUserData where playerRating > :rating")
     long getRanking(int rating);
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java
deleted file mode 100644
index 43d02240..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.dao.userdata;
-
-import icu.samnyan.aqua.net.utils.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.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Repository("OngekiUserDataRepository")
-public interface UserDataRepository extends JpaRepository<UserData, Long>, GenericUserDataRepo {
-    List<UserData> findByCard_ExtIdIn(Collection<Long> userIds);
-
-    UserData findByCard(Card card);
-
-    Optional<UserData> findByCard_ExtId(long aimeId);
-
-    @Transactional
-    void deleteByCard(Card card);
-}
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
new file mode 100644
index 00000000..3603b947
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/UserDataRepository.kt
@@ -0,0 +1,28 @@
+package icu.samnyan.aqua.sega.ongeki.dao.userdata
+
+import icu.samnyan.aqua.net.utils.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
+import java.util.*
+
+/**
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Repository("OngekiUserDataRepository")
+interface UserDataRepository : JpaRepository<UserData, Long>, GenericUserDataRepo {
+    fun findByCard_ExtIdIn(userIds: Collection<Long>): List<UserData>
+
+    override fun findByCard(card: Card): UserData?
+
+    fun findByCard_ExtId(aimeId: Long): Optional<UserData>
+
+    @Transactional
+    fun deleteByCard(card: Card)
+
+    @Query("select count(*) from OngekiUserData where playerRating > :rating")
+    override fun getRanking(rating: Int): Long
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 53d9af6a..5c297987 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,6 +20,7 @@ spring.servlet.multipart.max-request-size=20MB
 spring.flyway.clean-disabled=false
 spring.flyway.baseline-on-migrate=true
 spring.flyway.locations=classpath:db/migration/{vendor}
+spring.flyway.out-of-order=true
 
 spring.datasource.driver-class-name=org.sqlite.JDBC
 spring.datasource.url=jdbc:sqlite:data/db.sqlite