Skip to content

Commit 62a7cc3

Browse files
PadeanuPadeanu
committed
Merge branch 'feat-rspy493/extend-filter-attributes' of https://github.com/RS-PYTHON/rs-server into feat-rspy493/extend-filter-attributes
2 parents 5986760 + 8983c07 commit 62a7cc3

27 files changed

+1098
-862
lines changed

‎docs/poetry.lock‎

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

‎poetry.lock‎

Lines changed: 81 additions & 81 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
@@ -79,7 +79,7 @@ safety = "^3.2.14"
7979
pylint = "^3.3.0"
8080
flake8-pyproject = "^1.2.3"
8181
httpx = "^0.27.2"
82-
moto = "==5.0.27"
82+
moto = "==5.0.28"
8383
flask = "^3.0.3"
8484
flask-cors = "^5.0.0"
8585
sphinx = "^8.1.3"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ template:
4242
need_auth: true
4343
results_entry: $.value | $
4444
metadata_mapping:
45+
id:
46+
- null
47+
- "$.Id"
4548
auxip:id:
4649
- null
4750
- "$.Id"
@@ -87,9 +90,9 @@ template:
8790
processing:datetime:
8891
- null
8992
- "$.processing:datetime"
90-
processing:facility:
93+
processingCenter:
9194
- null
92-
- "$.processing:facility"
95+
- "$.processingCenter"
9396
attrs:
9497
- null
9598
- "$.Attributes"
@@ -106,6 +109,8 @@ template:
106109
and:
107110
- "contains(Name, '{Name}')"
108111
- "contains(Id, '{auxip:id}')"
112+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
113+
- "ContentDate/Start lt {Stop#to_iso_utc_datetime}"
109114
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
110115
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
111116
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"

‎services/adgs/config/adgs_ws_config.yaml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ adgs:
4646
need_auth: true
4747
results_entry: $.value | $
4848
metadata_mapping:
49+
id:
50+
- null
51+
- $.Id
4952
auxip:id:
5053
- null
5154
- $.Id
@@ -91,9 +94,9 @@ adgs:
9194
processing:datetime:
9295
- null
9396
- $.processing:datetime
94-
processing:facility:
97+
processingCenter:
9598
- null
96-
- $.processing:facility
99+
- $.processingCenter
97100
attrs:
98101
- null
99102
- $.Attributes
@@ -111,6 +114,8 @@ adgs:
111114
and:
112115
- contains(Name, '{Name}')
113116
- contains(Id, '{auxip:id}')
117+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
118+
- ContentDate/Start lt {Stop#to_iso_utc_datetime}
114119
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
115120
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
116121
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
@@ -180,6 +185,9 @@ adgs2:
180185
need_auth: true
181186
results_entry: $.value | $
182187
metadata_mapping:
188+
id:
189+
- null
190+
- $.Id
183191
auxip:id:
184192
- null
185193
- $.Id
@@ -225,9 +233,9 @@ adgs2:
225233
processing:datetime:
226234
- null
227235
- $.processing:datetime
228-
processing:facility:
236+
processingCenter:
229237
- null
230-
- $.processing:facility
238+
- $.processingCenter
231239
attrs:
232240
- null
233241
- $.Attributes
@@ -245,6 +253,8 @@ adgs2:
245253
and:
246254
- contains(Name, '{Name}')
247255
- contains(Id, '{auxip:id}')
256+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
257+
- ContentDate/Start lt {Stop#to_iso_utc_datetime}
248258
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
249259
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
250260
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ template:
2929
need_auth: true
3030
results_entry: $.value | $
3131
metadata_mapping:
32+
id:
33+
- null
34+
- "$.Id"
3235
auxip:id:
3336
- null
3437
- "$.Id"
@@ -74,9 +77,9 @@ template:
7477
processing:datetime:
7578
- null
7679
- "$.processing:datetime"
77-
processing:facility:
80+
processingCenter:
7881
- null
79-
- "$.processing:facility"
82+
- "$.processingCenter"
8083
attrs:
8184
- null
8285
- "$.Attributes"
@@ -93,6 +96,8 @@ template:
9396
and:
9497
- "contains(Name, '{Name}')"
9598
- "contains(Id, '{auxip:id}')"
99+
- "ContentDate/Start gt {Start#to_iso_utc_datetime}"
100+
- "ContentDate/Start lt {Stop#to_iso_utc_datetime}"
96101
- "PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}"
97102
- "PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}"
98103
- "PublicationDate eq {PublicationDate#to_iso_utc_datetime}"

‎services/adgs/config/adgs_ws_config_token_module.yaml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ adgs:
3333
need_auth: true
3434
results_entry: $.value | $
3535
metadata_mapping:
36+
id:
37+
- null
38+
- $.Id
3639
auxip:id:
3740
- null
3841
- $.Id
@@ -78,9 +81,9 @@ adgs:
7881
processing:datetime:
7982
- null
8083
- $.processing:datetime
81-
processing:facility:
84+
processingCenter:
8285
- null
83-
- $.processing:facility
86+
- $.processingCenter
8487
attrs:
8588
- null
8689
- $.Attributes
@@ -98,6 +101,8 @@ adgs:
98101
and:
99102
- contains(Name, '{Name}')
100103
- contains(Id, '{auxip:id}')
104+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
105+
- ContentDate/Start lt {Stop#to_iso_utc_datetime}
101106
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
102107
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
103108
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
@@ -154,6 +159,9 @@ adgs2:
154159
need_auth: true
155160
results_entry: $.value | $
156161
metadata_mapping:
162+
id:
163+
- null
164+
- $.Id
157165
auxip:id:
158166
- null
159167
- $.Id
@@ -199,9 +207,9 @@ adgs2:
199207
processing:datetime:
200208
- null
201209
- $.processing:datetime
202-
processing:facility:
210+
processingCenter:
203211
- null
204-
- $.processing:facility
212+
- $.processingCenter
205213
attrs:
206214
- null
207215
- $.Attributes
@@ -219,6 +227,8 @@ adgs2:
219227
and:
220228
- contains(Name, '{Name}')
221229
- contains(Id, '{auxip:id}')
230+
- ContentDate/Start gt {Start#to_iso_utc_datetime}
231+
- ContentDate/Start lt {Stop#to_iso_utc_datetime}
222232
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
223233
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
224234
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
@@ -231,9 +241,13 @@ adgs2:
231241
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingDate'
232242
and att/OData.CSC.StringAttribute/Value eq '{processing:datetime#to_iso_utc_datetime}')
233243
- Attributes/OData.CSC.StringAttribute/any(att:att/Name eq 'processingCenter'
244+
<<<<<<< HEAD
234245
and att/OData.CSC.StringAttribute/Value eq '{processing:facility#to_iso_utc_datetime}')
235246
- ContentDate/Start gt {Start#to_iso_utc_datetime}
236247
- ContentDate/Stop lt {Stop#to_iso_utc_datetime}
248+
=======
249+
and att/OData.CSC.StringAttribute/Value eq '{processingCenter#to_iso_utc_datetime}')
250+
>>>>>>> 8983c0753a83f12df54d489727238a62e958f923
237251
sort:
238252
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
239253
sort_param_mapping:

0 commit comments

Comments
 (0)