RSPY-491 - fix CADIP Session OData queries

RS-PYTHON · Oct 25, 2024 · a0088ca · a0088ca
1 parent 38a489c
commit a0088ca
Showing 1 changed file with 36 additions and 14 deletions.
diff --git a/charts/rs-server-cadip/templates/configmap.yaml b/charts/rs-server-cadip/templates/configmap.yaml
@@ -89,10 +89,10 @@ data:
           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}'
@@ -124,7 +124,7 @@ data:
           type: ODataV4Search
           api_endpoint: '{{ $v.endpoint.url.odata }}/Sessions'
           need_auth: true
-          results_entry: responses | $
+          results_entry: $.value
           metadata_mapping:
             id:
               - null
@@ -211,21 +211,32 @@ data:
           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}"
 
           pagination:
-            max_items_per_page: 1000
+            max_items_per_page: 100
             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: '{{ $v.endpoint.url.odata }}/Sessions'
@@ -311,10 +322,10 @@ data:
           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}'
@@ -346,7 +357,7 @@ data:
           type: ODataV4Search
           api_endpoint: '{{ $v.endpoint.url.odata }}/Sessions'
           need_auth: true
-          results_entry: responses | $
+          results_entry: $.value
           metadata_mapping:
             id:
               - null
@@ -433,21 +444,32 @@ data:
           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}"
 
           pagination:
-            max_items_per_page: 1000
+            max_items_per_page: 100
             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: '{{ $v.endpoint.url.odata }}/Sessions'