Merge pull request #4240 from hove-io/fix_deactivate_opg_scenario

Fix _deactivate_opg_scenario param

Author: azime

source/jormungandr/jormungandr/olympic_site_params_manager.py

@@ -225,9 +225,6 @@ def build(self, pt_object_origin, pt_object_destination, api_request):
         # Warning, the order of functions is important
         # Order 1 : get_olympic_site_params
         # Order 2 : build_api_request
-        if api_request.get("_deactivate_opg_scenario", False):
-            logging.getLogger(__name__).warning("OPG scenario decativated.")
-            return
 
         api_request["olympic_site_params"] = self.get_olympic_site_params(
             pt_object_origin, pt_object_destination, api_request
@@ -290,8 +287,6 @@ def get_olympic_site_params(self, pt_origin_detail, pt_destination_detail, api_r
             self.manage_navette(api_request)
             return {}
 
-        self.fill_olympic_site_params_from_s3()
-
         if origin_olympic_site and destination_olympic_site:
             origin_olympic_site = None
 
@@ -317,6 +312,12 @@ def get_olympic_site_params(self, pt_origin_detail, pt_destination_detail, api_r
                 "show_natural_opg_journeys": show_natural_opg_journeys,
             }
 
+        if api_request.get("_deactivate_opg_scenario", False):
+            logging.getLogger(__name__).warning("OPG scenario deactivated.")
+            return {}
+
+        self.fill_olympic_site_params_from_s3()
+
         if not self.olympic_site_params:
             return {}
 

source/jormungandr/jormungandr/tests/olympic_site_params_manager_tests.py

@@ -728,7 +728,8 @@ def test_build_departure_and_arrival_poi_jo_add_forbidden_uris_deactivate_opg_sc
     api_request["datetime"] = osp.get_timestamp('20230715T110000')
     api_request["_deactivate_opg_scenario"] = True
     osp.build(pt_origin_detail, pt_destination_detail, api_request)
-    assert "olympic_site_params" not in api_request
+    assert "olympic_site_params" in api_request
+    assert not api_request["olympic_site_params"]
     assert len(api_request["forbidden_uris[]"]) == 2
     assert "_keep_olympics_journeys" not in api_request