Merge pull request #2981 from fedspendingtransparency/staging

Sprint 126 Production Deploy

Author: tony-sappe

usaspending_api/accounts/tests/integration/test_federal_account.py

@@ -13,6 +13,7 @@
 from usaspending_api.accounts.models import FederalAccount, TreasuryAppropriationAccount
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 from usaspending_api.references.models import RefProgramActivity
+from usaspending_api.submissions.models import SubmissionAttributes
 
 
 @pytest.mark.django_db
@@ -45,13 +46,15 @@ def test_federal_account_spending_by_category_unique_program_activity_names(clie
             "main_account_code": "8888",
             "budget_year": "2222",
         },
+        {"model": SubmissionAttributes, "submission_id": 1, "is_final_balances_for_fy": True},
         {
             "model": FinancialAccountsByProgramActivityObjectClass,
             "financial_accounts_by_program_activity_object_class_id": -5,
             "obligations_incurred_by_program_object_class_cpe": -10,
             "final_of_fy": True,
             "treasury_account_id": -2,
             "program_activity_id": -3,
+            "submission_id": 1,
         },
         {
             "model": FinancialAccountsByProgramActivityObjectClass,
@@ -60,6 +63,7 @@ def test_federal_account_spending_by_category_unique_program_activity_names(clie
             "final_of_fy": True,
             "treasury_account_id": -2,
             "program_activity_id": -4,
+            "submission_id": 1,
         },
     ]
 

usaspending_api/accounts/tests/test_federal_account_fy_snapshot_v2.py

@@ -7,8 +7,15 @@
 
 @pytest.fixture
 def financial_spending_data(db):
-    latest_subm = mommy.make("submissions.SubmissionAttributes", reporting_fiscal_year=2017)
-    last_year_subm = mommy.make("submissions.SubmissionAttributes", reporting_fiscal_year=2016)
+    latest_subm = mommy.make(
+        "submissions.SubmissionAttributes", reporting_fiscal_year=2017, is_final_balances_for_fy=True
+    )
+    not_latest_subm = mommy.make(
+        "submissions.SubmissionAttributes", reporting_fiscal_year=2017, is_final_balances_for_fy=False
+    )
+    last_year_subm = mommy.make(
+        "submissions.SubmissionAttributes", reporting_fiscal_year=2016, is_final_balances_for_fy=True
+    )
     federal_account = mommy.make(FederalAccount, id=1)
 
     # create Object classes
@@ -32,7 +39,7 @@ def financial_spending_data(db):
         "accounts.AppropriationAccountBalances",
         treasury_account_identifier__federal_account=federal_account,
         final_of_fy=False,
