Merge pull request #2932 from fedspendingtransparency/master

Master -> QAT

Author: sethstoudenmier

usaspending_api/awards/migrations/0079_auto_20210128_2234.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.2.17 on 2021-01-28 22:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('awards', '0078_auto_20210126_1817'),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name='financialaccountsbyawards',
+            name='faba_subid_awardkey_sums_idx',
+        ),
+        migrations.AddIndex(
+            model_name='financialaccountsbyawards',
+            index=models.Index(condition=models.Q(disaster_emergency_fund__in=['L', 'M', 'N', 'O', 'P']), fields=['submission', 'distinct_award_key', 'piid', 'transaction_obligated_amount', 'gross_outlay_amount_by_award_cpe'], name='faba_subid_awardkey_sums_idx'),
+        ),
+    ]

usaspending_api/awards/models/financial_accounts_by_awards.py

@@ -159,6 +159,6 @@ class Meta:
                     "gross_outlay_amount_by_award_cpe",
                 ],
                 name="faba_subid_awardkey_sums_idx",
-                condition=Q(disaster_emergency_fund__in=["L", "M", "N", "O", "P", "R"]),
+                condition=Q(disaster_emergency_fund__in=["L", "M", "N", "O", "P"]),
             )
         ]

usaspending_api/etl/elasticsearch_loader_helpers/delete_data.py

@@ -177,7 +177,7 @@ def _lookup_deleted_award_ids(client: Elasticsearch, id_list: list, config: dict
             body = filter_query(column, v)
             response = client.search(index=index, body=json.dumps(body), size=config["max_query_size"])
             if response["hits"]["total"]["value"] != 0:
-                awards = [x["_source"][ES_AWARDS_UNIQUE_KEY_FIELD] for x in response["hits"]["hits"]]
+                awards += [x["_source"][ES_AWARDS_UNIQUE_KEY_FIELD] for x in response["hits"]["hits"]]
     return awards