From afe58572a6b97d4ca6b1aaff8d00c98d23900415 Mon Sep 17 00:00:00 2001
From: lbarraga <lukas.barragantorres@ugent.be>
Date: Sun, 7 May 2023 16:58:25 +0200
Subject: [PATCH] #74 fusing entries only on a daily basis

---
 .../sel/studeez/domain/implementation/FirebaseFeedDAO.kt  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
index 600153a..79e4e68 100644
--- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseFeedDAO.kt
@@ -22,10 +22,14 @@ class FirebaseFeedDAO @Inject constructor(
         return sessionDAO.getSessions().map {sessionReports ->
             sessionReports
                 .map { sessionReport ->  sessionToFeedEntry(sessionReport) }
-                .groupBy { it.taskId }
-                .map { fuseFeedEntries(it.component2()) }
                 .sortedByDescending { it.endTime }
                 .groupBy { getFormattedTime(it) }
+                .mapValues { (_, entries) ->
+                    entries
+                    .groupBy { it.taskId }
+                    .map { fuseFeedEntries(it.component2()) }
+                    .sortedByDescending { it.endTime }
+                }
         }
     }