fixed a bug with upcoming events template tag and events that occur s…

…ame date&time +test.

happenings/templatetags/happenings_tags.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import heapq
 from itertools import chain
 
 from django.template import Library
@@ -42,9 +43,11 @@ def show_calendar(req, mini=False):
 @register.inclusion_tag('happenings/partials/upcoming_events.html')
 def upcoming_events(now=timezone.localtime(timezone.now()), finish=90, num=5):
     finish = now + timezone.timedelta(days=finish)
-    all_upcoming = (UpcomingEvents(x, now, finish, num).get_upcoming_events()
-                    for x in Event.objects.live(now))
-    upcoming = sorted(
-        (item for sublist in all_upcoming for item in sublist)
-    )[:num]
+    all_upcoming = [UpcomingEvents(x, now, finish, num).get_upcoming_events()
+                    for x in Event.objects.live(now)]
+    upcoming = heapq.nsmallest(
+        num,
+        (item for sublist in all_upcoming for item in sublist),
+        key=lambda x: x[0]
+    )
     return {'upcoming_events': upcoming}

happenings/utils/upcoming.py

@@ -24,7 +24,9 @@ def get_upcoming_events(self):
         upcoming events from 'now'.
         """
         if self.event.repeats('NEVER'):
-            if self.event.end_date < self.now:
+            has_ended = self.event.end_date < self.now
+            has_not_started = self.event.l_start_date > self.finish
+            if has_ended or has_not_started:
                 return self.events
             self.events.append((self.event.l_start_date, self.event))
             return self.events

tests/unit_tests/test_template_tags/test_upcoming_tag.py

@@ -1,8 +1,13 @@
 from __future__ import unicode_literals
 
+import datetime
+
 from django.test import TestCase
 from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.utils.timezone import make_aware, get_default_timezone
 
+from happenings.models import Event
 from happenings.templatetags.happenings_tags import upcoming_events
 
 
@@ -19,3 +24,35 @@ def test_upcoming_events_no_events(self):
         events = upcoming_events()
         self.assertEqual(len(events), 1)
         self.assertEqual(events['upcoming_events'], [])
+
+    def test_events_same_date(self):
+        """Created June 13, 2014 after a bug was found."""
+        user = User.objects.create_user(
+            'foo', 'bar@example.com', 'secret'
+        )
+        d = make_aware(
+            datetime.datetime(2019, 5, 3, 0, 0, 0, 0),
+            get_default_timezone()
+        )
+        event = Event.objects.create(
+            start_date=d,
+            end_date=d,
+            all_day=True,
+            created_by=user,
+            title="The big event",
+            description="Amazing event",
+            repeat="NEVER",
+        )
+        event2 = Event.objects.create(
+            start_date=d,
+            end_date=d,
+            all_day=True,
+            created_by=user,
+            title="The other event",
+            description="Incredible event",
+            repeat="NEVER",
+        )
+        event.save()
+        event2.save()
+        events = upcoming_events(finish=2000)
+        self.assertEqual(len(events['upcoming_events']), 2)