Merge pull request #3021 from fedspendingtransparency/staging

Sprint 127 Prod Deploy (w/o Warmfixes)

Author: tony-sappe

usaspending_api/accounts/v2/filters/account_download.py

@@ -47,7 +47,7 @@
     get_submission_ids_for_periods,
 )
 
-AWARD_URL = f"{HOST}/#/award/" if "localhost" in HOST else f"https://{HOST}/#/award/"
+AWARD_URL = f"{HOST}/award/" if "localhost" in HOST else f"https://{HOST}/award/"
 
 
 def account_download_filter(account_type, download_table, filters, account_level="treasury_account"):

usaspending_api/api_contracts/contracts/v2/download/count.md

@@ -48,7 +48,7 @@ Returns the number of transactions that would be included in a download request
         + `calculated_transaction_count` (required, number)
             The calculated count of all transactions which would be included in the download files.
         + `maximum_transaction_limit` (required, number)
-            The current allowed maximum number of transactions in a row-limited download. Visit https://www.usaspending.gov/#/download_center/custom_award_data to download larger volumes of data.
+            The current allowed maximum number of transactions in a row-limited download. Visit https://www.usaspending.gov/download_center/custom_award_data to download larger volumes of data.
         + `messages` (optional, array[string])
             An array of warnings or instructional directives to aid consumers of this endpoint with development and debugging.
     + Body

usaspending_api/api_contracts/contracts/v2/reporting/agencies/overview.md

@@ -36,7 +36,7 @@ This endpoint returns an overview list of government agencies submission data.
         + Members
             + `toptier_code`
             + `current_total_budget_authority_amount`
-            + `missing_tas_accounts_total`
+            + `tas_accounts_total`
             + `missing_tas_accounts_count`
             + `agency_name`
             + `obligation_difference`
@@ -82,8 +82,8 @@ This endpoint returns an overview list of government agencies submission data.
                             "missing_tas_accounts_count": 20
                         },
                         "obligation_difference": 436376232652.87,
-                        "unlinked_contract_award_count": 0,
-                        "unlinked_assistance_award_count": 0,
+                        "unlinked_contract_award_count": 3,
+                        "unlinked_assistance_award_count": 2,
                         "assurance_statement_url": "https://files-nonprod.usaspending.gov/agency_submissions/Raw%20DATA%20Act%20Files/2020/P09/075%20-%20Department%20of%20Health%20and%20Human%20Services%20(HHS)/2020-P09-075_Department%20of%20Health%20and%20Human%20Services%20(HHS)-Assurance_Statement.txt"
                     },
                     {

usaspending_api/api_contracts/contracts/v2/reporting/agencies/toptier_code/fiscal_year/fiscal_period/unlinked_awards/type.md

@@ -0,0 +1,37 @@
+FORMAT: 1A
+HOST: https://api.usaspending.gov
+
+# Agencies' Unlinked Awards [/api/v2/reporting/agencies/{toptier_code}/{fiscal_year}/{fiscal_period}/unlinked_awards/{type}/]
+
+This endpoint is used to power USAspending.gov's About the Data \| Agencies unlinked data modals.
+
+## GET
+
+This endpoint returns the number of unlinked and linked awards for the agency in the provided fiscal year and period.
+
++ Parameters
+    + `toptier_code`: `020` (required, string)
+        The specific agency code.
+    + `fiscal_year`: 2020 (required, number)
+        The fiscal year of the submission
+    + `fiscal_period`: 10 (required, number)
+        The fiscal period of the submission. valid values: 2-12 (2 = November ... 12 = September)
+        For retrieving quarterly submissions, provide the period which equals 'quarter * 3' (e.g. Q2 = P6)
+    + `type`: `assistance` (required, enum[string])
+        + Members
+            + `assistance`
+            + `procurement`
+
++ Response 200 (application/json)
+
+    + Attributes (object)
+        + `unlinked_file_c_award_count` (required, number)
+        + `unlinked_file_d_award_count` (required, number)
+        + `total_linked_award_count` (required, number)
+    + Body
+
+            {
+                "unlinked_file_c_award_count": 123213,
+                "unlinked_file_d_award_count": 43543,
+                "total_linked_award_count": 12321312
+            }

usaspending_api/api_contracts/contracts/v2/reporting/agencies/toptier_code/overview.md

@@ -32,7 +32,7 @@ This endpoint returns an overview of government agency submission data.
             + `fiscal_period`
             + `fiscal_year`
             + `missing_tas_accounts_count`
-            + `missing_tas_accounts_total`
+            + `tas_accounts_total`
             + `obligation_difference`
             + `percent_of_total_budgetary_resources`
             + `recent_publication_date`
@@ -78,8 +78,8 @@ This endpoint returns an overview of government agency submission data.
                             "missing_tas_accounts_count": 9
                         },
                         "obligation_difference": 12581114.45,
