From 3c1d3013ce0f54aabf7c9f2eb8c294c8781072c9 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 27 Mar 2025 05:22:35 -0400
Subject: [PATCH] [-] Ongeki: Remove unused models

---
 .../samnyan/aqua/sega/ongeki/OngekiApis.kt    |  6 ++---
 .../aqua/sega/ongeki/OngekiUpsertAllApi.kt    |  3 +--
 .../aqua/sega/ongeki/model/OngekiResponse.kt  | 24 -------------------
 .../sega/ongeki/model/OngekiUpsertUserAll.kt  | 11 +++++++++
 4 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiResponse.kt

diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt
index ab45470f..41bf4a8d 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiApis.kt
@@ -4,7 +4,6 @@ import ext.empty
 import ext.int
 import ext.parsing
 import ext.plus
-import icu.samnyan.aqua.sega.ongeki.model.GameEventItem
 
 fun OngekiController.ongekiInit() {
     fun <T> List<T>.staticLst(key: String) = mapOf("length" to size, key to this)
@@ -14,8 +13,9 @@ fun OngekiController.ongekiInit() {
 
     // Has type, but type is always 1
     "GetGameEvent".static {
-        gdb.event.findAll().map { GameEventItem(it.id, 1, "2005-01-01 00:00:00.0", "2099-01-01 05:00:00.0") }
-            .staticLst("gameEventList") + mapOf("type" to 1)
+        gdb.event.findAll().map {
+            mapOf("id" to it.id, "type" to 1, "startDate" to "2005-01-01 00:00:00.0", "endDate" to "2099-01-01 05:00:00.0")
+        }.staticLst("gameEventList") + mapOf("type" to 1)
     }
 
     "GetGamePoint".static { gdb.point.findAll().staticLst("gamePointList") }
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
index 4e3d1c62..ed38ad93 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt
@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.ongeki
 import ext.invoke
 import ext.mapApply
 import ext.minus
-import icu.samnyan.aqua.sega.ongeki.model.CodeResp
 import icu.samnyan.aqua.sega.ongeki.model.OngekiUpsertUserAll
 import icu.samnyan.aqua.sega.ongeki.model.UserData
 import icu.samnyan.aqua.sega.ongeki.model.UserGeneralData
@@ -187,6 +186,6 @@ fun OngekiController.initUpsertAll() {
                     id = db.kop.findByUserAndKopIdAndAreaId(u, kopId, areaId)()?.id ?: 0 }) }
         }
 
-        CodeResp(1, "upsertUserAll")
+        null
     }
 }
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiResponse.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiResponse.kt
deleted file mode 100644
index 1424b6ac..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiResponse.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model
-
-class CodeResp(
-    var returnCode: Int = 0,
-    var apiName: String? = null,
-)
-
-class OngekiFumenScore(
-    var musicId: Int = 0,
-    var difficultId: Int = 0,
-    var romVersionCode: String? = null,
-    var score: Int = 0,
-    var platinumScoreMax: Int = 0,
-    var platinumScoreStar: Int = 0,
-) {
-    override fun toString() = "${musicId}:${difficultId}:${score}:${platinumScoreStar}:${platinumScoreMax}"
-}
-
-class GameEventItem(
-    var id: Long = 0,
-    var type: Int = 0,
-    var startDate: String = "",
-    var endDate: String = "",
-)
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt
index 45841e5f..e5b58f0b 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUpsertUserAll.kt
@@ -71,3 +71,14 @@ class OngekiUpsertUserAll {
     var userNewRatingBaseNextBestNewList: List<OngekiFumenScore>? = null
     var userEventMap: UserEventMap? = null
 }
+
+class OngekiFumenScore(
+    var musicId: Int = 0,
+    var difficultId: Int = 0,
+    var romVersionCode: String? = null,
+    var score: Int = 0,
+    var platinumScoreMax: Int = 0,
+    var platinumScoreStar: Int = 0,
+) {
+    override fun toString() = "${musicId}:${difficultId}:${score}:${platinumScoreStar}:${platinumScoreMax}"
+}