Merge branch 'qat' into tst/emr-pipeline-testing

Author: sethstoudenmier

usaspending_api/accounts/v2/views/federal_account_base.py

@@ -1,10 +1,7 @@
 from django.db.models import Q
-from django.utils.functional import cached_property
-from rest_framework.request import Request
 from rest_framework.views import APIView
 
-from usaspending_api.common.data_classes import Pagination
-from usaspending_api.common.validator import TinyShield, customize_pagination_with_sort_columns
+from usaspending_api.common.validator import TinyShield
 
 
 class FederalAccountBase(APIView):
@@ -75,33 +72,3 @@ def get_program_activity_query(self, validated_data) -> Q:
             query &= Q(Q(program_activity_reporting_key__isnull=False) | Q(program_activity__isnull=False))
 
         return query
-
-
-class PaginationMixin:
-    request: Request
-
-    default_sort_column: str
-    sortable_columns: list[str]
-
-    @cached_property
-    def pagination(self):
-        model = customize_pagination_with_sort_columns(self.sortable_columns, self.default_sort_column)
-        request_data = (
-            TinyShield(model).block(self.request.data)
-            if self.request.method == "POST"
-            else TinyShield(model).block(self.request.query_params)
-        )
-
-        # Use the default sort as a tie-breaker in the case of a different sort provided
-        primary_sort_key = request_data.get("sort", self.default_sort_column)
-        secondary_sort_key = self.default_sort_column if primary_sort_key != self.default_sort_column else None
-
-        return Pagination(
-            page=request_data["page"],
-            limit=request_data["limit"],
-            lower_limit=(request_data["page"] - 1) * request_data["limit"],
-            upper_limit=(request_data["page"] * request_data["limit"]),
-            sort_key=primary_sort_key,
-            sort_order=request_data["order"],
-            secondary_sort_key=secondary_sort_key,
-        )

usaspending_api/accounts/v2/views/federal_account_object_classes_total.py

@@ -2,8 +2,9 @@
 from rest_framework.response import Response
 from rest_framework.request import Request
 
-from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase, PaginationMixin
+from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 
 

usaspending_api/accounts/v2/views/federal_account_program_activities.py

@@ -4,7 +4,8 @@
 from rest_framework.response import Response
 
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
-from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase, PaginationMixin
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
+from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 
 

usaspending_api/accounts/v2/views/federal_account_program_activities_total.py

@@ -3,8 +3,9 @@
 from rest_framework.response import Response
 from rest_framework.request import Request
 
-from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase, PaginationMixin
+from usaspending_api.accounts.v2.views.federal_account_base import FederalAccountBase
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 
 

usaspending_api/agency/v2/views/agency_base.py

@@ -8,7 +8,6 @@
 from rest_framework.views import APIView
 
 from usaspending_api.awards.v2.lookups.lookups import award_type_mapping
-from usaspending_api.common.data_classes import Pagination
 from usaspending_api.common.helpers.date_helper import fy
 from usaspending_api.common.helpers.dict_helpers import update_list_of_dictionaries
 from usaspending_api.common.helpers.fiscal_year_helpers import (
@@ -17,7 +16,7 @@
     current_fiscal_year,
 )
 from usaspending_api.common.helpers.generic_helper import get_account_data_time_period_message
-from usaspending_api.common.validator import TinyShield, customize_pagination_with_sort_columns
+from usaspending_api.common.validator import TinyShield
 from usaspending_api.references.models import ToptierAgency, Agency
 from usaspending_api.submissions.helpers import validate_request_within_revealed_submissions
 
@@ -181,18 +180,3 @@ def create_assurance_statement_url(result):
             + "-Agency_Comments.txt"
         )
         return f"{host}/agency_submissions/{file_name}"
-
-
-class PaginationMixin:
-    @cached_property
-    def pagination(self):
-        model = customize_pagination_with_sort_columns(self.sortable_columns, self.default_sort_column)
-        request_data = TinyShield(model).block(self.request.query_params)
-        return Pagination(
-            page=request_data["page"],
-            limit=request_data["limit"],
-            lower_limit=(request_data["page"] - 1) * request_data["limit"],
-            upper_limit=(request_data["page"] * request_data["limit"]),
-            sort_key=request_data.get("sort", self.default_sort_column),
-            sort_order=request_data["order"],
-        )

usaspending_api/agency/v2/views/award_count.py

@@ -4,10 +4,11 @@
 
 from rest_framework.request import Request
 from rest_framework.response import Response
-from usaspending_api.agency.v2.views.agency_base import AgencyBase, PaginationMixin
+from usaspending_api.agency.v2.views.agency_base import AgencyBase
 from usaspending_api.common.cache_decorator import cache_response
 from usaspending_api.common.elasticsearch.search_wrappers import AwardSearch
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.common.query_with_filters import QueryWithFilters
 from usaspending_api.search.filters.elasticsearch.filter import QueryType
 from usaspending_api.search.filters.time_period.decorators import NewAwardsOnlyTimePeriod

usaspending_api/agency/v2/views/budget_function.py

@@ -2,10 +2,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from typing import Any
-from usaspending_api.agency.v2.views.agency_base import AgencyBase, PaginationMixin
+from usaspending_api.agency.v2.views.agency_base import AgencyBase
 from usaspending_api.common.cache_decorator import cache_response
 from usaspending_api.common.calculations.file_b import FileBCalculations
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 from usaspending_api.submissions.helpers import get_latest_submission_ids_for_fiscal_year
 

usaspending_api/agency/v2/views/bureau_federal_account.py

@@ -3,11 +3,12 @@
 from rest_framework.response import Response
 from typing import Any, List
 from usaspending_api.accounts.models.appropriation_account_balances import AppropriationAccountBalances
-from usaspending_api.agency.v2.views.agency_base import AgencyBase, PaginationMixin
+from usaspending_api.agency.v2.views.agency_base import AgencyBase
 from usaspending_api.common.cache_decorator import cache_response
 from usaspending_api.common.calculations.file_b import FileBCalculations
 from usaspending_api.common.helpers.date_helper import now
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 from usaspending_api.references.models import BureauTitleLookup
 from usaspending_api.submissions.models import SubmissionAttributes

usaspending_api/agency/v2/views/federal_account_list.py

@@ -2,10 +2,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from typing import Any, List
-from usaspending_api.agency.v2.views.agency_base import AgencyBase, PaginationMixin
+from usaspending_api.agency.v2.views.agency_base import AgencyBase
 from usaspending_api.common.cache_decorator import cache_response
 from usaspending_api.common.calculations.file_b import FileBCalculations
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 from usaspending_api.submissions.helpers import get_latest_submission_ids_for_fiscal_year
 

usaspending_api/agency/v2/views/object_class_list.py

@@ -2,10 +2,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from typing import Any, List
-from usaspending_api.agency.v2.views.agency_base import AgencyBase, PaginationMixin
+from usaspending_api.agency.v2.views.agency_base import AgencyBase
 from usaspending_api.common.cache_decorator import cache_response
 from usaspending_api.common.calculations.file_b import FileBCalculations
 from usaspending_api.common.helpers.generic_helper import get_pagination_metadata
+from usaspending_api.common.helpers.pagination_mixin import PaginationMixin
 from usaspending_api.financial_activities.models import FinancialAccountsByProgramActivityObjectClass
 from usaspending_api.submissions.helpers import get_latest_submission_ids_for_fiscal_year