Merge branch 'master' into dependabot/gradle/org.jetbrains.exposed-exposed-jdbc-0.57.0

Author: gmitch215

src/main/kotlin/io/codemc/api/jenkins/jenkins.kt

@@ -212,6 +212,21 @@ fun getJenkinsUser(username: String): String = runBlocking(Dispatchers.IO) {
     return@runBlocking res.body() ?: ""
 }
 
+/**
+ * Checks if a Jenkins user exists.
+ * @param username The username of the user.
+ * @return `true` if the user exists, `false` otherwise.
+ */
+fun existsUser(username: String): Boolean = getJenkinsUser(username).isNotEmpty()
+
+/**
+ * Checks if a Jenkins job exists.
+ * @param username The username of the user.
+ * @param jobName The name of the job.
+ * @return `true` if the job exists, `false` otherwise.
+ */
+fun existsJob(username: String, jobName: String): Boolean = getJenkinsJob(username, jobName).isNotEmpty()
+
 /**
  * Gets all Jenkins users.
  * @return A list of all Jenkins users mapped by their username.

src/main/kotlin/io/codemc/api/nexus/nexus.kt

@@ -205,6 +205,13 @@ fun getNexusUser(name: String): JsonObject? = runBlocking {
     return@runBlocking (json.decodeFromString(res.body()) as? JsonArray)?.firstOrNull() as? JsonObject
 }
 
+/**
+ * Checks if a Nexus User exists by its case-sensitive name.
+ * @param name The name of the nexus user.
+ * @return `true` if the user exists, `false` otherwise
+ */
+fun exists(name: String) = getNexusUser(name) != null
+
 @VisibleForTesting
 internal suspend fun getNexusRole(name: String): JsonObject? {
     val res = nexus("$API_URL/security/roles/$name")

src/test/kotlin/io/codemc/api/database/TestDatabase.kt

@@ -29,7 +29,7 @@ class TestDatabase {
 
         val u1 = getUser(n1)
         assertNotNull(u1)
-        assertEquals(u1?.discord, 123456789L)
+        assertEquals(123456789L, u1?.discord)
 
         removeUser(n1)
 
@@ -38,7 +38,7 @@ class TestDatabase {
 
         val u2 = getUser(n2)
         assertNotNull(u2)
-        assertEquals(u2?.discord, 987654321L)
+        assertEquals(987654321L, u2?.discord)
 
         removeUser(n2)
     }
@@ -50,35 +50,31 @@ class TestDatabase {
 
         val u1 = getUser(name)
         assertNotNull(u1)
-        assertEquals(u1?.discord, 0L)
+        assertEquals(0L, u1?.discord)
 
         updateUser(name, 123456789L)
 
         val u2 = getUser(name)
         assertNotNull(u2)
-        assertEquals(u2?.discord, 123456789L)
+        assertEquals(123456789L, u2?.discord)
 
         removeUser(name)
     }
 
     @Test
     fun testMultipleUsers() {
         val users = listOf(
-            "TestUser",
-            "TestUser2",
+            "TestMultiUser",
+            "TestMultiUser2",
         )
 
         users.forEach { s -> addUser(s, 4567L) }
 
-        val retrieved = getAllUsers()
-        assertEquals(users.size, retrieved.size)
-        for (i in retrieved.indices) {
-            assertEquals(retrieved[i].username, users[i])
-            assertEquals(retrieved[i].discord, 4567L)
-        }
+        assertEquals(4567L, getUser(users[0])?.discord)
+        assertEquals(4567L, getUser(users[1])?.discord)
 
-        removeAllUsers()
-        assertTrue(getAllUsers().isEmpty())
+        removeUser(users[0])
+        removeUser(users[1])
     }
 
     @Test
@@ -102,15 +98,12 @@ class TestDatabase {
 
         users.forEachIndexed { index, s -> addUser(s, index.toLong()) }
 
-        val retrieved = getAllUsers()
-        assertEquals(users.size, retrieved.size)
-        for (i in retrieved.indices) {
-            assertEquals(retrieved[i].username, users[i])
-            assertEquals(retrieved[i].discord, i.toLong())
+        for ((i, user) in users.withIndex()) {
+            assertNotNull(getUser(user))
+            assertEquals(i.toLong(), getUser(user)?.discord)
         }
 
-        removeAllUsers()
-        assertTrue(getAllUsers().isEmpty())
+        users.forEach { removeUser(it) }
     }
 
 }

src/test/kotlin/io/codemc/api/jenkins/TestJenkins.kt

@@ -38,8 +38,10 @@ class TestJenkins {
         checkUserConfig(u1)
 
         assertTrue(getJenkinsUser(u1).isNotEmpty())
+        assertTrue(existsUser(u1))
         assertTrue(deleteUser(u1))
         assertTrue(getJenkinsUser(u1).isEmpty())
+        assertFalse(existsUser(u1))
 
         val u2 = "MyPlayer123"
         assertTrue(createJenkinsUser(u2, "MyPassword456"))
@@ -84,6 +86,7 @@ class TestJenkins {
         val j1 = "TestJob_Freestyle"
         assertTrue(createJenkinsJob(name, j1, url, true))
         assertTrue(getJenkinsJob(name, j1).isNotEmpty())
+        assertTrue(existsJob(name, j1))
 
         val i1 = getJobInfo(name, j1)
         assertNotNull(i1)
@@ -92,8 +95,10 @@ class TestJenkins {
         val j2 = "TestJob2_Freestyle"
         assertTrue(createJenkinsJob(name, j2, url, true))
         assertTrue(getJenkinsJob(name, j2).isNotEmpty())
+        assertTrue(existsJob(name, j2))
         assertTrue(deleteJob(name, j2))
         assertTrue(getJenkinsJob(name, j2).isEmpty())
+        assertFalse(existsJob(name, j2))
 
         val j3 = "TestJob_Maven"
         assertTrue(createJenkinsJob(name, j3, url, false))

src/test/kotlin/io/codemc/api/nexus/TestNexus.kt

@@ -43,6 +43,7 @@ class TestNexus {
 
         assertTrue(createNexus(name, UUID.randomUUID().toString()))
         assertFalse(getNexusUser(name).isNullOrEmpty())
+        assertTrue(exists(name))
         assertTrue(getNexusUser("OtherName").isNullOrEmpty())
         assertTrue(getRepositories().isNotEmpty())
         assertFalse(getNexusRepository(repoName).isNullOrEmpty())