Skip to content

Commit 40c741e

Browse files
PadeanuPadeanu
committed
All queryables now available
1 parent 37b1e5f commit 40c741e

File tree

14 files changed

+570
-103
lines changed

14 files changed

+570
-103
lines changed

‎services/adgs/rs_server_adgs/api/adgs_search.py‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@
7474
ADGS_CONFIG = Path(osp.realpath(osp.dirname(__file__))).parent.parent / "config"
7575

7676

77+
def validate(queryables: dict):
78+
"""Function used to verify / update ADGS-specific queryables before being sent to eodag."""
79+
if "PublicationDate" in queryables:
80+
queryables["PublicationDate"] = validate_inputs_format(queryables["PublicationDate"])
81+
82+
return queryables
83+
84+
7785
class MockPgstacAdgs(MockPgstac):
7886
"""Adgs implementation of MockPgstac"""
7987

@@ -101,17 +109,18 @@ def process_search(
101109
page: int,
102110
) -> stac_pydantic.ItemCollection:
103111
"""Do the search for the given collection and OData parameters."""
112+
# Update odata names that shadow eodag builtins (productype)
113+
odata_params["Name"] = odata_params.pop("Name", [None])[0]
114+
odata_params["attr_platform_short_name"] = odata_params.pop("platformShortName", None)
115+
odata_params["attr_serial_identif"] = odata_params.pop("platformSerialIdentifier", None)
116+
odata_params["attr_ptype"] = odata_params.pop("productType", None)
104117

105118
return process_product_search(
106119
collection.get("station", "adgs"),
107-
odata_params.get("productType"),
108-
odata_params.get("PublicationDate"),
120+
odata_params,
109121
limit,
110122
self.sortby,
111123
page,
112-
Name=odata_params.get("Name", [None])[0],
113-
attr_platform_short_name=odata_params.get("platformShortName"),
114-
attr_serial_identif=odata_params.get("platformSerialIdentifier"),
115124
)
116125

117126

