Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Events to Bills: Add -1 Day to Match Query #141

Merged
merged 7 commits into from
Sep 16, 2024
Merged

Events to Bills: Add -1 Day to Match Query #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fdb5c13
Resolve Bills: init retry query
NewAgeAirbender Sep 10, 2024
4375d71
Events: retry working & updated logs
NewAgeAirbender Sep 12, 2024
e58cf6f
Resolve Bills: tweak initial query, retry a week
NewAgeAirbender Sep 12, 2024
d4fd0c8
Resolve Bill: update test to correct event start_date format
NewAgeAirbender Sep 12, 2024
dacf285
Resolve Bills: just change date for initial query
NewAgeAirbender Sep 13, 2024
d2c6da6
Resolve Organizations: add iexact to make incasesensitive
NewAgeAirbender Sep 13, 2024
d6c2684
Resolve Organizations: restore previous query
NewAgeAirbender Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion openstates/importers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion openstates/importers/tests/test_event_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Loading