-        submission=latest_subm,
+        submission=not_latest_subm,
         gross_outlay_amount_by_tas_cpe=999,
     )
     mommy.make(

usaspending_api/accounts/tests/test_federal_obligations.py

@@ -6,7 +6,12 @@
 
 @pytest.fixture
 def financial_obligations_models():
-    fiscal_year = mommy.make("submissions.SubmissionAttributes", reporting_fiscal_year=2016)
+    fiscal_year = mommy.make(
+        "submissions.SubmissionAttributes", reporting_fiscal_year=2016, is_final_balances_for_fy=True
+    )
+    fiscal_year_2 = mommy.make(
+        "submissions.SubmissionAttributes", reporting_fiscal_year=2016, is_final_balances_for_fy=False
+    )
     top_tier_id = mommy.make("references.Agency", id=654, toptier_agency_id=987).toptier_agency_id
     top_tier = mommy.make("references.ToptierAgency", toptier_agency_id=top_tier_id)
     federal_id_awesome = mommy.make(
@@ -88,7 +93,7 @@ def financial_obligations_models():
     # Test to make sure False value is ignored in calculation
     mommy.make(
         "accounts.AppropriationAccountBalances",
-        submission=fiscal_year,
+        submission=fiscal_year_2,
         final_of_fy=False,
         obligations_incurred_total_by_tas_cpe=200,
         treasury_account_identifier=id_awesome,

usaspending_api/accounts/tests/test_financial_balances.py

@@ -6,7 +6,12 @@
 
 @pytest.fixture
 def financial_balances_models():
-    sub = mommy.make("submissions.SubmissionAttributes", reporting_fiscal_year=2016, toptier_code="abc")
+    sub = mommy.make(
+        "submissions.SubmissionAttributes",
+        reporting_fiscal_year=2016,
+        toptier_code="abc",
+        is_final_balances_for_fy=True,
+    )
     agency1_toptier = mommy.make("references.TopTierAgency", toptier_agency_id=123, toptier_code="abc")
     mommy.make("references.Agency", id=456, toptier_agency_id=123)
     tas1 = mommy.make("accounts.TreasuryAppropriationAccount", funding_toptier_agency=agency1_toptier)

usaspending_api/accounts/tests/test_tas_endpoints.py

@@ -13,16 +13,24 @@
 def account_models():
     # Add submission data
     subm_2015_1 = mommy.make(
-        "submissions.SubmissionAttributes", reporting_period_start=date(2014, 10, 1), reporting_fiscal_year=2015
+        "submissions.SubmissionAttributes",
+        reporting_period_start=date(2014, 10, 1),
+        reporting_fiscal_year=2015,
     )
     subm_2015_2 = mommy.make(
-        "submissions.SubmissionAttributes", reporting_period_start=date(2015, 8, 1), reporting_fiscal_year=2015
+        "submissions.SubmissionAttributes",
+        reporting_period_start=date(2015, 8, 1),
+        reporting_fiscal_year=2015,
+        is_final_balances_for_fy=True,
     )
     subm_2016_1 = mommy.make(
         "submissions.SubmissionAttributes", reporting_period_start=date(2016, 1, 1), reporting_fiscal_year=2016
     )
     subm_2016_2 = mommy.make(
-        "submissions.SubmissionAttributes", reporting_period_start=date(2016, 6, 1), reporting_fiscal_year=2016
+        "submissions.SubmissionAttributes",
+        reporting_period_start=date(2016, 6, 1),
+        reporting_fiscal_year=2016,
+        is_final_balances_for_fy=True,
     )
 
     # add object classes

usaspending_api/accounts/views/federal_accounts_v2.py

@@ -87,8 +87,8 @@ class FiscalYearSnapshotFederalAccountsViewSet(APIView):
     @cache_response()
     def get(self, request, pk, fy=0, format=None):
         fy = int(fy) or SubmissionAttributes.latest_available_fy()
-        queryset = AppropriationAccountBalances.final_objects.filter(
-            treasury_account_identifier__federal_account_id=int(pk)
+        queryset = AppropriationAccountBalances.objects.filter(
+            submission__is_final_balances_for_fy=True, treasury_account_identifier__federal_account_id=int(pk)
         ).filter(submission__reporting_fiscal_year=fy)
         queryset = queryset.aggregate(
             outlay=Sum("gross_outlay_amount_by_tas_cpe"),
@@ -130,8 +130,8 @@ def post(self, request, pk, format=None):
         nested_order = ""
         group_results = OrderedDict()  # list of time_period objects ie {"fy": "2017", "quarter": "3"} : 1000
 
-        financial_account_queryset = AppropriationAccountBalances.final_objects.filter(
-            treasury_account_identifier__federal_account_id=int(pk)
+        financial_account_queryset = AppropriationAccountBalances.objects.filter(
+            submission__is_final_balances_for_fy=True, treasury_account_identifier__federal_account_id=int(pk)
         )
         if group == "fy" or group == "fiscal_year":
 

usaspending_api/accounts/views/federal_obligations.py

@@ -29,12 +29,11 @@ def get_queryset(self):
         if not funding_agency_id or not fiscal_year:
             raise InvalidParameterException("Missing required query parameters: fiscal_year & funding_agency_id")
 
-        # Using final_objects below ensures that we're only pulling the latest
-        # set of financial information for each fiscal year
         queryset = (
-            AppropriationAccountBalances.final_objects.filter(
+            AppropriationAccountBalances.objects.filter(
                 treasury_account_identifier__funding_toptier_agency__agency__id=funding_agency_id,
                 submission__reporting_fiscal_year=fiscal_year,
+                submission__is_final_balances_for_fy=True,
             )
             .annotate(
                 account_title=F("treasury_account_identifier__federal_account__account_title"),

usaspending_api/accounts/views/financial_balances.py

@@ -47,14 +47,12 @@ def get_queryset(self, pk=None):
         active_fiscal_year = submission.reporting_fiscal_year
         active_fiscal_quarter = submission.fiscal_quarter
 
-        # using final_objects ensures that we're only pulling the latest
-        # set of financial information for each fiscal year
         queryset = (
-            AppropriationAccountBalances.final_objects.all()
-            .filter(
+            AppropriationAccountBalances.objects.filter(
                 submission__reporting_fiscal_year=active_fiscal_year,
                 submission__reporting_fiscal_quarter=active_fiscal_quarter,
                 treasury_account_identifier__funding_toptier_agency=toptier_agency,
+                submission__is_final_balances_for_fy=True,
             )
             .annotate(fiscal_year=F("submission__reporting_fiscal_year"))
             .values("fiscal_year")

usaspending_api/accounts/views/financial_spending.py

@@ -51,16 +51,14 @@ def get_queryset(self):
         active_fiscal_year = submission.reporting_fiscal_year
         active_fiscal_quarter = submission.fiscal_quarter
 
-        # using final_objects ensures that we're only pulling the latest
-        # set of financial information for each fiscal year
         # Special case: major object class name for class 00 should be reported
         # as Unknown Object Type, overriding actual value in database
         queryset = (
-            FinancialAccountsByProgramActivityObjectClass.final_objects.all()
-            .filter(
+            FinancialAccountsByProgramActivityObjectClass.objects.filter(
                 submission__reporting_fiscal_year=active_fiscal_year,
                 submission__reporting_fiscal_quarter=active_fiscal_quarter,
                 treasury_account__funding_toptier_agency=toptier_agency,
+                submission__is_final_balances_for_fy=True,
             )
             .annotate(
                 major_object_class_name=Case(
@@ -119,9 +117,9 @@ def get_queryset(self):
         active_fiscal_year = submission.reporting_fiscal_year
         active_fiscal_quarter = submission.fiscal_quarter
 
-        # using final_objects below ensures that we're only pulling the latest
-        # set of financial information for each fiscal year
-        queryset = FinancialAccountsByProgramActivityObjectClass.final_objects.all()
+        queryset = FinancialAccountsByProgramActivityObjectClass.objects.filter(
+            submission__is_final_balances_for_fy=True
+        )
         # get the incoming agency's toptier agency, because that's what we'll
         # need to filter on
         # (used filter() instead of get() b/c we likely don't want to raise an

usaspending_api/accounts/views/tas.py

@@ -20,7 +20,7 @@ class TASBalancesAggregate(FilterQuerysetMixin, AggregateQuerysetMixin, CachedDe
     serializer_class = AggregateSerializer
 
     def get_queryset(self):
-        queryset = AppropriationAccountBalances.final_objects.all()
+        queryset = AppropriationAccountBalances.objects.filter(submission__is_final_balances_for_fy=True)
         queryset = self.filter_records(self.request, queryset=queryset)
         queryset = self.aggregate(self.request, queryset=queryset)
         queryset = self.order_records(self.request, queryset=queryset)
@@ -50,7 +50,9 @@ class TASCategoryAggregate(FilterQuerysetMixin, AggregateQuerysetMixin, CachedDe
     serializer_class = AggregateSerializer
 
     def get_queryset(self):
-        queryset = FinancialAccountsByProgramActivityObjectClass.final_objects.all()
+        queryset = FinancialAccountsByProgramActivityObjectClass.objects.filter(
+            submission__is_final_balances_for_fy=True
+        )
         queryset = self.filter_records(self.request, queryset=queryset)
         queryset = self.aggregate(self.request, queryset=queryset)
         queryset = self.order_records(self.request, queryset=queryset)