Merge pull request #12 from samply/feature/empty-request

allowing empty list of sites in request
samply · Apr 3, 2024 · 66c43db · 66c43db
2 parents bce53a7 + 74b8f26
commit 66c43db
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/resources/body_bbmri.json b/resources/body_bbmri.json
@@ -23,7 +23,7 @@
 		"group": [
 			{
 				"code": {
-					"text": "patients"
+					"text": "patient"
 				},
 				"population": [
 					{
@@ -44,7 +44,7 @@
 				"stratifier": [
 					{
 						"code": {
-							"text": "Gender"
+							"text": "gender"
 						},
 						"criteria": {
 							"expression": "Gender",

diff --git a/resources/body_dktk.json b/resources/body_dktk.json
@@ -44,7 +44,7 @@
 				"stratifier": [
 					{
 						"code": {
-							"text": "Gender"
+							"text": "gender"
 						},
 						"criteria": {
 							"expression": "Gender",

diff --git a/resources/body_gbn.json b/resources/body_gbn.json
@@ -44,7 +44,7 @@
 				"stratifier": [
 					{
 						"code": {
-							"text": "Gender"
+							"text": "gender"
 						},
 						"criteria": {
 							"expression": "Gender",

diff --git a/resources/query_bbmri.cql b/resources/query_bbmri.cql
@@ -20,7 +20,7 @@ BBMRI_STRAT_CUSTODIAN_STRATIFIER
 
 BBMRI_STRAT_DIAGNOSIS_STRATIFIER
 
-PRISM_BBMRI_STRAT_AGE_STRATIFIER
+PRISM_STRAT_AGE_STRATIFIER_BBMRI
 
 BBMRI_STRAT_DEF_IN_INITIAL_POPULATION
 true
diff --git a/src/main.rs b/src/main.rs
@@ -146,7 +146,15 @@ async fn handle_get_criteria(
 ) -> Result<Response, (StatusCode, String)> {
     let mut criteria_groups: CriteriaGroups = CriteriaGroups::new(); // this is going to be aggregated criteria for all the sites
 
-    for site in query.clone().sites {
+    let mut sites = query.sites;
+
+    // allowing empty list of sites in the request because Spot is going to query with the empty list and expect response for the sites in Prism's config
+
+    if sites.is_empty() {
+        sites = CONFIG.sites.clone();
+    }
+
+    for site in sites {
         debug!("Request for site {}", &site);
         let criteria_groups_from_cache =
             match shared_state.criteria_cache.lock().await.cache.get(&site) {