fixes for related bills and related actions

Author: fgregg

pupa/importers/bills.py

@@ -1,3 +1,5 @@
+from django.db.models import Q
+
 from opencivicdata.legislative.models import (Bill, RelatedBill, BillAbstract, BillTitle,
                                               BillIdentifier, BillAction, BillActionRelatedEntity,
                                               BillSponsorship, BillSource, BillDocument,
@@ -82,9 +84,10 @@ def postimport(self):
                 bill__legislative_session__jurisdiction_id=self.jurisdiction_id,
                 related_bill=None):
             candidates = list(Bill.objects.filter(
-                legislative_session__identifier=rb.legislative_session,
-                legislative_session__jurisdiction_id=self.jurisdiction_id,
-                identifier=rb.identifier)
+                Q(legislative_session__identifier=rb.legislative_session,
+                  legislative_session__jurisdiction_id=self.jurisdiction_id),
+                Q(identifier=rb.identifier) |
+                Q(other_identifiers__identifier=rb.identifier))
             )
             if len(candidates) == 1:
                 rb.related_bill = candidates[0]

pupa/importers/vote_events.py

@@ -84,8 +84,7 @@ def prepare_for_db(self, data):
                                                 organization_id=data['organization_id'],
                                                 )
                 # seen_action_ids is for ones being added in this import
-                # action.vote is already set if action was set on prior import
-                if action.id in self.seen_action_ids or hasattr(action, 'vote'):
+                if action.id in self.seen_action_ids:
                     self.warning('can not match two VoteEvents to %s: %s',
                                  action.id, bill_action)
                 else: