Cast bill action dates to date objects, not date time objects

councilmatic_core/feeds.py

@@ -8,6 +8,7 @@
 from django.conf import settings
 
 from .models import Person, Bill, Organization, Event
+from .utils import to_datetime
 
 
 class CouncilmaticFacetedSearchFeed(Feed):
@@ -71,7 +72,7 @@ def item_link(self, bill):
         return reverse('bill_detail', args=(bill.slug,))
 
     def item_pubdate(self, bill):
-        return bill.last_action_date
+        return to_datetime(bill.last_action_date)
 
     def description(self, obj):
         return "Bills returned from search"
@@ -114,7 +115,7 @@ def item_link(self, bill):
         return reverse('bill_detail', args=(bill.slug,))
 
     def item_pubdate(self, bill):
-        return bill.last_action_date
+        return to_datetime(bill.last_action_date)
 
     def description(self, obj):
         return "Recent sponsored bills from " + obj.name + "."
@@ -187,7 +188,7 @@ def item_link(self, action):
         return reverse('bill_detail', args=(action.bill.slug,))
 
     def item_pubdate(self, action):
-        return action.date_dt
+        return to_datetime(action.date_dt)
 
     def description(self, obj):
         return "Actions for committee %s" % obj.name
@@ -223,7 +224,7 @@ def item_link(self, action):
         return reverse('bill_detail', args=(action.bill.slug,))
 
     def item_pubdate(self, action):
-        return action.date_dt
+        return to_datetime(action.date_dt)
 
     def description(self, obj):
         return "Actions for bill %s" % obj.friendly_name

councilmatic_core/haystack_indexes.py

@@ -67,7 +67,5 @@ def get_updated_field(self):
         return 'updated_at'
 
     def prepare_last_action_date(self, obj):
-        # Solr seems to be fussy about the time format, and we do not need the time, just the date stamp.
-        # https://lucene.apache.org/solr/guide/7_5/working-with-dates.html#date-formatting
         if obj.last_action_date:
-            return obj.last_action_date.date()
+            return obj.last_action_date

councilmatic_core/migrations/0052_convert_last_action_date_to_datefield.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.16 on 2020-09-15 15:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('councilmatic_core', '0051_bill_last_action_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bill',
+            name='last_action_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

councilmatic_core/models.py

@@ -24,21 +24,29 @@
 class CastToDateTimeMixin:
 
     @classmethod
-    def cast_to_datetime(cls, field):
+    def _cast(cls, field, field_type):
         """
-        Cast a given field from a CharField to a DateTimeField, converting empty
-        strings to NULL in the process. Useful for CharFields that store timestamps
-        as strings.
+        Cast a given field from a CharField to a DateField or a DateTimeField,
+        converting empty strings to NULL in the process. Useful for CharFields
+        that store timestamps as strings.
         """
         return Cast(
             Case(
                 When(**{field: '', 'then': None}),
                 default=field,
                 output_field=models.CharField()
             ),
-            models.DateTimeField()
+            field_type
         )
 
+    @classmethod
+    def cast_to_date(cls, field):
+        return cls._cast(field, models.DateField())
+
+    @classmethod
+    def cast_to_datetime(cls, field):
+        return cls._cast(field, models.DateTimeField())
+
 
 class Person(opencivicdata.core.models.Person):
 
@@ -90,7 +98,7 @@ def sponsorship_sort(sponsorship):
             '''
             Sponsorships of bills without recent action dates should appear last.
             '''
-            return sponsorship.bill.last_action_date or datetime.datetime(datetime.MINYEAR, 1, 1)
+            return sponsorship.bill.last_action_date or datetime.date(datetime.MINYEAR, 1, 1)
 
         return sorted((s for s in primary_sponsorships), key=sponsorship_sort, reverse=True)
 
@@ -388,7 +396,7 @@ class Bill(opencivicdata.legislative.models.Bill):
 
     slug = models.SlugField(unique=True)
     restrict_view = models.BooleanField(default=False)
-    last_action_date = models.DateTimeField(blank=True, null=True)
+    last_action_date = models.DateField(blank=True, null=True)
 
     def delete(self, **kwargs):
         kwargs['keep_parents'] = kwargs.get('keep_parents', True)
@@ -567,7 +575,7 @@ def bills_since(cls, date_cutoff):
         """
         grabs all bills that have had activity since a given date
         """
-        return cls.objects.filter(last_action_date_dt__gte=date_cutoff)
+        return cls.objects.filter(last_action_date__gte=date_cutoff)
 
     @classmethod
     def new_bills_since(cls, date_cutoff):
@@ -616,7 +624,7 @@ def get_last_action_date(self):
             return None
 
         else:
-            return last_agenda.start_time
+            return last_agenda.start_time.date()
 
 
 class BillSponsorship(opencivicdata.legislative.models.BillSponsorship):
@@ -631,7 +639,7 @@ class Meta:
 class BillActionManager(CastToDateTimeMixin, models.Manager):
     def get_queryset(self):
         return super().get_queryset().annotate(
-            date_dt=self.cast_to_datetime('date')
+            date_dt=self.cast_to_date('date')
         )
 
 

councilmatic_core/utils.py

@@ -1,3 +1,7 @@
+import datetime
+import pytz
+
+from django.conf import settings
 from haystack.utils.highlighting import Highlighter
 
 
@@ -23,3 +27,13 @@ def make_query_words(self, query):
             query_words = set([word.lower() for word in query.split() if not word.startswith("-")])
 
         return query_words
+
+
+def to_datetime(date, local=False):
+    dt = datetime.datetime(date.year, date.month, date.day)
+
+    if local:
+        return pytz.timezone(settings.TIME_ZONE).localize(dt)
+
+    else:
+        return dt