RSPY-506 - fix AUXIP OData queries

RS-PYTHON · Nov 13, 2024 · ffe2658 · ffe2658
1 parent ff9ae76
commit ffe2658
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 8 deletions.
diff --git a/services/adgs/config/adgs_ws_config.yaml b/services/adgs/config/adgs_ws_config.yaml
@@ -40,7 +40,7 @@ adgs:
     type: ODataV4Search
     api_endpoint: 'http://127.0.0.1:5000/Products'
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
         id:
           - null
@@ -100,7 +100,7 @@ adgs:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -115,6 +115,17 @@ adgs:
       next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$expand=Attributes'
       total_items_nb_key_path: '$.total'
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: ContentDate.Start
+        completionTimeFromAscendingNode: ContentDate.Stop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: 'http://127.0.0.1:5001/Products'
@@ -151,7 +162,7 @@ adgs2:
     type: ODataV4Search
     api_endpoint: 'http://127.0.0.1:5001/Products'
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
         id:
           - null
@@ -211,7 +222,7 @@ adgs2:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -226,6 +237,17 @@ adgs2:
       next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$expand=Attributes'
       total_items_nb_key_path: '$.total'
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: ContentDate.Start
+        completionTimeFromAscendingNode: ContentDate.Stop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: 'http://127.0.0.1:5001/Products'

diff --git a/services/adgs/config/adgs_ws_config_token_module.yaml b/services/adgs/config/adgs_ws_config_token_module.yaml
@@ -29,7 +29,7 @@ adgs:
     type: ODataV4Search
     api_endpoint: 'http://127.0.0.1:5000/Products'
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
         id:
           - null
@@ -89,7 +89,7 @@ adgs:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -104,6 +104,17 @@ adgs:
       next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$expand=Attributes'
       total_items_nb_key_path: '$.total'
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: ContentDate.Start
+        completionTimeFromAscendingNode: ContentDate.Stop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: 'http://127.0.0.1:5001/Products'
@@ -129,7 +140,7 @@ adgs2:
     type: ODataV4Search
     api_endpoint: 'http://127.0.0.1:5001/Products'
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
         id:
           - null
@@ -189,7 +200,7 @@ adgs2:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -204,6 +215,17 @@ adgs2:
       next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$expand=Attributes'
       total_items_nb_key_path: '$.total'
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: ContentDate.Start
+        completionTimeFromAscendingNode: ContentDate.Stop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: 'http://127.0.0.1:5001/Products'