Change stats model

Author: sevenreup

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

@@ -1,18 +1,18 @@
 package org.dtree.fhir.server.controller
 
-import org.dtree.fhir.server.services.ResultData
+import org.dtree.fhir.server.services.FacilityResultData
 import org.dtree.fhir.server.services.StatsService
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 class StatsControllerImpl : StatsController, BaseController(), KoinComponent {
     private val statsService by inject<StatsService>()
 
-    override suspend fun getStats(id: String): ResultData {
+    override suspend fun getStats(id: String): FacilityResultData {
         return statsService.getFacilityStats(id)
     }
 }
 
 interface  StatsController {
-    suspend fun getStats(id: String): ResultData
+    suspend fun getStats(id: String): FacilityResultData
 }

server/src/main/kotlin/org/dtree/fhir/server/services/PatientType.kt

@@ -20,7 +20,7 @@ enum class PatientType(val value: String) {
     }
 }
 
-suspend fun fetchDataTest(client: FhirClient, actions: List<FilterFormData>): ResultData {
+suspend fun fetchDataTest(client: FhirClient, actions: List<FilterFormData>): FacilityResultData {
     val requests = mutableListOf<Bundle.BundleEntryRequestComponent>()
     for (data in actions) {
         val filters = data.filters.map { filter ->
@@ -62,7 +62,17 @@ suspend fun fetchDataTest(client: FhirClient, actions: List<FilterFormData>): Re
             )
         )
     }
-    return ResultData(summaries, LocalDate.now())
+    return FacilityResultData(summaries.map {
+        GroupedSummaryItem(
+            groupKey = it.key,
+            groupTitle = mapKeyToTitle(it.key),
+            summaries = it.value,
+        )
+    }, LocalDate.now())
+}
+
+fun mapKeyToTitle(key: String): String {
+    return "Totals"
 }
 
 fun createFilter(filter: FilterFormItem): List<Pair<String, String>> {

server/src/main/kotlin/org/dtree/fhir/server/services/ResultDataOld.kt

@@ -2,8 +2,15 @@ package org.dtree.fhir.server.services
 
 import java.time.LocalDate
 
-data class ResultDataOld(val summaries: List<SummaryItem>, val date: List<String>?)
+data class FacilityResultData(val groups: List<GroupedSummaryItem>, val date: LocalDate)
 
-data class ResultData(val summaries: Map<String, List<SummaryItem>>, val date: LocalDate)
+data class GroupedSummaryItem(
+    val groupKey: String,
+    val groupTitle: String,
+    val summaries: List<SummaryItem>
+)
 
-data class SummaryItem(val name: String, val value: Int)
+data class SummaryItem(val name: String, val value: Int)
+
+
+data class ResultDataOld(val summaries: List<SummaryItem>, val date: List<String>?)

server/src/main/kotlin/org/dtree/fhir/server/services/StatsService.kt

@@ -9,7 +9,7 @@ import org.koin.core.component.inject
 object StatsService : KoinComponent {
     val client by inject<FhirClient>()
 
-    suspend fun getFacilityStats(id: String): ResultData {
+    suspend fun getFacilityStats(id: String): FacilityResultData {
         val locationFilter = filterByLocation(id)
         val baseFilters = listOf(locationFilter)