fix: just set raw JSON content in schema object

Author: jwilkinson87

src/main/kotlin/com/ctrlhub/core/datacapture/FormSchemasRouter.kt

@@ -17,7 +17,7 @@ class FormSchemasRouter(httpClient: HttpClient) : Router(httpClient) {
         formId: String,
         requestParameters: RequestParameters = RequestParameters()
     ): PaginatedList<FormSchema> {
-        val endpoint = "/v3/orgs/$organisationId/data-capture/forms/{$formId}/schemas"
+        val endpoint = "/v3/orgs/$organisationId/data-capture/forms/$formId/schemas"
 
         val response = performGet(endpoint, requestParameters.toMap())
         val jsonContent = Json.parseToJsonElement(response.body<String>()).jsonObject
@@ -42,28 +42,21 @@ class FormSchemasRouter(httpClient: HttpClient) : Router(httpClient) {
         val endpoint = "/v3/orgs/$organisationId/data-capture/forms/$formId/schemas/$schemaId"
 
         val response = performGet(endpoint, requestParameters.toMap())
-        val jsonContent = Json.parseToJsonElement(response.body<String>()).jsonObject
-
-        val dataObject = jsonContent["data"]?.jsonObject
-            ?: throw IllegalStateException("Missing data object")
+        val jsonContent = Json.parseToJsonElement(response.body<String>()).jsonObjectOrNull()
+            ?: throw IllegalStateException("Missing JSON content")
 
-        return instantiateFormSchemaFromJson(dataObject)
+        return instantiateFormSchemaFromJson(jsonContent)
     }
 
     private fun instantiateFormSchemaFromJson(json: JsonObject): FormSchema {
         val id = json["id"]?.jsonPrimitive?.content
             ?: throw IllegalStateException("Missing id")
 
-        val attributes = json["attributes"]?.jsonObject ?: JsonObject(emptyMap())
-        val model = attributes["model"]?.jsonObjectOrNull()
-        val views = attributes["views"]?.jsonObjectOrNull()
+        val rawContent = json.toString()
 
         return FormSchema(
             id = id,
-            modelConfig = model,
-            viewsConfig = views,
-            modelConfigStr = model?.toString() ?: "",
-            viewsConfigStr = views?.toString() ?: ""
+            rawSchema = rawContent
         )
     }
 

src/main/kotlin/com/ctrlhub/core/datacapture/response/FormSchema.kt

@@ -1,14 +1,9 @@
 package com.ctrlhub.core.datacapture.response
 
 import com.github.jasminb.jsonapi.annotations.Type
-import kotlinx.serialization.json.JsonObject
 
 @Type("form-schemas")
 data class FormSchema (
     val id: String,
-    val modelConfigStr: String,
-    val viewsConfigStr: String,
-
-    val modelConfig: JsonObject?,
-    val viewsConfig: JsonObject?,
+    val rawSchema: String,
 )

src/test/kotlin/com/ctrlhub/core/datacapture/FormSchemasRouterTest.kt

@@ -43,8 +43,7 @@ class FormSchemasRouterTest {
             assertEquals(1, response.data.size)
             val formSchema = response.data[0]
             assertEquals("1.0.0", formSchema.id)
-            assertTrue(formSchema.modelConfigStr.isNotEmpty())
-            assertTrue(formSchema.viewsConfigStr.isNotEmpty())
+            assertTrue(formSchema.rawSchema.isNotEmpty())
         }
     }
 }