addition of functionality for the new catalog data for UI V3

RENCI · Apr 24, 2024 · fa2f5d1 · fa2f5d1
1 parent f3ff59c
commit fa2f5d1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/common/pg_impl.py b/src/common/pg_impl.py
@@ -141,8 +141,14 @@ def get_terria_map_catalog_data(self, **kwargs):
             else:
                 wb_sql: str = ""
 
+            # get the correct sp name
+            if kwargs['use_v3_sp']:
+                sp_name: str = 'public.get_terria_data_json_v3'
+            else:
+                sp_name: str = 'public.get_terria_data_json'
+
             # create the sql
-            sql: str = f"SELECT public.get_terria_data_json(_grid_type:={kwargs['grid_type']}, _event_type:={kwargs['event_type']}, " \
+            sql: str = f"SELECT {sp_name}(_grid_type:={kwargs['grid_type']}, _event_type:={kwargs['event_type']}, " \
                        f"_instance_name:={kwargs['instance_name']}, _run_date:={kwargs['run_date']}, _end_date:={kwargs['end_date']}, " \
                        f"_limit:={kwargs['limit']}, _met_class:={kwargs['met_class']}, _storm_name:={kwargs['storm_name']}, " \
                        f"_cycle:={kwargs['cycle']}, _advisory_number:={kwargs['advisory_number']}, _project_code:={kwargs['project_code']}, " \

diff --git a/src/server.py b/src/server.py
@@ -60,7 +60,9 @@ async def get_terria_map_catalog_data(grid_type: Union[str, None] = Query(defaul
                                       advisory_number: Union[str, None] = Query(default=None), run_date: Union[str, None] = Query(default=None),
                                       end_date: Union[str, None] = Query(default=None), project_code: Union[str, None] = Query(default=None),
                                       product_type: Union[str, None] = Query(default=None), limit: Union[int, None] = Query(default=7),
-                                      use_new_wb: Union[bool, None] = Query(default=False)) -> json:
+                                      use_new_wb: Union[bool, None] = Query(default=False),
+                                      use_v3_sp: Union[bool, None] = Query(default=False)
+                                      ) -> json:
     """
     Gets the json formatted terria map UI catalog data.
     <br/>Note: Leave filtering params empty if not desired.
@@ -77,6 +79,7 @@ async def get_terria_map_catalog_data(grid_type: Union[str, None] = Query(defaul
     <br/>&nbsp;&nbsp;&nbsp;product_type: Filter by the product type
     <br/>&nbsp;&nbsp;&nbsp;limit: Limit the number of catalog records returned in days (default is 7)
     <br/>&nbsp;&nbsp;&nbsp;use_new_wb: Use the new catalog workbench code
+    <br/>&nbsp;&nbsp;&nbsp;use_v3_sp: Use the new v3 data stored procedure
     """
     # pylint: disable=unused-argument
     # pylint: disable=too-many-arguments
@@ -102,6 +105,9 @@ async def get_terria_map_catalog_data(grid_type: Union[str, None] = Query(defaul
         # add in the new workbench retrieval flag
         kwargs.update({'use_new_wb': use_new_wb})
 
+        # add in the new workbench retrieval flag
+        kwargs.update({'use_v3_sp': use_v3_sp})
+
         # try to make the call for records
         ret_val = db_info.get_terria_map_catalog_data(**kwargs)
 
@@ -220,7 +226,9 @@ async def get_terria_map_catalog_data_secure(grid_type: Union[str, None] = Query
                                              project_code: Union[str, None] = Query(default=None),
                                              product_type: Union[str, None] = Query(default=None),
                                              limit: Union[int, None] = Query(default=7),
-                                             use_new_wb: Union[bool, None] = Query(default=False)) -> json:
+                                             use_new_wb: Union[bool, None] = Query(default=False),
+                                             use_v3_sp: Union[bool, None] = Query(default=False),
+                                             ) -> json:
     """
     Gets the json formatted terria map UI catalog data.
     <br/>Note: Leave filtering params empty if not desired.
@@ -237,6 +245,7 @@ async def get_terria_map_catalog_data_secure(grid_type: Union[str, None] = Query
     <br/>&nbsp;&nbsp;&nbsp;product_type: Filter by the product type
     <br/>&nbsp;&nbsp;&nbsp;limit: Limit the number of catalog records returned in days (default is 7)
     <br/>&nbsp;&nbsp;&nbsp;use_new_wb: Use the new catalog workbench code
+    <br/>&nbsp;&nbsp;&nbsp;use_v3_sp: Use the new v3 data stored procedure
     """
     # init the returned data and html status code
     ret_val: dict = {}
@@ -263,6 +272,9 @@ async def get_terria_map_catalog_data_secure(grid_type: Union[str, None] = Query
         # add in the new workbench retrieval flag
         kwargs.update({'use_new_wb': use_new_wb})
 
+        # add in the new workbench retrieval flag
+        kwargs.update({'use_v3_sp': use_v3_sp})
+
         # try to make the call for records
         ret_val = db_info.get_terria_map_catalog_data(**kwargs)
 
@@ -302,7 +314,9 @@ async def get_terria_map_catalog_data_file(file_name: Union[str, None] = Query(d
                                            advisory_number: Union[str, None] = Query(default=None), run_date: Union[str, None] = Query(default=None),
                                            end_date: Union[str, None] = Query(default=None), project_code: Union[str, None] = Query(default=None),
                                            product_type: Union[str, None] = Query(default=None), limit: Union[int, None] = Query(default=7),
-                                           use_new_wb: Union[bool, None] = Query(default=False)) -> json:
+                                           use_new_wb: Union[bool, None] = Query(default=False),
+                                           use_v3_sp: Union[bool, None] = Query(default=False),
+                                           ) -> json:
     """
     Returns the json formatted terria map UI catalog data in a file specified.
     <br/>Note: Leave filtering params empty if not desired.
@@ -320,6 +334,7 @@ async def get_terria_map_catalog_data_file(file_name: Union[str, None] = Query(d
     <br/>&nbsp;&nbsp;&nbsp;product_type: Filter by the product type
     <br/>&nbsp;&nbsp;&nbsp;limit: Limit the number of catalog records returned in days (default is 7)
     <br/>&nbsp;&nbsp;&nbsp;use_new_wb: Use the new catalog workbench code
+    <br/>&nbsp;&nbsp;&nbsp;use_v3_sp: Use the new v3 data stored procedure
     """
     # pylint: disable=unused-argument
     # pylint: disable=too-many-arguments
@@ -343,6 +358,9 @@ async def get_terria_map_catalog_data_file(file_name: Union[str, None] = Query(d
     # add in the new workbench retrieval flag
     kwargs.update({'use_new_wb': use_new_wb})
 
+    # add in the new workbench retrieval flag
+    kwargs.update({'use_v3_sp': use_v3_sp})
+
     # get a file path to the temp file directory.
     # append a unique path to avoid collisions
     temp_file_path: str = os.path.join(os.getenv('TEMP_FILE_PATH', os.path.dirname(__file__)), str(uuid.uuid4()))