componentExists fixed (#17)

componentExists fixed
octopusden · May 14, 2024 · f200421 · f200421
1 parent ae2c325
commit f200421
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/buildSrc/src/main/kotlin/org/octopusden/octopus/task/ConfigureMockServer.kt b/buildSrc/src/main/kotlin/org/octopusden/octopus/task/ConfigureMockServer.kt
@@ -67,14 +67,22 @@ abstract class ConfigureMockServer : DefaultTask() {
                 ).withStatusCode(200)
         }
         mockServerClient.`when`(
-            HttpRequest.request().withMethod("GET").withPath("/rest/release-engineering/3/component/{component-name}")
+            HttpRequest.request().withMethod("GET").withPath("/rest/release-engineering/3/component-management/component/{component-name}")
                 .withPathParameter("component-name")
         ).respond {
             val component = it.getFirstPathParameter("component-name")
             if ("ee-component".equals(component, ignoreCase = true)) {
-                HttpResponse.response().withStatusCode(200)
+                HttpResponse.response().withStatusCode(200).withBody(
+                    JSONObject().put("status-code", 200)
+                        .put("message", "Component $component exists")
+                        .toString(2)
+                )
             } else {
-                HttpResponse.response().withStatusCode(404)
+                HttpResponse.response().withStatusCode(200).withBody(
+                    JSONObject().put("status-code", 404)
+                        .put("message", "Component $component not found")
+                        .toString(2)
+                )
             }
         }
         mockServerClient.`when`(

diff --git a/server/src/main/kotlin/org/octopusden/octopus/dms/service/impl/RelengServiceImpl.kt b/server/src/main/kotlin/org/octopusden/octopus/dms/service/impl/RelengServiceImpl.kt
@@ -34,15 +34,18 @@ class RelengServiceImpl( //TODO: reimplement using RelengClient
         }
     }
 
-    override fun componentExists(component: String): Boolean = with(get(
-        url = "$baseURL/component/$component"
-    )) {
-        if (this.statusCode == 404) {
-            false
-        } else if (this.statusCode / 100 == 2) {
-            true
-        } else {
-            throw RuntimeException(this.text)
+    override fun componentExists(component: String): Boolean {
+        val response = get(
+            url = "$baseURL/component-management/component/$component",
+            headers = mapOf("Accept" to "application/json")
+        )
+        val statusCode = response.jsonObject.getInt("status-code")
+        val msg = response.jsonObject.optString("message", "An error was returned by releng service")
+
+        return when {
+            statusCode == 404 -> false
+            statusCode / 100 == 2 -> true
+            else -> throw RuntimeException(msg)
         }
     }