Merge pull request #3353 from GSA-TTS/main

backend/audit/intake_to_dissemination.py

@@ -35,6 +35,7 @@ def __init__(self, sac, mode=DISSEMINATION) -> None:
         self.audit_year = int(audit_date.split("-")[0])
         self.loaded_objects: dict[str, list] = {}
         self.mode = mode
+        self.errors: list[str] = []
 
     def load_all(self):
         load_methods = {
@@ -54,9 +55,11 @@ def load_all(self):
                 # Each method writes results into self.loaded_objects
                 load_method()
             except KeyError as key_error:
-                logger.warning(
+                error = (
                     f"{type(key_error).__name__} in {load_method.__name__}: {key_error}"
                 )
+                logger.warning(error)
+                self.errors.append(error)
         return self.loaded_objects
 
     def get_dissemination_objects(self):
@@ -69,9 +72,9 @@ def save_dissemination_objects(self):
                     model_class = type(object_list[0])
                     model_class.objects.bulk_create(object_list)
             except IntegrityError as e:
-                logging.warning(
-                    f"An error occurred during bulk creation for {key}: {e}"
-                )
+                error = f"An error occurred during bulk creation for {key}: {e}"
+                logger.warning(error)
+                self.errors.append(error)
 
     def load_finding_texts(self):
         findings_text = self.single_audit_checklist.findings_text

backend/audit/intakelib/checks/check_loan_balance_present.py

@@ -25,7 +25,7 @@ def loan_balance_present(ir):
     for index, (guarantee, balance) in enumerate(
         zip(is_guaranteed, loan_balance_at_period_end)
     ):
-        if (guarantee == "N") and balance:
+        if (guarantee == "N") and balance is not None:
             errors.append(
                 build_cell_error_tuple(
                     ir,

backend/audit/models/models.py

@@ -4,6 +4,7 @@
 import logging
 
 from django.db import models
+from django.db.transaction import TransactionManagementError
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.postgres.fields import ArrayField
@@ -198,15 +199,25 @@ def disseminate(self):
         Cognizant/Oversight agency assignment followed by dissemination
         ETL.
         """
-        # try:
-        if not self.cognizant_agency and not self.oversight_agency:
-            self.assign_cog_over()
-        intake_to_dissem = IntakeToDissemination(self)
-        intake_to_dissem.load_all()
-        intake_to_dissem.save_dissemination_objects()
-        # TODO: figure out what exceptions to catch here
-        # except Exception as err:
-        #     return {"error": err}
+        try:
+            if not self.cognizant_agency and not self.oversight_agency:
+                self.assign_cog_over()
+            intake_to_dissem = IntakeToDissemination(self)
+            intake_to_dissem.load_all()
+            intake_to_dissem.save_dissemination_objects()
+            if intake_to_dissem.errors:
+                return {"errors": intake_to_dissem.errors}
+        except TransactionManagementError as err:
+            # We want to re-raise this to catch at the view level because we
+            # think it's due to a race condition where the user's submission
+            # has been disseminated successfully; see
+            # https://github.com/GSA-TTS/FAC/issues/3347
+            raise err
+        # TODO: figure out what narrower exceptions to catch here
+        except Exception as err:
+            return {"errors": [err]}
+
+        return None
 
     def assign_cog_over(self):
         """

backend/audit/test_intake_to_dissemination.py

@@ -1,5 +1,7 @@
 from datetime import datetime, time, timezone, timedelta
 import json
+import logging
+from unittest import mock
 from django.test import TestCase
 from model_bakery import baker
 from faker import Faker
@@ -429,6 +431,15 @@ def test_load_general(self):
             general.gaap_results,
         )
 
+    def test_load_general_race_condition_logging(self):
+        self.intake_to_dissemination.load_general()
+        logger = logging.getLogger(self.intake_to_dissemination.__module__)
+        self.intake_to_dissemination.save_dissemination_objects()
+        with mock.patch.object(logger, "warning") as mock_warning:
+            self.intake_to_dissemination.save_dissemination_objects()
+            mock_warning.assert_called()
+        self.assertEquals(1, len(self.intake_to_dissemination.errors))
+
     def test_submitted_date(self):
         """
         The date of submission should be disseminated using the time in American Samoa.