Events to Bills: Add -1 Day to Match Query

openstates/importers/base.py

@@ -4,6 +4,7 @@
 import json
 import logging
 import typing
+from datetime import datetime, timedelta
 from django.db.models import Q, Model
 from django.db.models.signals import post_save
 from .. import settings
@@ -168,8 +169,12 @@ def resolve_bill(self, bill_id: str, *, date: str) -> typing.Optional[_ID]:
         if bill_transform_func:
             bill_id = bill_transform_func(bill_id)
 
+        # move the start_date up a bit in case the event is on the last day of a session to compare with end_date
+        date = datetime.fromisoformat(date)
+        new_date = date + timedelta(days=-1)
+
         objects = Bill.objects.filter(
-            Q(legislative_session__end_date__gte=date)
+            Q(legislative_session__end_date__gte=new_date)
             | Q(legislative_session__end_date=""),
             legislative_session__start_date__lte=date,
             legislative_session__jurisdiction_id=self.jurisdiction_id,
@@ -180,7 +185,23 @@ def resolve_bill(self, bill_id: str, *, date: str) -> typing.Optional[_ID]:
         if len(ids) == 1:
             return ids.pop()
         elif len(ids) == 0:
-            self.error(f"could not resolve bill id {bill_id} {date}, no matches")
+            self.warning(f"could not resolve {bill_id} {new_date}, no matches so will retry with a week earlier")
+            week_date = date + timedelta(days=-7)
+            objects = Bill.objects.filter(
+                Q(legislative_session__end_date__gte=week_date)
+                | Q(legislative_session__end_date=""),
+                legislative_session__start_date__lte=date,
+                legislative_session__jurisdiction_id=self.jurisdiction_id,
+                identifier=bill_id,
+            )
+            ids = {each.id for each in objects}
+            if len(ids) == 1:
+                self.info(f"resolved bill id {bill_id} with tweaked start_date {week_date}")
+                return ids.pop()
+            else:
+                self.error(
+                    f"could not resolve bill with tweaked date {bill_id} {new_date}, {len(ids)} matches"
+                )
         else:
             self.error(
                 f"could not resolve bill id {bill_id} {date}, {len(ids)} matches"

openstates/importers/tests/test_event_importer.py

@@ -32,7 +32,7 @@ def create_other_jurisdiction():
 def ge():
     event = ScrapeEvent(
         name="America's Birthday",
-        start_date="2014-07-04T05:00Z",
+        start_date="2014-07-04T05:00:00+00:00",
         location_name="America",
         all_day=True,
     )