Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSPY-491 - RSPY-492 - RSPY-495 - RSPY-506 - RSPY-507 - CADIP/AUXIP fixes #687

Merged
merged 36 commits into from
Nov 22, 2024
Merged

RSPY-491 - RSPY-492 - RSPY-495 - RSPY-506 - RSPY-507 - CADIP/AUXIP fixes #687

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7941451
RSPY-491 - fix CADIP Session OData queries
vprivat-ads Oct 24, 2024
1dabd77
RSPY-492 - Allow to search by Retransfer
vprivat-ads Oct 29, 2024
86836e8
RSPY-495 - Fix SessionId spelling
vprivat-ads Oct 29, 2024
abcfef9
RSPY-506 - fix AUXIP OData queries
vprivat-ads Nov 13, 2024
d682b21
RSPY-507 - Fix SessionId parameter in CADIP search query
vprivat-ads Nov 13, 2024
7bf98ee
Merge remote-tracking branch 'origin/feat-rspy131/rs-server-paginatio…
jgaucher-cs Nov 15, 2024
1fced09
fix: implement Vincent's remarks
jgaucher-cs Nov 15, 2024
71cd269
Merge remote-tracking branch 'origin/feat-rspy131/rs-server-paginatio…
Nov 18, 2024
dee088f
synchronize configuration files
Nov 18, 2024
a878146
synchronize configuration files
Nov 18, 2024
6b42aed
synchronize config files with rs-helm
jgaucher-cs Nov 19, 2024
7a3d369
fix: first mock corrections
Nov 19, 2024
3572e44
fix: first mock corrections
Nov 19, 2024
50bdf7a
Merge branch 'fix/rspy491-cadip-search-fix-rebased-3-matthieu' of git…
jgaucher-cs Nov 19, 2024
9713d4e
fix: use value in pickup response
Nov 19, 2024
5cf7b1e
fix: remove tests exception
Nov 20, 2024
4aae9d7
Merge branch 'develop' into fix/rspy491-cadip-search-fix-rebased-3-ma…
Padeanu Nov 20, 2024
8addaea
Fixes
Padeanu Nov 20, 2024
daee5a0
More fixes + fmt
Padeanu Nov 20, 2024
debcff4
Fixed all tests
Padeanu Nov 20, 2024
2e1cf14
Update template
Padeanu Nov 20, 2024
52a7880
Fixed tests with empty response
Padeanu Nov 20, 2024
8f8cb16
Update templates
Padeanu Nov 21, 2024
11a408d
Fixed sortables
Padeanu Nov 21, 2024
9030f33
Fixed headers
Padeanu Nov 21, 2024
0c8a083
Tempfix for AnyUrl
Padeanu Nov 21, 2024
8415361
Updated old adgs endpoint
Padeanu Nov 21, 2024
16af110
Fix anyurl (2)
Padeanu Nov 21, 2024
04b3d5f
Fixed output type for pydantic new version
Padeanu Nov 21, 2024
5db871d
Remove output type, seems to be faulty on demos
Padeanu Nov 21, 2024
86f93df
workaround: pydantic = ">=2.9.2, < 2.10.0"
jgaucher-cs Nov 21, 2024
3db8a48
Revert "Remove output type, seems to be faulty on demos"
jgaucher-cs Nov 21, 2024
812a185
fix mypy issue
jgaucher-cs Nov 21, 2024
efc446c
Update template
Padeanu Nov 21, 2024
693c199
Update template 2
Padeanu Nov 21, 2024
bfd2754
Changed default adgs sort
Padeanu Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions services/adgs/config/adgs_ws_config.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ template:
type: ODataV4Search
api_endpoint:
need_auth: true
results_entry: responses | $
results_entry: $.value
metadata_mapping:
id:
- null
Expand Down Expand Up @@ -107,9 +107,36 @@ template:
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')"
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"

sort:
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
sort_param_mapping:
id: Name
auxip:id: Id
created: PublicationDate
#datetime: Start # How to access ContentDate['Start']?
#start_datetime: Start
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
#product:type: productType
#processing:datetime: processingDate
published: PublicationDate
#file:checksum: ChecksumValue
#platform: platformSerialIdentifier
#constellation: platformShortName
#processing:facility: processingCenter
startTimeFromAscendingNode: ContentDate.Start
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a mistake it's a slash: ContentDate/Start. I do the remark only once but there are more occurrences to fix

completionTimeFromAscendingNode: ContentDate.Stop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a mistake it's a slash: ContentDate/Stop. I do the remark only once but there are more occurrences to fix

publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Attributes"
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes"
total_items_nb_key_path: "$.total"

download:
Expand Down
40 changes: 26 additions & 14 deletions services/adgs/config/adgs_ws_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ adgs:
free_text_search_operations:
$filter:
union: ' OR '
wrapper: '{}'
wrapper: '"{}"'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, it must be without quotes. I do the remark only once but there are more occurrences to fix

operations:
and:
- contains(Name, '{Name}')
Expand All @@ -115,22 +115,28 @@ adgs:
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
pagination:
max_items_per_page: 1000
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:
id: Name
auxip:id: Id
created: PublicationDate
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
published: PublicationDate
startTimeFromAscendingNode: ContentDate.Start
completionTimeFromAscendingNode: ContentDate.Stop
publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes'
total_items_nb_key_path: $.total
download:
type: HTTPDownload
base_uri: http://127.0.0.1:5000/Products
Expand Down Expand Up @@ -221,7 +227,7 @@ adgs2:
free_text_search_operations:
$filter:
union: ' OR '
wrapper: '{}'
wrapper: '"{}"'
operations:
and:
- contains(Name, '{Name}')
Expand All @@ -235,22 +241,28 @@ adgs2:
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
pagination:
max_items_per_page: 1000
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:
id: Name
auxip:id: Id
created: PublicationDate
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
published: PublicationDate
startTimeFromAscendingNode: ContentDate.Start
completionTimeFromAscendingNode: ContentDate.Stop
publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes'
total_items_nb_key_path: $.total
download:
type: HTTPDownload
base_uri: http://127.0.0.1:5001/Products
Expand Down
31 changes: 29 additions & 2 deletions services/adgs/config/adgs_ws_config_token_module.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ template:
type: ODataV4Search
api_endpoint:
need_auth: true
results_entry: responses | $
results_entry: $.value
metadata_mapping:
id:
- null
Expand Down Expand Up @@ -96,9 +96,36 @@ template:
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')"
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"

