From 32826440cb35ef88edf0761264027b624c822ff6 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 17 Feb 2024 01:43:52 -0500 Subject: [PATCH] [F] Fix spring autowire for AquaNetUser --- build.gradle.kts | 1 + src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt | 2 -- src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5d754b13..2cc895b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,6 +55,7 @@ dependencies { implementation("io.ktor:ktor-client-cio:2.3.8") implementation("io.ktor:ktor-client-content-negotiation:2.3.8") implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.8") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22") } group = "icu.samnya" diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt index 52144b86..a4f013da 100644 --- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt +++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt @@ -5,8 +5,6 @@ import icu.samnyan.aqua.net.db.AquaNetUser import icu.samnyan.aqua.net.db.AquaNetUserRepo import icu.samnyan.aqua.net.utils.TurnstileService import jakarta.servlet.http.HttpServletRequest -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt index d55fab56..db3d2c22 100644 --- a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt +++ b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt @@ -32,7 +32,7 @@ class AquaNetUser( var profileBio: String = "", // One user can have multiple cards - @OneToMany(mappedBy = "aquaNetUser", cascade = [CascadeType.ALL]) + @OneToMany(mappedBy = "aquaUser", cascade = [CascadeType.ALL]) var cards: MutableList = mutableListOf() ) : Serializable