313 feature update title 2 data to use years 2014 2023 (#314)

* Update title-2 data response to use years 2014 to 2023.

* Update CHANGELOG.

* Make start and end year for Title-II endpoints a global variable and add those values in the summary endpoint response.

Author: sandeep-ps

CHANGELOG.md

@@ -4,13 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## Unreleased
 
 ### Added
 - Add year query parameter to Title-I program and top-level endpoints. [#300](https://github.com/policy-design-lab/pdl-api/issues/300)
 - Add year query parameter to SNAP endpoints. [#303](https://github.com/policy-design-lab/pdl-api/issues/303)
 - Add year query parameter to Crop Insurance endpoints. [#302](https://github.com/policy-design-lab/pdl-api/issues/302)
 
+### Changed
+- Update Title II endpoints to include data from 2014 to 2023. [#313](https://github.com/policy-design-lab/pdl-api/issues/313)
+
 ## [0.22.0] - 2025-02-26
 
 ### Added

app/controllers/pdl.py

@@ -91,6 +91,9 @@
 TITLE_IV_SNAP_PROGRAM_NAME = "Supplemental Nutrition Assistance Program (SNAP)"
 TITLE_XI_CROP_INSURANCE_PROGRAM_NAME = "Crop Insurance"
 
+TITLE_II_START_YEAR = 2014
+TITLE_II_END_YEAR = 2023
+
 
 def search():
     out_json = jsonutils.create_test_message()
@@ -433,21 +436,34 @@ def titles_title_i_subtitles_subtitle_e_summary_search():
     endpoint_response = generate_title_i_summary_response(subtitle_id, start_year, end_year)
     return endpoint_response
 
+
 # /pdl/titles/title-ii/summary:
 def titles_title_ii_summary_search():
-    start_year = 2018
-    end_year = 2022
-    title_id = 101
-    endpoint_response = generate_title_ii_total_summary_response(title_id, start_year, end_year)
+    title_id = get_title_id(TITLE_II_NAME)
+    if title_id is None:
+        msg = {
+            "reason": "No record for the given title name " + TITLE_II_NAME,
+            "error": "Not found: " + request.url,
+        }
+        logging.error("Title II: " + json.dumps(msg))
+        return rs_handlers.not_found(msg)
+
+    endpoint_response = generate_title_ii_total_summary_response(title_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
 # /pdl/titles/title-ii/state-distribution:
 def titles_title_ii_state_distribution_search():
-    start_year = 2018
-    end_year = 2022
-    title_id = 101
-    endpoint_response = generate_title_ii_total_state_distribution_response(title_id, start_year, end_year)
+    title_id = get_title_id(TITLE_II_NAME)
+    if title_id is None:
+        msg = {
+            "reason": "No record for the given title name " + TITLE_II_NAME,
+            "error": "Not found: " + request.url,
+        }
+        logging.error("Title II: " + json.dumps(msg))
+        return rs_handlers.not_found(msg)
+
+    endpoint_response = generate_title_ii_total_state_distribution_response(title_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 # /pdl/titles/title-ii/programs/eqip/map
@@ -476,9 +492,7 @@ def titles_title_ii_programs_eqip_state_distribution_search(practice_code=None):
         logging.error("EQIP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
 
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_state_distribution_response(program_id, start_year, end_year, practice_code=practice_code)
+    endpoint_response = generate_title_ii_state_distribution_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR, practice_code=practice_code)
     return endpoint_response
 
 
@@ -492,9 +506,8 @@ def titles_title_ii_programs_eqip_summary_search():
         }
         logging.error("EQIP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_summary_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_summary_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -508,9 +521,8 @@ def titles_title_ii_programs_eqip_practice_names_search():
         }
         logging.error("EQIP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_practice_names_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_practice_names_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -599,9 +611,8 @@ def titles_title_ii_programs_csp_state_distribution_search(practice_code=None):
         }
         logging.error("CSP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_state_distribution_response(program_id, start_year, end_year, practice_code=practice_code)
+
+    endpoint_response = generate_title_ii_state_distribution_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR, practice_code=practice_code)
     return endpoint_response
 
 
@@ -615,9 +626,8 @@ def titles_title_ii_programs_csp_summary_search():
         }
         logging.error("CSP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_summary_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_summary_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -631,9 +641,8 @@ def titles_title_ii_programs_csp_practice_names_search():
         }
         logging.error("EQIP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_practice_names_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_practice_names_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -696,6 +705,7 @@ def titles_title_ii_programs_csp_ira_predicted_search():
 
         return data_json
 
+
 # /pdl/titles/title-ii/programs/crp/state-distribution
 def titles_title_ii_programs_crp_state_distribution_search():
     program_id = get_program_id(TITLE_II_CRP_PROGRAM_NAME)
@@ -706,9 +716,8 @@ def titles_title_ii_programs_crp_state_distribution_search():
         }
         logging.error("CRP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_state_distribution_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_state_distribution_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -722,9 +731,8 @@ def titles_title_ii_programs_crp_summary_search():
         }
         logging.error("CRP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_summary_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_summary_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -738,9 +746,8 @@ def titles_title_ii_programs_acep_state_distribution_search():
         }
         logging.error("ACEP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_state_distribution_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_state_distribution_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -754,9 +761,8 @@ def titles_title_ii_programs_acep_summary_search():
         }
         logging.error("ACEP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_summary_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_summary_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -770,9 +776,8 @@ def titles_title_ii_programs_rcpp_state_distribution_search():
         }
         logging.error("RCPP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_state_distribution_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_state_distribution_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 
@@ -786,9 +791,8 @@ def titles_title_ii_programs_rcpp_summary_search():
         }
         logging.error("RCPP: " + json.dumps(msg))
         return rs_handlers.not_found(msg)
-    start_year = 2018
-    end_year = 2022
-    endpoint_response = generate_title_ii_summary_response(program_id, start_year, end_year)
+
+    endpoint_response = generate_title_ii_summary_response(program_id, TITLE_II_START_YEAR, TITLE_II_END_YEAR)
     return endpoint_response
 
 # /pdl/titles/title-ii/proposals/2024/house/eqip/predicted
@@ -1549,6 +1553,7 @@ def generate_title_i_total_summary_response(title_id, start_year, end_year):
 
     return final_summary
 
+
 def generate_title_ii_total_summary_response(title_id, start_year, end_year):
     session = Session()
 
@@ -1600,6 +1605,8 @@ def generate_title_ii_total_summary_response(title_id, start_year, end_year):
     title_entry = {
         'titleName': title_name,
         'totalPaymentInDollars': title_total_payment,
+        'startYear': start_year,
+        'endYear': end_year,
         'programs': program_list
     }
 
@@ -3127,7 +3134,7 @@ def generate_title_ii_summary_response(program_id, start_year, end_year):
     # Sort the sub programs by total payment in descending order
     sub_programs_list = sorted(sub_programs_list, key=lambda x: x['totalPaymentInDollars'], reverse=True)
 
-    response = {**total_values_dict, "statutes": statutes_list, "subPrograms": sub_programs_list}
+    response = {"startYear": start_year, "endYear": end_year, **total_values_dict, "statutes": statutes_list, "subPrograms": sub_programs_list}
     return response