Skip to content

Commit 5d73170

Browse files
author
Alex Grosu
committed
Merge remote-tracking branch 'origin/develop' into feat-rspy582/remove-deprecated-code
2 parents 658e3e1 + 44be64f commit 5d73170

31 files changed

+2744
-1952
lines changed

‎docs/poetry.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎poetry.lock‎

Lines changed: 287 additions & 293 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ optional = true
6565
pytest = "^8.3.3"
6666
pytest-asyncio = "^0.25.3"
6767
pytest-cov = "^6.0.0"
68-
pytest-docker = "^3.1.2"
68+
pytest-docker = "^3.2.0"
6969
pytest-error-for-skips = "^2.0.2"
7070
pytest-httpx = "^0.34.0"
7171
pytest-mock = "^3.14.0"

‎services/adgs/config/adgs_stac_mapper.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "Name",
33
"auxip:id": "id",
44
"created": "PublicationDate",
5-
"datetime": "Start",
5+
"datetime": "DatetimeStart",
66
"start_datetime": "Start",
77
"end_datetime": "End",
88
"file:size": "ContentLength",

‎services/adgs/config/adgs_ws_config.template.yaml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ template:
4545
id:
4646
- null
4747
- "$.Id"
48+
auxip:id:
49+
- null
50+
- "$.Id"
4851
Name:
4952
- null
5053
- "$.Name"
@@ -60,6 +63,9 @@ template:
6063
EvictionDate:
6164
- null
6265
- "$.EvictionDate"
66+
DatetimeStart:
67+
- null
68+
- "$.ContentDate.Start"
6369
Start:
6470
- null
6571
- "$.ContentDate.Start"
@@ -78,15 +84,18 @@ template:
7884
attr_ptype:
7985
- null
8086
- "$.attr_ptype"
81-
attr_serial_identif:
87+
platformSerialIdentifier:
88+
- null
89+
- "$.platformSerialIdentifier"
90+
platformShortName:
8291
- null
83-
- "$.attr_serial_identif"
84-
attr_platform_short_name:
92+
- "$.platformShortName"
93+
processing:datetime:
8594
- null
86-
- "$.attr_platform_short_name"
87-
attr_processing_date:
95+
- "$.processing:datetime"
96+
processingCenter:
8897
- null
89-
- "$.attr_processing_date"
98+
- "$.processingCenter"
9099
attrs:
91100
- null
92101
- "$.Attributes"
@@ -102,14 +111,18 @@ template:
102111
operations:
103112
and:
104113
- "contains(Name, '{Name}')"
114+
- "contains(Id, '{auxip:id}')"
105115
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
106116
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
107117
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
108118
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
109-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"
110-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')"
111-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"
112-
119+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
120+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
121+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
122+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')"
123+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
124+
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
125+
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
113126
sort:
114127
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
115128
sort_param_mapping:

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ adgs:
4949
id:
5050
- null
5151
- $.Id
52+
auxip:id:
53+
- null
54+
- $.Id
5255
Name:
5356
- null
5457
- $.Name
@@ -64,6 +67,9 @@ adgs:
6467
EvictionDate:
6568
- null
6669
- $.EvictionDate
70+
DatetimeStart:
71+
- null
72+
- $.ContentDate.Start
6773
Start:
6874
- null
6975
- $.ContentDate.Start
@@ -82,15 +88,18 @@ adgs:
8288
attr_ptype:
8389
- null
8490
- $.attr_ptype
85-
attr_serial_identif:
91+
platformSerialIdentifier:
92+
- null
93+
- $.platformSerialIdentifier
94+
platformShortName:
8695
- null
87-
- $.attr_serial_identif
88-
attr_platform_short_name:
96+
- $.platformShortName
97+
processing:datetime:
8998
- null
90-
- $.attr_platform_short_name
91-
attr_processing_date:
99+
- $.processing:datetime
100+
processingCenter:
92101
- null
93-
- $.attr_processing_date
102+
- $.processingCenter
94103
attrs:
95104
- null
96105
- $.Attributes
@@ -107,6 +116,7 @@ adgs:
107116
operations:
108117
and:
109118
- contains(Name, '{Name}')
119+
- contains(Id, '{auxip:id}')
110120
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
111121
eq {StartPublicationDate#to_iso_utc_datetime})
112122
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
@@ -115,11 +125,16 @@ adgs:
115125
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
116126
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
117127
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
118-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
128+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
119129
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
120-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
130+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
121131
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
122-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
132+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
133+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
134+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
135+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
136+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
137+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
123138
sort:
124139
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
125140
sort_param_mapping:
@@ -177,6 +192,9 @@ adgs2:
177192
id:
178193
- null
179194
- $.Id
195+
auxip:id:
196+
- null
197+
- $.Id
180198
Name:
181199
- null
182200
- $.Name
@@ -192,6 +210,9 @@ adgs2:
192210
EvictionDate:
193211
- null
194212
- $.EvictionDate
213+
DatetimeStart:
214+
- null
215+
- $.ContentDate.Start
195216
Start:
196217
- null
197218
- $.ContentDate.Start
@@ -210,15 +231,18 @@ adgs2:
210231
attr_ptype:
211232
- null
212233
- $.attr_ptype
213-
attr_serial_identif:
234+
platformSerialIdentifier:
235+
- null
236+
- $.platformSerialIdentifier
237+
platformShortName:
214238
- null
215-
- $.attr_serial_identif
216-
attr_platform_short_name:
239+
- $.platformShortName
240+
processing:datetime:
217241
- null
218-
- $.attr_platform_short_name
219-
attr_processing_date:
242+
- $.processing:datetime
243+
processingCenter:
220244
- null
221-
- $.attr_processing_date
245+
- $.processingCenter
222246
attrs:
223247
- null
224248
- $.Attributes
@@ -235,6 +259,7 @@ adgs2:
235259
operations:
236260
and:
237261
- contains(Name, '{Name}')
262+
- contains(Id, '{auxip:id}')
238263
- (PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate
239264
eq {StartPublicationDate#to_iso_utc_datetime})
240265
- (PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate
@@ -243,11 +268,16 @@ adgs2:
243268
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType'
244269
and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')
245270
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier'
246-
and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')
271+
and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')
247272
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName'
248-
and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')
273+
and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')
249274
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
250-
and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')
275+
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
276+
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
277+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
278+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
279+
- ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}
280+
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
251281
sort:
252282
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
253283
sort_param_mapping:

‎services/adgs/config/adgs_ws_config_token_module.template.yaml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ template:
3232
id:
3333
- null
3434
- "$.Id"
35+
auxip:id:
36+
- null
37+
- "$.Id"
3538
Name:
3639
- null
3740
- "$.Name"
@@ -47,6 +50,9 @@ template:
4750
EvictionDate:
4851
- null
4952
- "$.EvictionDate"
53+
DatetimeStart:
54+
- null
55+
- "$.ContentDate.Start"
5056
Start:
5157
- null
5258
- "$.ContentDate.Start"
@@ -65,15 +71,18 @@ template:
6571
attr_ptype:
6672
- null
6773
- "$.attr_ptype"
68-
attr_serial_identif:
74+
platformSerialIdentifier:
75+
- null
76+
- "$.platformSerialIdentifier"
77+
platformShortName:
6978
- null
70-
- "$.attr_serial_identif"
71-
attr_platform_short_name:
79+
- "$.platformShortName"
80+
processing:datetime:
7281
- null
73-
- "$.attr_platform_short_name"
74-
attr_processing_date:
82+
- "$.processing:datetime"
83+
processingCenter:
7584
- null
76-
- "$.attr_processing_date"
85+
- "$.processingCenter"
7786
attrs:
7887
- null
7988
- "$.Attributes"
@@ -89,14 +98,18 @@ template:
8998
operations:
9099
and:
91100
- "contains(Name, '{Name}')"
101+
- "contains(Id, '{auxip:id}')"
92102
- "(PublicationDate gt {StartPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StartPublicationDate#to_iso_utc_datetime})"
93103
- "(PublicationDate lt {StopPublicationDate#to_iso_utc_datetime} or PublicationDate eq {StopPublicationDate#to_iso_utc_datetime})"
94104
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"
95105
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'productType' and att/OData.CSC.StringAttribute/Value eq '{attr_ptype}')"
96-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{attr_serial_identif}')"
97-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{attr_platform_short_name#to_upper}')"
98-
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{attr_processing_date#to_iso_utc_datetime}')"
99-
106+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformSerialIdentifier' and att/OData.CSC.StringAttribute/Value eq '{platformSerialIdentifier}')"
107+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'platformShortName' and att/OData.CSC.StringAttribute/Value eq '{platformShortName#to_upper}')"
108+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate' and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')"
109+
- "Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter' and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')"
110+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
111+
- "ContentDate/Start eq {DatetimeStart#to_iso_utc_datetime}"
112+
- "ContentDate/Stop lt {Stop#to_iso_utc_datetime}"
100113
sort:
101114
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
102115
sort_param_mapping:

0 commit comments

Comments
 (0)