From 9c4f14677891e842e3314ab4d9fbba0102eeb16d Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Mon, 19 Feb 2024 02:29:45 -0500
Subject: [PATCH] [O] More checks

---
 src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt  | 5 ++++-
 src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
index ce5c4544..9b71350f 100644
--- a/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+++ b/src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
@@ -34,7 +34,7 @@ class UserRegistrar(
         if (!email.isValidEmail()) 400 > "Invalid email"
 
         // Check if user with the same email exists
-        if (async { userRepo.existsByEmail(email) }) 400 > "User already exists"
+        if (async { userRepo.existsByEmail(email) }) 400 > "User with email `$email` already exists"
 
         // Check if username is valid
         if (username.length < 2) 400 > "Username must be at least 2 letters"
@@ -47,6 +47,9 @@ class UserRegistrar(
                 "You can set a display name later."
         }
 
+        // Check if user with the same username exists
+        if (async { userRepo.existsByUsername(username) }) 400 > "User with username `$username` already exists"
+
         // Validate password
         if (password.length < 8) 400 > "Password must be at least 8 characters"
 
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 07b65fbf..f7a3c465 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
@@ -45,4 +45,5 @@ class AquaNetUser(
 @Repository("AquaNetUserRepository")
 interface AquaNetUserRepo : JpaRepository<AquaNetUser, Int> {
     fun existsByEmail(email: String): Boolean
+    fun existsByUsername(username: String): Boolean
 }
\ No newline at end of file