_save_batch() should not be a generator (#214)

* _save_batch() should not be a generator

* Run from branch

.github/workflows/etl.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: "deploy"
+          ref: "hcg/delete-fix-2"
       - name: Import transaction data
         run: |
           touch .env

camp_fin/management/commands/import_transactions.py

@@ -141,12 +141,15 @@ def _save_batch(self, batch):
         for cls, cls_records in groupby(
             sorted(batch, key=lambda x: str(type(x))), key=lambda x: type(x)
         ):
-            yield cls.objects.bulk_create(cls_records)
+            cls.objects.bulk_create(cls_records)
 
     def import_contributions(self, f, quarters, year, batch_size):
         reader = csv.DictReader(f)
         batch = []
 
+        n_deleted = 0
+        n_imported = 0
+
         for _, records in self._records_by_filing(reader, quarters):
             for i, record in enumerate(records):
                 if i == 0:
@@ -163,17 +166,23 @@ def import_contributions(self, f, quarters, year, batch_size):
                     # We need to make sure we just clear out the
                     # contributions in a file that were purportedly made
                     # in a given year.
-                    models.Loan.objects.filter(
+                    n_loans_deleted, _ = models.Loan.objects.filter(
                         filing=filing, received_date__year=year
                     ).delete()
-                    models.SpecialEvent.objects.filter(
+                    n_events_deleted, _ = models.SpecialEvent.objects.filter(
                         filing=filing, event_date__year=year
                     ).delete()
-                    models.Transaction.objects.filter(
-                        filing=filing, received_date__year=year
-                    ).exclude(
-                        transaction_type__description="Monetary Expenditure"
-                    ).delete()
+                    n_transactions_deleted, _ = (
+                        models.Transaction.objects.filter(
+                            filing=filing, received_date__year=year
+                        )
+                        .exclude(transaction_type__description="Monetary Expenditure")
+                        .delete()
+                    )
+
+                    n_deleted += (
+                        n_loans_deleted + n_events_deleted + n_transactions_deleted
+                    )
 
                 contributor = self.make_contributor(record)
 
@@ -191,15 +200,26 @@ def import_contributions(self, f, quarters, year, batch_size):
 
                 if len(batch) % batch_size == 0:
                     self._save_batch(batch)
+                    n_imported += batch_size
                     batch = []
 
         if len(batch) > 0:
             self._save_batch(batch)
+            n_imported += len(batch)
+
+        self.stdout.write(
+            self.style.NOTICE(
+                f"Deleted {n_deleted} records, created {n_imported} records"
+            )
+        )
 
     def import_expenditures(self, f, quarters, year, batch_size):
         reader = csv.DictReader(f)
         batch = []
 
+        n_deleted = 0
+        n_imported = 0
+
         for _, records in self._records_by_filing(reader, quarters):
             for i, record in enumerate(records):
                 if i == 0:
@@ -208,19 +228,32 @@ def import_expenditures(self, f, quarters, year, batch_size):
                     except ValueError:
                         break
 
-                    models.Transaction.objects.filter(
+                    n_transactions, _ = models.Transaction.objects.filter(
                         filing=filing,
                         transaction_type__description="Monetary Expenditure",
                         received_date__year=year,
                     ).delete()
 
+                    n_deleted += n_transactions
+
                 contribution = self.make_contribution(record, None, filing)
                 batch.append(contribution)
 
-                if not len(batch) % batch_size:
+                if len(batch) % batch_size == 0:
                     self._save_batch(batch)
+                    n_imported += batch_size
                     batch = []
 
+        if len(batch) > 0:
+            self._save_batch(batch)
+            n_imported += len(batch)
+
+        self.stdout.write(
+            self.style.NOTICE(
+                f"Deleted {n_deleted} records, created {n_imported} records"
+            )
+        )
+
     def make_contributor(self, record):
         state, _ = models.State.objects.get_or_create(
             postal_code=record["Contributor State"]