Merge f90380e into 4b83de7

IMIO · Mar 22, 2023 · b1c7988 · b1c7988
2 parents 4b83de7 + f90380e
commit b1c7988
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,7 +5,8 @@ Changelog
 1.1.10 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- WEB-3902 : Sort events by start_date after expanded  event occurences
+  [boulch]
 
 
 1.1.9 (2023-03-17)

diff --git a/src/imio/smartweb/core/contents/rest/events/endpoint.py b/src/imio/smartweb/core/contents/rest/events/endpoint.py
@@ -19,6 +19,10 @@
 import dateutil
 
 
+def get_start_date(event):
+    return datetime.fromisoformat(event["start"])
+
+
 def expand_occurences(events):
     expanded_events = []
 
@@ -50,8 +54,8 @@ def expand_occurences(events):
                 new_event["start"] = json_compatible(occurence_start)
                 new_event["end"] = json_compatible(occurence_start + duration)
                 expanded_events.append(new_event)
-
-    return expanded_events
+    expanded_events_sorted = sorted(expanded_events, key=get_start_date)
+    return expanded_events_sorted
 
 
 class BaseEventsEndpoint(BaseEndpoint):