Skip to content

Commit

Permalink
map endpoint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@costero-e
costero-e committed Oct 11, 2024
1 parent d65a7c7 commit 4194728
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 58 deletions.
8 changes: 8 additions & 0 deletions beacon/logs/logs.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,3 +275,11 @@ DEBUG - 2024-10-09 16:14:14,878 - b567038c - build_response_summary_by_dataset -
DEBUG - 2024-10-09 16:14:14,879 - b567038c - build_response_by_dataset - initial call
DEBUG - 2024-10-09 16:14:14,879 - b567038c - build_response_by_dataset - 0.0003180503845214844 - returned OK
DEBUG - 2024-10-09 16:14:14,879 - b567038c - build_beacon_boolean_response_by_dataset - 0.002157926559448242 - returned OK
DEBUG - 2024-10-11 14:12:08,602 - a82e92f7 - generate_txid - initial call
DEBUG - 2024-10-11 14:12:08,603 - a82e92f7 - generate_txid- 0.0009777545928955078 - returned OK
DEBUG - 2024-10-11 14:12:08,603 - a82e92f7 - map - initial call
DEBUG - 2024-10-11 14:12:08,603 - a82e92f7 - map - 0.0001957416534423828 - returned OK
DEBUG - 2024-10-11 14:12:08,603 - a82e92f7 - map_builder - initial call
DEBUG - 2024-10-11 14:12:08,603 - a82e92f7 - map_builder - 0.00014638900756835938 - returned OK
DEBUG - 2024-10-11 14:12:08,604 - a82e92f7 - build_map - initial call
DEBUG - 2024-10-11 14:12:08,604 - a82e92f7 - build_map - 0.00019860267639160156 - returned OK
7 changes: 0 additions & 7 deletions beacon/source/generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]={}
if analyses["granularity"]["boolean"]==True or analyses["granularity"]["count"]==True or analyses["granularity"]["record"]==True:# pragma: no cover
analyses_endpoints={}
analyses_endpoints["endpoints"]={}
if analyses["singleEntryUrl"]==True:
map_analysis["singleEntryUrl"]=analysis_single
if analyses["endpoints"]["genomicVariant"]==True:
Expand All @@ -43,7 +42,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["analysis"]=map_analysis
if biosamples["granularity"]["boolean"]==True or biosamples["granularity"]["count"]==True or biosamples["granularity"]["record"]==True:# pragma: no cover
biosamples_endpoints={}
biosamples_endpoints["endpoints"]={}
if biosamples["singleEntryUrl"]==True:
map_biosample["singleEntryUrl"]=biosample_single
if biosamples["endpoints"]["genomicVariant"]==True:
Expand All @@ -70,7 +68,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["biosample"]=map_biosample
if cohorts["granularity"]["boolean"]==True or cohorts["granularity"]["count"]==True or cohorts["granularity"]["record"]==True:# pragma: no cover
cohorts_endpoints={}
cohorts_endpoints["endpoints"]={}
if cohorts["singleEntryUrl"]==True:
map_cohort["singleEntryUrl"]=cohort_single
if cohorts["endpoints"]["individual"]==True:
Expand All @@ -97,7 +94,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["cohort"]=map_cohort
if datasets["granularity"]["boolean"]==True or datasets["granularity"]["count"]==True or datasets["granularity"]["record"]==True:
datasets_endpoints={}
datasets_endpoints["endpoints"]={}
if datasets["singleEntryUrl"]==True:
map_dataset["singleEntryUrl"]=dataset_single# pragma: no cover
if datasets["endpoints"]["individual"]==True:# pragma: no cover
Expand Down Expand Up @@ -138,7 +134,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["dataset"]=map_dataset
if g_variants["granularity"]["boolean"]==True or g_variants["granularity"]["count"]==True or g_variants["granularity"]["record"]==True:
g_variants_endpoints={}
g_variants_endpoints["endpoints"]={}
if g_variants["singleEntryUrl"]==True:# pragma: no cover
map_genomicVariant["singleEntryUrl"]=genomicVariant_single
if g_variants["endpoints"]["individual"]==True:# pragma: no cover
Expand Down Expand Up @@ -172,7 +167,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["genomicVariant"]=map_genomicVariant
if individuals["granularity"]["boolean"]==True or individuals["granularity"]["count"]==True or individuals["granularity"]["record"]==True:# pragma: no cover
individuals_endpoints={}
individuals_endpoints["endpoints"]={}
if individuals["singleEntryUrl"]==True:
map_individual["singleEntryUrl"]=individual_single
if individuals["endpoints"]["genomicVariant"]==True:
Expand Down Expand Up @@ -206,7 +200,6 @@ def get_entry_types_map(self):
map_entry_types["endpointSets"]["individual"]=map_individual
if runs["granularity"]["boolean"]==True or runs["granularity"]["count"]==True or runs["granularity"]["record"]==True:# pragma: no cover
runs_endpoints={}
runs_endpoints["endpoints"]={}
if runs["singleEntryUrl"]==True:
map_run["singleEntryUrl"]=run_single
if runs["endpoints"]["genomicVariant"]==True:
Expand Down
102 changes: 51 additions & 51 deletions beacon/source/manage.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,45 @@

analyses={
'granularity': {
'boolean': False,
'count': False,
'record': False
'boolean': True,
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'genomicVariant': False
'genomicVariant': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
biosamples={
'granularity': {
'boolean': False,
'count': False,
'record': False
'boolean': True,
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'genomicVariant': False,
'run': False
'analysis': True,
'genomicVariant': True,
'run': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
cohorts={
'granularity': {
'boolean': False,
'count': False,
'record': False
'boolean': True,
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'individual': False,
'run': False
'analysis': True,
'individual': True,
'run': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
datasets={
Expand All @@ -49,15 +49,15 @@
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'biosample': False,
'genomicVariant': False,
'individual': False,
'run': False
'analysis': True,
'biosample': True,
'genomicVariant': True,
'individual': True,
'run': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
g_variants={
Expand All @@ -66,44 +66,44 @@
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'biosample': False,
'individual': False,
'run': False
'analysis': True,
'biosample': True,
'individual': True,
'run': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
individuals={
'granularity': {
'boolean': False,
'count': False,
'record': False
'boolean': True,
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'biosample': False,
'genomicVariant': False,
'run': False
'analysis': True,
'biosample': True,
'genomicVariant': True,
'run': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
runs={
'granularity': {
'boolean': False,
'count': False,
'record': False
'boolean': True,
'count': True,
'record': True
},
'singleEntryUrl': False,
'singleEntryUrl': True,
'endpoints': {
'analysis': False,
'genomicVariant': False
'analysis': True,
'genomicVariant': True
},
'testMode': False,
'testMode': True,
'database': 'mongo'
}
filtering_terms={
Expand Down

0 comments on commit 4194728

Please sign in to comment.