From 3dc9ca68223f7cc391e7c8b31f37bc17baa5de04 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:36:50 -0400 Subject: [PATCH] [+] Wacca api progress --- src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt | 7 ++++++- src/test/kotlin/test/WaccaTest.kt | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt index 091005a3..1cb87c33 100644 --- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt +++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt @@ -12,6 +12,7 @@ import icu.samnyan.aqua.sega.wacca.model.BaseRequest import icu.samnyan.aqua.sega.wacca.model.db.* import io.ktor.client.utils.* import jakarta.servlet.http.HttpServletRequest +import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.RestController import java.util.* @@ -22,7 +23,11 @@ val empty = emptyList() @RestController @API("/g/wacca/") -class WaccaServer(val rp: WaccaRepos, val cardRepo: CardRepository) { +class WaccaServer { + @Autowired + lateinit var cardRepo: CardRepository + @Autowired + lateinit var rp: WaccaRepos val handlerMap = mutableMapOf) -> Any>() val cacheMap = mutableMapOf() diff --git a/src/test/kotlin/test/WaccaTest.kt b/src/test/kotlin/test/WaccaTest.kt index fef8f4b1..6ee381ed 100644 --- a/src/test/kotlin/test/WaccaTest.kt +++ b/src/test/kotlin/test/WaccaTest.kt @@ -1,6 +1,8 @@ package test import ext.* +import icu.samnyan.aqua.sega.wacca.WaccaServer +import icu.samnyan.aqua.sega.wacca.init import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.ktor.client.request.* @@ -65,6 +67,13 @@ class WaccaTest : StringSpec({ if (uid == 0L) uid = registerUser() } + "API Completion Status" { + val ws = WaccaServer().apply { init() } + val defined = (ws.handlerMap.keys + ws.cacheMap.keys).toSortedSet() + val all = setOf("advertise/GetNews", "advertise/GetRanking", "competition/status/login", "competition/status/update", "housing/get", "housing/start", "user/goods/purchase", "user/info/getMyroom", "user/info/getRanking", "user/info/update", "user/mission/update", "user/music/unlock", "user/music/updateCoop", "user/music/updateTrial", "user/music/updateVersus", "user/music/update", "user/rating/update", "user/status/create", "user/status/getDetail", "user/status/get", "user/status/login", "user/status/logout", "user/status/update", "user/sugoroku/update", "user/trial/get", "user/trial/update", "user/vip/get", "user/vip/start").map { it.lowercase() }.toSortedSet() + all shouldBe defined + } + "housing/get #1" { post("housing/get", "[]").res exp "[39, 0]" }