Add Appointment model and integrate with Operation

Author: jwilkinson87

src/main/kotlin/com/ctrlhub/core/projects/appointments/response/Appointment.kt

@@ -0,0 +1,32 @@
+package com.ctrlhub.core.projects.appointments.response
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.github.jasminb.jsonapi.StringIdHandler
+import com.github.jasminb.jsonapi.annotations.Id
+import com.github.jasminb.jsonapi.annotations.Type
+
+@Type("appointments")
+@JsonIgnoreProperties(ignoreUnknown = true)
+class Appointment @JsonCreator constructor(
+    @Id(StringIdHandler::class) var id: String = "",
+    @JsonProperty("animals") val animals: Boolean = false,
+    @JsonProperty("end_time") val endTime: String = "",
+    @JsonProperty("medical_dependency") val medicalDependency: Boolean = false,
+    @JsonProperty("notes") val notes: String = "",
+    @JsonProperty("on_ecr") val onEcr: Boolean = false,
+    @JsonProperty("on_ecr_notes") val onEcrNotes: String = "",
+    @JsonProperty("start_time") val startTime: String = ""
+) {
+    constructor() : this(
+        id = "",
+        animals = false,
+        endTime = "",
+        medicalDependency = false,
+        notes = "",
+        onEcr = false,
+        onEcrNotes = "",
+        startTime = ""
+    )
+}

src/main/kotlin/com/ctrlhub/core/projects/operations/OperationsRouter.kt

@@ -5,16 +5,18 @@ import com.ctrlhub.core.api.response.PaginatedList
 import com.ctrlhub.core.projects.workorders.WorkOrdersRouter
 import com.ctrlhub.core.projects.operations.response.Operation
 import com.ctrlhub.core.iam.response.User
+import com.ctrlhub.core.projects.appointments.response.Appointment
 import com.ctrlhub.core.projects.operations.templates.response.OperationTemplate
 import com.ctrlhub.core.router.Router
 import com.ctrlhub.core.router.request.FilterOption
 import com.ctrlhub.core.router.request.JsonApiIncludes
-import com.ctrlhub.core.router.request.RequestParameters
 import com.ctrlhub.core.router.request.RequestParametersWithIncludes
 import io.ktor.client.HttpClient
 
 enum class OperationIncludes(val value: String) : JsonApiIncludes {
     Template("template"),
+    Appointments("appointment"),
+    Properties("properties"),
     Forms("forms");
 
     override fun value(): String {
@@ -46,7 +48,7 @@ class OperationsRouter(httpClient: HttpClient) : Router(httpClient) {
 
         return fetchPaginatedJsonApiResources(
             endpoint, requestParameters.toMap(), Operation::class.java,
-            OperationTemplate::class.java, User::class.java
+            OperationTemplate::class.java, User::class.java, Appointment::class.java
         )
     }
 

src/main/kotlin/com/ctrlhub/core/projects/operations/response/Operation.kt

@@ -2,6 +2,7 @@ package com.ctrlhub.core.projects.operations.response
 
 import com.ctrlhub.core.api.Assignable
 import com.ctrlhub.core.geo.Property
+import com.ctrlhub.core.projects.appointments.response.Appointment
 import com.ctrlhub.core.projects.operations.templates.response.OperationTemplate
 import com.ctrlhub.core.projects.response.Label
 import com.fasterxml.jackson.annotation.JsonCreator
@@ -36,6 +37,9 @@ class Operation @JsonCreator constructor(
 
     @Relationship("properties")
     var properties: java.util.List<Property>? = null,
+
+    @Relationship("appointment")
+    var appointment: Appointment? = null
 ) {
     constructor(): this(
         name = "",

src/test/kotlin/com/ctrlhub/core/projects/operations/OperationsRouterTest.kt

@@ -97,4 +97,44 @@ class OperationsRouterTest {
             assertEquals("Example Template Name", response.data[0].template?.name)
         }
     }
+
+    @Test
+    fun `can retrieve all operations with included appointments`() {
+        val jsonFilePath = Paths.get("src/test/resources/projects/operations/all-operations-with-included-appointments.json")
+        val jsonContent = Files.readString(jsonFilePath)
+
+        val mockEngine = MockEngine { request ->
+            respond(
+                content = jsonContent,
+                status = HttpStatusCode.OK,
+                headers = headersOf(HttpHeaders.ContentType, "application/json")
+            )
+        }
+
+        val operationsRouter = OperationsRouter(httpClient = HttpClient(mockEngine).configureForTest())
+
+        runBlocking {
+            val response = operationsRouter.all(
+                organisationId = "123",
+                requestParameters = OperationRequestParameters(
+                    includes = listOf(
+                        OperationIncludes.Appointments
+                    )
+                )
+            )
+
+            assertIs<PaginatedList<Operation>>(response)
+
+            // Find the operation that has an appointment
+            val operationWithAppointment = response.data.find { it.appointment != null }
+            assertNotNull(operationWithAppointment, "Should have at least one operation with an appointment")
+
+            // Validate the appointment is properly hydrated
+            val appointment = operationWithAppointment?.appointment
+            assertNotNull(appointment, "Appointment should not be null")
+            assertEquals("appointment-1", appointment?.id)
+            assertEquals("2025-08-15T07:00:00Z", appointment?.startTime)
+            assertEquals("2025-08-15T11:00:00Z", appointment?.endTime)
+        }
+    }
 }