-                        "unlinked_contract_award_count": 0,
-                        "unlinked_assistance_award_count": 0,
+                        "unlinked_contract_award_count": 2,
+                        "unlinked_assistance_award_count": 5,
                         "assurance_statement_url": "https://files.usaspending.gov/agency_submissions/Raw%20DATA%20Act%20Files/2020/P07/020%20-%20Department%20of%20the%20Treasury%20(TREAS)/2020-P07-020_Department%20of%20the%20Treasury%20(TREAS)-Assurance_Statement.txt"
                     },
                     {

usaspending_api/api_contracts/contracts/v2/reporting/placeholder.md

@@ -47,15 +47,37 @@ This endpoint returns a filtered set of subawards.
         + `results` (required, array[SubawardResponse], fixed-type)
         + `page_metadata` (required, PageMetadataObject)
 
+    + Body
+
+            {
+                "page_metadata": {
+                    "page": 1,
+                    "next": 2,
+                    "previous": null,
+                    "hasNext": true,
+                    "hasPrevious": false
+                },
+                "results": [
+                    {
+                        "id": 119270129,
+                        "subaward_number": "Z981002",
+                        "description": "DEVELOPMENT OF A SELF-SUSTAINED WIRELESS INTEGRATED STRUCTURAL HEALTH MONITORING SYSTEM FOR HIGHWAY BRIDGES",
+                        "action_date": "2011-10-27",
+                        "amount": 110000.0,
+                        "recipient_name": "URS GROUP, INC."
+                    }
+                ]
+            }
+
 # Data Structures
 
 ## SubawardResponse (object)
-+ `subaward_number` (required, string)
-+ `amount` (required, number)
 + `id` (required, number)
++ `subaward_number` (required, string)
++ `description` (required, string)
 + `action_date` (required, string)
++ `amount` (required, number)
 + `recipient_name` (required, string)
-+ `description` (required, string)
 
 ## PageMetadataObject (object)
 + `page` (required, number)

usaspending_api/api_contracts/contracts/v2/subawards.md

@@ -7,7 +7,7 @@ class Command(BaseCommand):
     help = "Generates a markdown file of a model's fields and help text \
             for use in documentation \
             Usage: `python manage.py generate_model_markdown <MODEL>`"
-    logger = logging.getLogger("console")
+    logger = logging.getLogger("script")
 
     friendly_names = {
         "ForeignKey": "Relation",

usaspending_api/api_docs/management/commands/generate_model_markdown.py

@@ -147,6 +147,7 @@ The currently available endpoints are listed in the following table.
 |[/api/v2/reporting/agencies/overview/](/api/v2/reporting/agencies/overview/)|GET| Returns About the Data information about all agencies with submissions in a provided fiscal year and period|
 |[/api/v2/reporting/agencies/publish_dates/](/api/v2/reporting/agencies/publish_dates/)|GET| Returns submission publication and certification information about all agencies with submissions in a provided fiscal year and period|
 |[/api/v2/reporting/agencies/<TOPTIER_CODE\>/<FISCAL_YEAR\>/<FISCAL_PERIOD\>/submission_history/](/api/v2/reporting/agencies/020/2020/12/submission_history/)|GET| Returns a list of submission publication dates and certified dates for the provided agency for the provided fiscal year and period. |
+|[/api/v2/reporting/agencies/<TOPTIER_CODE\>/<FISCAL_YEAR\>/<FISCAL_PERIOD\>/unlinked_awards/<TYPE\>/](/api/v2/reporting/agencies/020/2020/12/unlinked_awards/procurement/)|GET| Returns counts of an agency's linked and unlinked awards for a given period. |
 |[/api/v2/search/new_awards_over_time/](/api/v2/search/new_awards_over_time/)|POST| Returns a list of time periods with the new awards in the appropriate period within the provided time range |
 |[/api/v2/search/spending_by_award/](/api/v2/search/spending_by_award/)|POST| Returns the fields of the filtered awards |
 |[/api/v2/search/spending_by_award_count/](/api/v2/search/spending_by_award_count/)|POST| Returns the number of awards in each award type (Contracts, IDV, Loans, Direct Payments, Grants, and Other) |

usaspending_api/api_docs/markdown/endpoints.md

@@ -96,4 +96,4 @@ POST
 
 # Postman Collections <a name="postman"></a>
 
-[Postman](https://www.getpostman.com/) is a free app for making easy API requests. You can also use it to import and inspect a collection of pre-generated API requests. [Here is a postman collection](https://raw.githubusercontent.com/fedspendingtransparency/usaspending-api/master/usaspending_api/static_doc_files/docs/usaspending_searchpage_postmancollection.json) you can use to see how we generate the visualizations on [the search page](https://www.usaspending.gov/#/search/).
+[Postman](https://www.getpostman.com/) is a free app for making easy API requests. You can also use it to import and inspect a collection of pre-generated API requests. [Here is a postman collection](https://raw.githubusercontent.com/fedspendingtransparency/usaspending-api/master/usaspending_api/static_doc_files/docs/usaspending_searchpage_postmancollection.json) you can use to see how we generate the visualizations on [the search page](https://www.usaspending.gov/search/).