From 9780f6d2c090be5a428ab1ba35ceda704faa2bf1 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Wed, 21 Sep 2022 19:56:20 +0200
Subject: [PATCH] implement aggregation of prediction timeseries more elegantly

---
 .../vonforst/evmap/viewmodel/MapViewModel.kt  | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
index 829a2d4c..24094385 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -249,14 +249,24 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                 if (responses.isEmpty()) {
                     null
                 } else {
-                    val timestamps = responses[0].predictions.map { it.timestamp }
-                    // TODO: implement this in a more elegant way: first ensure that all timestamps are the same, then take them in order
-                    timestamps.associateWith { ts ->
-                        responses.sumOf {
-                            val av =
-                                it.predictions.find { it.timestamp == ts }?.status == FronyxStatus.AVAILABLE
-                            val count = if (av) 1 else 0
-                            count
+                    val evseIds = responses.map { it.evseId }
+                    val groupByTimestamp = responses.flatMap { response ->
+                        response.predictions.map {
+                            Triple(
+                                it.timestamp,
+                                response.evseId,
+                                it.status
+                            )
+                        }
+                    }
+                        .groupBy { it.first }  // group by timestamp
+                        .mapValues { it.value.map { it.second to it.third } }  // only keep EVSEID and status
+                        .filterValues { it.map { it.first } == evseIds }  // remove values where status is not given for all EVSEs
+                        .filterKeys { it > ZonedDateTime.now() }  // only show predictions in the future
+
+                    groupByTimestamp.mapValues {
+                        it.value.count {
+                            it.second == FronyxStatus.AVAILABLE
                         }
                     }
                 }