@@ -319,8 +328,7 @@ async def get_adgs_collection_specific_item(
319328

320329
def process_product_search( # pylint: disable=too-many-locals
321330
station,
322-
product_type,
323-
publication_date,
331+
queryables,
324332
limit,
325333
sortby,
326334
page: int = 1,
@@ -350,8 +358,7 @@ def process_product_search( # pylint: disable=too-many-locals
350358
set_eodag_auth_token(station, "auxip")
351359
try:
352360
products = (init_adgs_provider(station)).search(
353-
validate_inputs_format(publication_date, raise_errors=True),
354-
attr_ptype=product_type,
361+
**validate(queryables),
355362
items_per_page=limit,
356363
sort_by=validate_sort_input(sortby),
357364
page=page,

‎services/cadip/config/cadip_ws_config.template_session.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,21 @@ template:
135135
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
136136
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
137137
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
138-
- "Retransfer eq {Retransfer}"
138+
- DownlinkOrbit eq {DownlinkOrbit}
139+
- DownlinkStart eq {DownlinkStart}
140+
- DownlinkStop eq {DownlinkStop}
141+
- NumChannels eq {NumChannels}
142+
- AcquisitionId eq {AcquisitionId}
143+
- AntennaId eq {AntennaId}
144+
- StationUnitId eq {StationUnitId}
145+
- FrontEndId eq {FrontEndId}
146+
- PlannedDataStart eq {PlannedDataStart}
147+
- PlannedDataStop eq {PlannedDataStop}
148+
- Retransfer eq {Retransfer}
149+
- AntennaStatusOK eq {AntennaStatusOK}
150+
- FrontEndStatusOK eq {FrontEndStatusOK}
151+
- DownlinkStatusOK eq {DownlinkStatusOK}
152+
- DeliveryPushOK eq {DeliveryPushOK}
139153

140154
sort:
141155
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

‎services/cadip/config/cadip_ws_config.yaml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,21 @@ cadip_session:
765765
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
766766
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
767767
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
768+
- DownlinkOrbit eq {DownlinkOrbit}
769+
- DownlinkStart eq {DownlinkStart}
770+
- DownlinkStop eq {DownlinkStop}
771+
- NumChannels eq {NumChannels}
772+
- AcquisitionId eq {AcquisitionId}
773+
- AntennaId eq {AntennaId}
774+
- StationUnitId eq {StationUnitId}
775+
- FrontEndId eq {FrontEndId}
776+
- PlannedDataStart eq {PlannedDataStart}
777+
- PlannedDataStop eq {PlannedDataStop}
768778
- Retransfer eq {Retransfer}
779+
- AntennaStatusOK eq {AntennaStatusOK}
780+
- FrontEndStatusOK eq {FrontEndStatusOK}
781+
- DownlinkStatusOK eq {DownlinkStatusOK}
782+
- DeliveryPushOK eq {DeliveryPushOK}
769783
sort:
770784
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
771785
sort_param_mapping:
@@ -927,7 +941,21 @@ ins_session:
927941
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
928942
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
929943
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
944+
- DownlinkOrbit eq {DownlinkOrbit}
945+
- DownlinkStart eq {DownlinkStart}
946+
- DownlinkStop eq {DownlinkStop}
947+
- NumChannels eq {NumChannels}
948+
- AcquisitionId eq {AcquisitionId}
949+
- AntennaId eq {AntennaId}
950+
- StationUnitId eq {StationUnitId}
951+
- FrontEndId eq {FrontEndId}
952+
- PlannedDataStart eq {PlannedDataStart}
953+
- PlannedDataStop eq {PlannedDataStop}
930954
- Retransfer eq {Retransfer}
955+
- AntennaStatusOK eq {AntennaStatusOK}
956+
- FrontEndStatusOK eq {FrontEndStatusOK}
957+
- DownlinkStatusOK eq {DownlinkStatusOK}
958+
- DeliveryPushOK eq {DeliveryPushOK}
931959
sort:
932960
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
933961
sort_param_mapping:
@@ -1089,7 +1117,21 @@ mps_session:
10891117
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
10901118
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
10911119
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1120+
- DownlinkOrbit eq {DownlinkOrbit}
1121+
- DownlinkStart eq {DownlinkStart}
1122+
- DownlinkStop eq {DownlinkStop}
1123+
- NumChannels eq {NumChannels}
1124+
- AcquisitionId eq {AcquisitionId}
1125+
- AntennaId eq {AntennaId}
1126+
- StationUnitId eq {StationUnitId}
1127+
- FrontEndId eq {FrontEndId}
1128+
- PlannedDataStart eq {PlannedDataStart}
1129+
- PlannedDataStop eq {PlannedDataStop}
10921130
- Retransfer eq {Retransfer}
1131+
- AntennaStatusOK eq {AntennaStatusOK}
1132+
- FrontEndStatusOK eq {FrontEndStatusOK}
1133+
- DownlinkStatusOK eq {DownlinkStatusOK}
1134+
- DeliveryPushOK eq {DeliveryPushOK}
10931135
sort:
10941136
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
10951137
sort_param_mapping:
@@ -1251,7 +1293,21 @@ mti_session:
12511293
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
12521294
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
12531295
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1296+
- DownlinkOrbit eq {DownlinkOrbit}
1297+
- DownlinkStart eq {DownlinkStart}
1298+
- DownlinkStop eq {DownlinkStop}
1299+
- NumChannels eq {NumChannels}
1300+
- AcquisitionId eq {AcquisitionId}
1301+
- AntennaId eq {AntennaId}
1302+
- StationUnitId eq {StationUnitId}
1303+
- FrontEndId eq {FrontEndId}
1304+
- PlannedDataStart eq {PlannedDataStart}
1305+
- PlannedDataStop eq {PlannedDataStop}
12541306
- Retransfer eq {Retransfer}
1307+
- AntennaStatusOK eq {AntennaStatusOK}
1308+
- FrontEndStatusOK eq {FrontEndStatusOK}
1309+
- DownlinkStatusOK eq {DownlinkStatusOK}
1310+
- DeliveryPushOK eq {DeliveryPushOK}
12551311
sort:
12561312
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
12571313
sort_param_mapping:
@@ -1413,7 +1469,21 @@ nsg_session:
14131469
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
14141470
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
14151471
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1472+
- DownlinkOrbit eq {DownlinkOrbit}
1473+
- DownlinkStart eq {DownlinkStart}
1474+
- DownlinkStop eq {DownlinkStop}
1475+
- NumChannels eq {NumChannels}
1476+
- AcquisitionId eq {AcquisitionId}
1477+
- AntennaId eq {AntennaId}
1478+
- StationUnitId eq {StationUnitId}
1479+
- FrontEndId eq {FrontEndId}
1480+
- PlannedDataStart eq {PlannedDataStart}
1481+
- PlannedDataStop eq {PlannedDataStop}
14161482
- Retransfer eq {Retransfer}
1483+
- AntennaStatusOK eq {AntennaStatusOK}
1484+
- FrontEndStatusOK eq {FrontEndStatusOK}
1485+
- DownlinkStatusOK eq {DownlinkStatusOK}
1486+
- DeliveryPushOK eq {DeliveryPushOK}
14171487
sort:
14181488
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
14191489
sort_param_mapping:
@@ -1575,7 +1645,21 @@ sgs_session:
15751645
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
15761646
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
15771647
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
1648+
- DownlinkOrbit eq {DownlinkOrbit}
1649+
- DownlinkStart eq {DownlinkStart}
1650+
- DownlinkStop eq {DownlinkStop}
1651+
- NumChannels eq {NumChannels}
1652+
- AcquisitionId eq {AcquisitionId}
1653+
- AntennaId eq {AntennaId}
1654+
- StationUnitId eq {StationUnitId}
1655+
- FrontEndId eq {FrontEndId}
1656+
- PlannedDataStart eq {PlannedDataStart}
1657+
- PlannedDataStop eq {PlannedDataStop}
15781658
- Retransfer eq {Retransfer}
1659+
- AntennaStatusOK eq {AntennaStatusOK}
1660+
- FrontEndStatusOK eq {FrontEndStatusOK}
1661+
- DownlinkStatusOK eq {DownlinkStatusOK}
1662+
- DeliveryPushOK eq {DeliveryPushOK}
15791663
sort:
15801664
sort_by_tpl: '&$orderby={sort_param} {sort_order}'
15811665
sort_param_mapping:

‎services/cadip/config/cadip_ws_config_token_module.template.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,21 @@ template:
8686
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
8787
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
8888
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
89-
- "Retransfer eq {Retransfer}"
89+
- DownlinkOrbit eq {DownlinkOrbit}
90+
- DownlinkStart eq {DownlinkStart}
91+
- DownlinkStop eq {DownlinkStop}
92+
- NumChannels eq {NumChannels}
93+
- AcquisitionId eq {AcquisitionId}
94+
- AntennaId eq {AntennaId}
95+
- StationUnitId eq {StationUnitId}
96+
- FrontEndId eq {FrontEndId}
97+
- PlannedDataStart eq {PlannedDataStart}
98+
- PlannedDataStop eq {PlannedDataStop}
99+
- Retransfer eq {Retransfer}
100+
- AntennaStatusOK eq {AntennaStatusOK}
101+
- FrontEndStatusOK eq {FrontEndStatusOK}
102+
- DownlinkStatusOK eq {DownlinkStatusOK}
103+
- DeliveryPushOK eq {DeliveryPushOK}
90104

91105
sort:
92106
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

‎services/cadip/config/cadip_ws_config_token_module.template_session.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,21 @@ template:
122122
- PublicationDate gte {StartPublicationDate#to_iso_utc_datetime}
123123
- PublicationDate lte {StopPublicationDate#to_iso_utc_datetime}
124124
- PublicationDate eq {PublicationDate#to_iso_utc_datetime}
125-
- "Retransfer eq {Retransfer}"
125+
- DownlinkOrbit eq {DownlinkOrbit}
126+
- DownlinkStart eq {DownlinkStart}
127+
- DownlinkStop eq {DownlinkStop}
128+
- NumChannels eq {NumChannels}
129+
- AcquisitionId eq {AcquisitionId}
130+
- AntennaId eq {AntennaId}
131+
- StationUnitId eq {StationUnitId}
132+
- FrontEndId eq {FrontEndId}
133+
- PlannedDataStart eq {PlannedDataStart}
134+
- PlannedDataStop eq {PlannedDataStop}
135+
- Retransfer eq {Retransfer}
136+
- AntennaStatusOK eq {AntennaStatusOK}
137+
- FrontEndStatusOK eq {FrontEndStatusOK}
138+
- DownlinkStatusOK eq {DownlinkStatusOK}
139+
- DeliveryPushOK eq {DeliveryPushOK}
126140

127141
sort:
128142
sort_by_tpl: '&$orderby={sort_param} {sort_order}'

0 commit comments

Comments
 (0)