RSPY-491 - fix CADIP Session OData queries

RS-PYTHON · Oct 29, 2024 · cbf930a · cbf930a
1 parent 6fd21b6
commit cbf930a
Show file tree

Hide file tree

Showing 5 changed files with 249 additions and 92 deletions.
diff --git a/services/cadip/config/cadip_ws_config.yaml b/services/cadip/config/cadip_ws_config.yaml
@@ -90,10 +90,10 @@ cadip:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -189,10 +189,10 @@ ins:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -288,10 +288,10 @@ mps:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -387,10 +387,10 @@ mti:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -486,10 +486,10 @@ nsg:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -585,10 +585,10 @@ sgs:
     free_text_search_operations:
       $filter:
         union: ' OR '
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
             and:
-              - 'SessionID in {SessionIds}'
+              - 'SessionID in ({SessionIds})'
               - 'SessionID eq {SessionID}'
               - 'PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}'
               - 'PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}'
@@ -632,7 +632,7 @@ cadip_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5000/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -719,13 +719,13 @@ cadip_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -734,6 +734,17 @@ cadip_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5000/Sessions"
@@ -767,7 +778,7 @@ ins_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5000/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -854,13 +865,13 @@ ins_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -869,6 +880,17 @@ ins_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5100/Sessions"
@@ -902,7 +924,7 @@ mps_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5101/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -989,13 +1011,13 @@ mps_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -1004,6 +1026,17 @@ mps_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5101/Sessions"
@@ -1037,7 +1070,7 @@ mti_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5102/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -1124,13 +1157,13 @@ mti_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -1139,6 +1172,17 @@ mti_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5102/Sessions"
@@ -1172,7 +1216,7 @@ nsg_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5103/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -1259,13 +1303,13 @@ nsg_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -1274,6 +1318,17 @@ nsg_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5103/Sessions"
@@ -1307,7 +1362,7 @@ sgs_session:
     type: ODataV4Search
     api_endpoint: "http://127.0.0.1:5104/Sessions"
     need_auth: true
-    results_entry: responses | $
+    results_entry: $.value
     metadata_mapping:
       id:
         - null
@@ -1394,13 +1449,13 @@ sgs_session:
     free_text_search_operations:
       $filter:
         union: " OR "
-        wrapper: '"{}"'
+        wrapper: '{}'
         operations:
           and:
-            - "SessionId in {SessionIds}"
+            - "SessionId in ({SessionIds})"
             - "SessionId eq {SessionId}"
             - "Satellite eq {platform}"
-            - "Satellite in {platforms}"
+            - "Satellite in ({platforms})"
             - "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
             - "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"
 
@@ -1409,6 +1464,17 @@ sgs_session:
       next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Files"
       total_items_nb_key_path: "$.total"
 
+    sort:
+      sort_by_tpl: '&$orderby={sort_param} {sort_order}'
+      sort_param_mapping:
+        startTimeFromAscendingNode: DownlinkStart
+        completionTimeFromAscendingNode: DownlinkStop
+        publicationDate: PublicationDate
+      sort_order_mapping:
+        ascending: asc
+        descending: desc
+      max_sort_params: 1
+
   download:
     type: HTTPDownload
     base_uri: "https://127.0.0.1:5104/Sessions"