sort:
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
sort_param_mapping:
id: Name
auxip:id: Id
created: PublicationDate
#datetime: Start # How to access ContentDate['Start']?
#start_datetime: Start
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
#product:type: productType
#processing:datetime: processingDate
published: PublicationDate
#file:checksum: ChecksumValue
#platform: platformSerialIdentifier
#constellation: platformShortName
#processing:facility: processingCenter
startTimeFromAscendingNode: ContentDate.Start
completionTimeFromAscendingNode: ContentDate.Stop
publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$expand=Attributes"
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes"
total_items_nb_key_path: "$.total"

download:
Expand Down
40 changes: 26 additions & 14 deletions services/adgs/config/adgs_ws_config_token_module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ adgs:
free_text_search_operations:
$filter:
union: ' OR '
wrapper: '{}'
wrapper: '"{}"'
operations:
and:
- contains(Name, '{Name}')
Expand All @@ -104,22 +104,28 @@ adgs:
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
pagination:
max_items_per_page: 1000
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:
id: Name
auxip:id: Id
created: PublicationDate
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
published: PublicationDate
startTimeFromAscendingNode: ContentDate.Start
completionTimeFromAscendingNode: ContentDate.Stop
publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes'
total_items_nb_key_path: $.total
download:
type: HTTPDownload
base_uri: http://127.0.0.1:5000/Products
Expand Down Expand Up @@ -199,7 +205,7 @@ adgs2:
free_text_search_operations:
$filter:
union: ' OR '
wrapper: '{}'
wrapper: '"{}"'
operations:
and:
- contains(Name, '{Name}')
Expand All @@ -213,22 +219,28 @@ adgs2:
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name}')
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
pagination:
max_items_per_page: 1000
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:
id: Name
auxip:id: Id
created: PublicationDate
end_datetime: End
file:size: ContentLength
type: ContentType
eviction_datetime: EvictionDate
published: PublicationDate
startTimeFromAscendingNode: ContentDate.Start
completionTimeFromAscendingNode: ContentDate.Stop
publicationDate: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: '{url}?{search}&$top={items_per_page}&$skip={skip}&$expand=Attributes'
total_items_nb_key_path: $.total
download:
type: HTTPDownload
base_uri: http://127.0.0.1:5001/Products
Expand Down
21 changes: 15 additions & 6 deletions services/cadip/config/cadip_ws_config.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ template:
- "$.Name"
SessionIds:
- null
- "$.SessionID"
SessionID:
- "$.SessionId"
SessionId:
- null
- "$.SessionID"
- "$.SessionId"
Channel:
- null
- "$.Channel"
Expand Down Expand Up @@ -92,14 +92,23 @@ template:
wrapper: '"{}"'
operations:
and:
- "SessionID in {SessionIds}"
- "SessionID eq {SessionID}"
- "SessionId in ({SessionIds})"
- "SessionId eq {SessionId}"
- "PublicationDate gt {startTimeFromAscendingNode#to_iso_utc_datetime}"
- "PublicationDate lt {completionTimeFromAscendingNode#to_iso_utc_datetime}"

sort:
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
sort_param_mapping:
datetime: PublicationDate
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: "{url}?{search}&$top={items_per_page}"
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$skip={skip}"
total_items_nb_key_path: "$.total"

download:
Expand Down
40 changes: 36 additions & 4 deletions services/cadip/config/cadip_ws_config.template_session.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ template:
type: ODataV4Search
api_endpoint:
need_auth: true
results_entry: responses | $
results_entry: $.value
metadata_mapping:
id:
- null
Expand Down Expand Up @@ -126,16 +126,48 @@ template:
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}"
- "Retransfer eq {Retransfer}"

sort:
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
sort_param_mapping:
id: SessionId
start_datetime: DownlinkStart
datetime: DownlinkStart
end_datetime: DownlinkStop
published: PublicationDate
platform: Satellite
startTimeFromAscendingNode: DownlinkStart
completionTimeFromAscendingNode: DownlinkStop
publicationDate: PublicationDate
cadip:id: Id
cadip:num_channels: NumChannels
cadip:station_unit_id: StationUnitId
sat:absolute_orbit: DownlinkOrbit
cadip:acquisition_id: AcquisitionId
cadip:antenna_id: AntennaId
cadip:front_end_id: FrontEndId
cadip:retransfer: Retransfer
cadip:antenna_status_ok: AntennaStatusOK
cadip:front_end_status_ok: FrontEndStatusOK
cadip:planned_data_start: PlannedDataStart
cadip:planned_data_stop: PlannedDataStop
cadip:downlink_status_ok: DownlinkStatusOK
cadip:delivery_push_ok: DeliveryPushOK
sort_order_mapping:
ascending: asc
descending: desc
max_sort_params: 1

pagination:
max_items_per_page: 1000
next_page_url_tpl: "{url}?{search}&$top={items_per_page}"
next_page_url_tpl: "{url}?{search}&$top={items_per_page}&$skip={skip}"
total_items_nb_key_path: "$.total"

download:
Expand Down
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.