From f5ffee3e6af32a8a5aa9616f33505cff0e3b6dc9 Mon Sep 17 00:00:00 2001
From: jjaffeux <j.jaffeux@gmail.com>
Date: Mon, 1 Jun 2020 20:02:08 +0200
Subject: [PATCH] FIX: better identifier and uses real dates for grouping

---
 .../javascripts/initializers/discourse-calendar.js.es6 | 10 ++++------
 plugin.rb                                              |  5 +++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/assets/javascripts/initializers/discourse-calendar.js.es6 b/assets/javascripts/initializers/discourse-calendar.js.es6
index 186f8dfe..af5993a2 100644
--- a/assets/javascripts/initializers/discourse-calendar.js.es6
+++ b/assets/javascripts/initializers/discourse-calendar.js.es6
@@ -443,18 +443,16 @@ function initializeDiscourseCalendar(api) {
       const minDate = moment(groupedEvent.from)
         .utc()
         .startOf("day")
-        .subtract(12, "hours")
         .toISOString();
-      const maxdate = moment(groupedEvent.to || groupedEvent.from)
+      const maxDate = moment(groupedEvent.to || groupedEvent.from)
         .utc()
         .endOf("day")
-        .add(12, "hours")
         .toISOString();
 
-      const identifier = `${minDate}-${maxdate}`;
+      const identifier = `${minDate}-${maxDate}`;
       formatedGroupedEvents[identifier] = formatedGroupedEvents[identifier] || {
-        from: groupedEvent.from,
-        to: groupedEvent.to,
+        from: minDate,
+        to: maxDate || minDate,
         localEvents: {}
       };
 
diff --git a/plugin.rb b/plugin.rb
index f94ca4ce..7456a8a6 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -319,7 +319,7 @@ after_initialize do
           post_url: Post.url('-', event.topic_id, event.post_number)
         }
       else
-        identifier = "#{event.region.split("_").first}-#{event.description}-#{event.start_date.strftime("%W")}"
+        identifier = "#{event.region.split("_").first}-#{event.start_date.strftime("%W")}-#{(event.end_date || event.start_date).strftime("%W")}"
 
         if grouped_events[identifier]
           grouped_events[identifier][:to] = event.start_date
@@ -328,7 +328,8 @@ after_initialize do
             type: :grouped,
             name: event.description,
             from: event.start_date,
-            usernames: []
+            usernames: [],
+            identifier: identifier
           }
         end