fix: Merge conflicts

PolicyEngine · Nov 25, 2024 · 8e94ba7 · 8e94ba7
1 parent 107416a
commit 8e94ba7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 105 deletions.
diff --git a/policyengine_api/endpoints/tracer_analysis.py b/policyengine_api/endpoints/tracer_analysis.py
diff --git a/policyengine_api/routes/simulation_analysis_routes.py b/policyengine_api/routes/simulation_analysis_routes.py
@@ -14,14 +14,10 @@
 
 
 @simulation_analysis_bp.route("", methods=["POST"])
+@validate_country
 def execute_simulation_analysis(country_id):
     print("Got POST request for simulation analysis")
 
-    # Validate inbound country ID
-    invalid_country = validate_country(country_id)
-    if invalid_country:
-        return invalid_country
-
     # Pop items from request payload and validate
     # where necessary
     payload = request.json

diff --git a/policyengine_api/routes/tracer_analysis_routes.py b/policyengine_api/routes/tracer_analysis_routes.py
@@ -10,13 +10,9 @@
 
 
 @tracer_analysis_bp.route("", methods=["POST"])
+@validate_country
 def execute_tracer_analysis(country_id):
 
-    # Validate country ID
-    country_not_found = validate_country(country_id)
-    if country_not_found:
-        return country_not_found
-
     payload = request.json
 
     is_payload_valid, message = validate_payload(payload)