Add more stats (#3)

* Add tracing

* update

Author: sevenreup

.idea/misc.xml

@@ -11,7 +11,7 @@ jquery = "3.2.1"
 hapiFhir = "6.8.0"
 hapiFhirCore = "6.0.22"
 jackson = "2.13.5"
-jacksonCore = "2.15.2"
+jacksonCore = "2.18.0"
 slf4j = "2.0.12"
 okhttp = "4.9.1"
 coroutines = "1.2.1"

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 package org.dtree.fhir.server.controller
 
-import org.dtree.fhir.server.services.FacilityResultData
-import org.dtree.fhir.server.services.StatsService
+import org.dtree.fhir.server.services.stats.FacilityResultData
+import org.dtree.fhir.server.services.stats.StatsService
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 

server/src/main/kotlin/org/dtree/fhir/server/controller/StatsController.kt

@@ -0,0 +1,25 @@
+package org.dtree.fhir.server.controller
+
+import org.dtree.fhir.server.services.tracing.AppointmentListResults
+import org.dtree.fhir.server.services.tracing.TracingService
+import org.dtree.fhir.server.services.tracing.TracingStatsResults
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.time.LocalDate
+
+class TracingControllerImpl : TracingController, BaseController(), KoinComponent {
+    private val tracingService by inject<TracingService>()
+    override fun getStats(id: String): TracingStatsResults {
+        return tracingService.getStats(id)
+    }
+
+    override fun getAppointmentList(facilityId: String, date: LocalDate): AppointmentListResults {
+        return tracingService.getAppointmentList(facilityId, date)
+    }
+}
+
+interface TracingController {
+    fun getStats(id: String): TracingStatsResults
+
+    fun getAppointmentList(facilityId: String, date: LocalDate) : AppointmentListResults
+}

server/src/main/kotlin/org/dtree/fhir/server/controller/TracingController.kt

@@ -1,5 +1,6 @@
 package org.dtree.fhir.server.core.models
 
+import org.dtree.fhir.server.services.formatDate
 import org.hl7.fhir.r4.model.Bundle
 import java.time.LocalDate
 
@@ -25,7 +26,17 @@ data class FilterFormParamData(
     val value: String? = null,
     val valueDate: LocalDate? = null,
     val valueDateRange: DateRange? = null,
-)
+) {
+    fun valueString(): String? {
+        if (type == FilterParamType.string) {
+            return value
+        } else if (type == FilterParamType.date) {
+            return valueDate?.let { formatDate(it, true) }
+        } else {
+            return valueDateRange?.toString()
+        }
+    }
+}
 
 data class DateRange(
     val from: LocalDate?,

server/src/main/kotlin/org/dtree/fhir/server/core/models/FilterFormData.kt

@@ -26,6 +26,17 @@ fun filterByDateCreated(dateCreated: LocalDate) = filterByPredefined(
     ),
 )
 
+fun filterByDate(date: LocalDate) = FilterFormItem(
+    filterId = "filter-by-date-created",
+    template = "date={date}",
+    filterType = FilterTemplateType.template,
+    params = listOf(
+        FilterFormParamData(
+            name = "date", type = FilterParamType.date, valueDate = date
+        )
+    ),
+)
+
 fun filterByDateCreatedRange(date: DateRange) = filterByPredefined(
     id = "filter-by-date-created-range",
     template = "filter-by-date-created-range",
@@ -53,6 +64,32 @@ fun filterSummary() = FilterFormItem(
     )
 )
 
+fun filterAddCount(count: Int) = FilterFormItem(
+    filterId = "_count",
+    template = "_count={value}",
+    filterType = FilterTemplateType.template,
+    params = listOf(
+        FilterFormParamData(
+            name = "value",
+            type = FilterParamType.string,
+            value = count.toString()
+        )
+    )
+)
+
+fun filterRevInclude() = FilterFormItem(
+    filterId = "_include",
+    template = "_include={value}",
+    filterType = FilterTemplateType.template,
+    params = listOf(
+        FilterFormParamData(
+            name = "value",
+            type = FilterParamType.string,
+            value = "Appointment:patient"
+        )
+    )
+)
+
 fun addPatientFilter(patients: List<PatientType>, inSubject: Boolean = false): FilterFormItem {
     return FilterFormItem(
         filterId = "patient_filter",

server/src/main/kotlin/org/dtree/fhir/server/core/search/filters/General.kt

@@ -12,6 +12,7 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.routing.get
 import org.dtree.fhir.server.plugins.stats.statsModule
+import org.dtree.fhir.server.plugins.tracing.tracingModule
 
 fun Application.configureRouting() {
     install(Resources)
@@ -45,6 +46,7 @@ fun Application.configureRouting() {
         }
 
         statsModule()
+        tracingModule()
 
         get("/") {
             call.respondText("Hello, World!")

server/src/main/kotlin/org/dtree/fhir/server/plugins/Routing.kt

@@ -5,11 +5,14 @@ import org.dtree.fhir.core.di.FhirProvider
 import org.dtree.fhir.core.uploader.general.FhirClient
 import org.dtree.fhir.server.controller.StatsController
 import org.dtree.fhir.server.controller.StatsControllerImpl
+import org.dtree.fhir.server.controller.TracingController
+import org.dtree.fhir.server.controller.TracingControllerImpl
 import org.koin.dsl.module
 
 object ModulesInjection  {
     val koinBeans = module {
         single<StatsController> { StatsControllerImpl() }
+        single<TracingController> { TracingControllerImpl()  }
         single<FhirClient> {  FhirClient(this.get<Dotenv>(), this.get<FhirProvider>().parser()) }
     }
 }

server/src/main/kotlin/org/dtree/fhir/server/plugins/injection/ModulesInjection.kt

@@ -0,0 +1,16 @@
+package org.dtree.fhir.server.plugins.tracing
+
+import io.ktor.resources.*
+import java.time.LocalDate
+
+@Resource("/tracing")
+class Tracing() {
+    @Resource("facility")
+    class Facility(val parent: Tracing = Tracing()) {
+        @Resource("{id}")
+        class Id(val parent: Facility = Facility(), val id: String = "") {
+            @Resource("appointments")
+            class List(val parent: Id = Facility.Id(), val date: String? = "")
+        }
+    }
+}

server/src/main/kotlin/org/dtree/fhir/server/plugins/tracing/Tracing.kt

@@ -0,0 +1,26 @@
+package org.dtree.fhir.server.plugins.tracing
+
+import io.ktor.server.application.*
+import io.ktor.server.resources.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import org.dtree.fhir.server.controller.TracingController
+import org.koin.ktor.ext.inject
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+fun Route.tracingModule() {
+    val controller by inject<TracingController>()
+
+    get<Tracing.Facility.Id> { facility ->
+        val result = controller.getStats(facility.id)
+        call.respond(result)
+    }
+
+    get<Tracing.Facility.Id.List> { appointment ->
+        println("Jeff")
+         val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE
+        val result = controller.getAppointmentList(appointment.parent.id, if(appointment.date.isNullOrBlank()) LocalDate.now() else  LocalDate.parse(appointment.date, formatter))
+        call.respond(result)
+    }
+}