bad cache

camp_fin/management/commands/import_api_data.py

@@ -147,7 +147,10 @@ def import_expenditures(self, f):
  reader = csv.DictReader(f)
 
  key_func = lambda record: (record["OrgID"], record["Report Name"])
- sorted_records = sorted(reader, key=key_func)
+
+ sorted_records = sorted(
+ (row for row in reader if None not in key_func(row)), key=key_func
+ )
 
  expenditures = []
 
@@ -296,20 +299,24 @@ def make_filing(self, record):
  transaction_year = self.parse_date(transaction_date).year
 
  try:
- campaign = candidate.campaign_set.get(
- election_season__year=transaction_year
+ campaign = models.Campaign.objects.get(
+ candidate=candidate, election_season__year=transaction_year
  )
  except models.Campaign.DoesNotExist:
  self.stderr.write(
  f"Could not find campaign for {candidate} in {transaction_year}"
  )
+
  campaign = None
 
  if campaign and campaign.committee_name != record["Committee Name"]:
  campaign.committee_name = record["Committee Name"]
  campaign.save()
 
- filing_kwargs = {"entity": candidate.entity, "campaign": campaign}
+ if campaign:
+ filing_kwargs = {"entity": candidate.entity, "campaign": campaign}
+ else:
+ filing_kwargs = {"entity": candidate.entity}
 
  else:
  pac = self.make_pac(record)
@@ -527,14 +534,7 @@ def _get_or_create_candidate(self, record):
  last_name=record["Candidate Last Name"] or None,
  suffix=record["Candidate Suffix"] or None,
  full_name=full_name,
- slug=slugify(
- " ".join(
- [
- record["Candidate First Name"],
- record["Candidate Last Name"],
- ]
- )
- ),
+ slug=slugify(full_name),
  entity=person,
  )
 

camp_fin/management/commands/import_office_api_data.py

@@ -85,11 +85,16 @@ def handle(self, *args, **options):
  " ".join(
  [
  candidate_name.get("GivenName", ""),
- candidate_name.get("MiddleName", "")
- or candidate_name.get("MiddleInitial", ""),
+ (
+ candidate_name.get("MiddleName", "")
+ or candidate_name.get("MiddleInitial", "")
+ or candidate_name.get("Nickname", "")
+ ),
  candidate_name.get("Surname", ""),
- candidate_name.get("SuffixGenerational", "")
- or candidate_name.get("SuffixOther", ""),
+ (
+ candidate_name.get("SuffixGenerational", "")
+ or candidate_name.get("SuffixOther", "")
+ ),
  ]
  ),
  ).strip()
@@ -118,14 +123,7 @@ def handle(self, *args, **options):
  or candidate_name.get("SuffixOther")
  ),
  full_name=full_name,
- slug=slugify(
- " ".join(
- [
- candidate_name.get("GivenName", ""),
- candidate_name.get("Surname", ""),
- ]
- )
- ),
+ slug=slugify(full_name),
  entity=person,
  )