Skip to content

Commit 4954894

Browse files
Changed usage of .lower().capitalize() to just .capitalize. Also updated the query string in get_prov_info when status='QA
is selected.
1 parent c4787f4 commit 4954894

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/app_neo4j_queries.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -954,14 +954,13 @@ def get_prov_info(neo4j_driver, param_dict):
954954
rui_info_where_clause = "WHERE NOT EXISTS {MATCH (ds)<-[*]-(ruiSample:Sample) WHERE NOT ruiSample.rui_location IS NULL AND NOT TRIM(ruiSample.rui_location) = ''} MATCH (ds)<-[*]-(ruiSample:Sample)"
955955
if 'dataset_status' in param_dict:
956956
if first_param:
957-
print("true")
958-
dataset_status_query_string = f" WHERE ds.status = '{param_dict['dataset_status'].lower().capitalize()}'"
957+
dataset_status_query_string = f" WHERE ds.status = '{param_dict['dataset_status'].capitalize()}'"
959958
if param_dict['dataset_status'].lower() == "qa":
960-
dataset_status_query_string = f" WHERE ds.status = '{param_dict['dataset_status'].upper()}'"
959+
dataset_status_query_string = f" WHERE ds.status = 'QA'"
961960
else:
962-
dataset_status_query_string = f" AND ds.status = '{param_dict['dataset_status'].lower().capitalize()}'"
961+
dataset_status_query_string = f" AND ds.status = '{param_dict['dataset_status'].capitalize()}'"
963962
if param_dict['dataset_status'].lower() == "qa":
964-
dataset_status_query_string = f" AND ds.status = '{param_dict['dataset_status'].upper()}'"
963+
dataset_status_query_string = f" AND ds.status = 'QA'"
965964
query = (f"MATCH (ds:Dataset)<-[:ACTIVITY_OUTPUT]-(a)<-[:ACTIVITY_INPUT]-(firstSample:Sample)<-[*]-(donor:Donor)"
966965
f"{group_uuid_query_string}"
967966
f"{dataset_status_query_string}"
@@ -981,7 +980,6 @@ def get_prov_info(neo4j_driver, param_dict):
981980
f" ds.last_modified_user_email, ds.lab_dataset_id, ds.data_types, METASAMPLE, PROCESSED_DATASET")
982981
logger.debug("======get_prov_info() query======")
983982
logger.debug(query)
984-
print(query)
985983
with neo4j_driver.session() as session:
986984
# Because we're returning multiple things, we use session.run rather than session.read_transaction
987985
result = session.run(query)

0 commit comments

Comments
 (0)