Skip to content

Commit

Permalink
updated underlays for SR2022Q4R6 and SC2022Q4R6 (#474)
Browse files Browse the repository at this point in the history
* updated underlays for SR2022Q4R6 and SC2022Q4R6

* updated queryProjectId with vpc-perimeter-project ids for test-Registered and test-Controlled tiers.

* updated queryProjectId with vpc-perimeter-project ids for test-Registered and test-Controlled tiers.

* updated queryProjectId with vpc-perimeter-project ids for test-Registered and test-Controlled tiers.

* Updated with PR suggestions

* Updated indexing builds, added debug to local-dev/run_server script
  • Loading branch information
chenchals authored Jul 26, 2023
1 parent 7bc376a commit 5a688e5
Show file tree
Hide file tree
Showing 149 changed files with 16,898 additions and 3 deletions.
29 changes: 26 additions & 3 deletions service/local-dev/run_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,23 @@ usage() { echo "$0 usage flags:" && grep " .)\ #" $0; }
usage
echo

while getopts ":avm" arg; do
while getopts ":avtmd" arg; do
case $arg in
a) # Disable authentication.
disableAuthChecks=1
;;
v) # Use Verily underlays.
useVerilyUnderlays=1
;;
t) # Use AoU test underlays
useAouUnderlays=1
;;
m) # Use MariaDB.
useMariaDB=1
;;
d) # enable debug-jvm for bootRun.
debugJvm=1
;;
h | *) # Display help.
usage
exit 0
Expand All @@ -41,6 +47,11 @@ if [[ ${useVerilyUnderlays} ]]; then
export TANAGRA_UNDERLAY_FILES=verily/aou_synthetic/expanded/aou_synthetic.json,verily/cms_synpuf/expanded/cms_synpuf.json,verily/sdd/expanded/sdd.json,verily/sdd_refresh0323/expanded/sdd_refresh0323.json,verily/pilot_synthea_2022q3/expanded/pilot_synthea_2022q3.json
export TANAGRA_EXPORT_SHARED_GCS_BUCKET_PROJECT_ID=verily-tanagra-dev
export TANAGRA_EXPORT_SHARED_GCS_BUCKET_NAMES=verily-tanagra-dev-export-bucket
elif [[ ${useAouUnderlays} ]]; then
echo "Using AoU test underlays."
export TANAGRA_UNDERLAY_FILES=aou/test/SC2022Q4R6/expanded/SC2022Q4R6.json,aou/test/SR2022Q4R6/expanded/SR2022Q4R6.json
export TANAGRA_EXPORT_SHARED_GCS_BUCKET_PROJECT_ID=broad-tanagra-dev
export TANAGRA_EXPORT_SHARED_GCS_BUCKET_NAMES=broad-tanagra-dev-bq-export
else
echo "Using Broad underlays."
export TANAGRA_UNDERLAY_FILES=broad/aou_synthetic/expanded/aou_synthetic.json,broad/cms_synpuf/expanded/cms_synpuf.json
Expand All @@ -55,12 +66,24 @@ if [[ ${disableAuthChecks} ]]; then
echo "Disabling auth checks."
export TANAGRA_AUTH_DISABLE_CHECKS=true
export TANAGRA_AUTH_BEARER_TOKEN=false
export TANAGRA_AUTH_IAP_GKE_JWT=false
else
echo "Enabling auth checks."
echo "Enabling auth checks. bearer-token"
export TANAGRA_AUTH_DISABLE_CHECKS=false
export TANAGRA_AUTH_BEARER_TOKEN=true
export TANAGRA_AUTH_IAP_GKE_JWT=false
fi

echo

./gradlew service:bootRun
if [[ ${debugJvm} ]]; then
# ./gradlew service:bootRun --debug-jvm
echo "Enabling server jvm debug"
echo "Listening for transport dt_socket at address: 5005"
./gradlew service:bootRun -Dagentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
else
./gradlew service:bootRun
fi



Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
{
"name" : "t_brand",
"idAttribute" : "id",
"attributes" : [ {
"type" : "KEY_AND_DISPLAY",
"name" : "standard_concept",
"dataType" : "STRING",
"displayHint" : {
"type" : "ENUM",
"enumVals" : [ {
"enumVal" : {
"value" : { },
"display" : "Source"
},
"count" : 0
} ]
},
"displayHintTypes" : [ ]
}, {
"type" : "SIMPLE",
"name" : "name",
"dataType" : "STRING",
"displayHintTypes" : [ ]
}, {
"type" : "SIMPLE",
"name" : "concept_code",
"dataType" : "STRING",
"displayHintTypes" : [ ]
}, {
"type" : "SIMPLE",
"name" : "id",
"dataType" : "INT64",
"displayHintTypes" : [ ]
} ],
"sourceDataMapping" : {
"dataPointer" : "omop_dataset",
"tablePointer" : {
"table" : "concept",
"filter" : {
"type" : "BOOLEAN_AND_OR",
"operator" : "AND",
"subfilters" : [ {
"type" : "BINARY",
"field" : {
"column" : "domain_id",
"runtimeCalculated" : false
},
"operator" : "EQUALS",
"value" : {
"stringVal" : "Drug"
}
}, {
"type" : "BINARY",
"field" : {
"column" : "concept_class_id",
"runtimeCalculated" : false
},
"operator" : "EQUALS",
"value" : {
"stringVal" : "Brand Name"
}
}, {
"type" : "BINARY",
"field" : {
"column" : "invalid_reason",
"runtimeCalculated" : false
},
"operator" : "IS",
"value" : { }
}, {
"type" : "BOOLEAN_AND_OR",
"operator" : "OR",
"subfilters" : [ {
"type" : "BINARY",
"field" : {
"column" : "vocabulary_id",
"runtimeCalculated" : false
},
"operator" : "EQUALS",
"value" : {
"stringVal" : "RxNorm"
}
}, {
"type" : "BINARY",
"field" : {
"column" : "vocabulary_id",
"runtimeCalculated" : false
},
"operator" : "EQUALS",
"value" : {
"stringVal" : "RxNorm Extension"
}
} ]
} ]
}
},
"attributeMappings" : {
"standard_concept" : {
"value" : {
"column" : "standard_concept",
"runtimeCalculated" : false
},
"display" : {
"column" : "standard_concept",
"sqlFunctionWrapper" : "(CASE WHEN ${fieldSql} IS NULL THEN 'Source' WHEN ${fieldSql} = 'S' THEN 'Standard' ELSE 'Unknown' END)",
"runtimeCalculated" : false
}
},
"name" : {
"value" : {
"column" : "concept_name",
"runtimeCalculated" : false
}
},
"concept_code" : {
"value" : {
"column" : "concept_code",
"runtimeCalculated" : false
}
},
"id" : {
"value" : {
"column" : "concept_id",
"runtimeCalculated" : false
}
}
},
"textSearchMapping" : {
"searchStringTable" : {
"tablePointer" : {
"rawSql" : "SELECT textsearch.id, textsearch.text FROM ( SELECT c.concept_id AS id, c.concept_name AS text FROM `all-of-us-ehr-dev.SC2022Q4R6.concept` c UNION ALL SELECT c.concept_id AS id, CAST(c.concept_id AS STRING) AS text FROM `all-of-us-ehr-dev.SC2022Q4R6.concept` c UNION ALL SELECT c.concept_id AS id, c.concept_code AS text FROM `all-of-us-ehr-dev.SC2022Q4R6.concept` c ) AS textsearch JOIN `all-of-us-ehr-dev.SC2022Q4R6.concept` c ON c.concept_id = textsearch.id WHERE c.domain_id = 'Drug' AND c.concept_class_id = 'Brand Name' AND c.vocabulary_id IN ('RxNorm', 'RxNorm Extension') "
},
"fieldPointers" : {
"id" : {
"column" : "id",
"runtimeCalculated" : false
},
"text" : {
"column" : "text",
"runtimeCalculated" : false
}
}
}
},
"hierarchyMappings" : { }
},
"indexDataMapping" : {
"dataPointer" : "index_dataset",
"tablePointer" : {
"table" : "t_brand"
},
"attributeMappings" : {
"standard_concept" : {
"value" : {
"column" : "standard_concept",
"runtimeCalculated" : false
},
"display" : {
"column" : "t_display_standard_concept",
"runtimeCalculated" : false
}
},
"name" : {
"value" : {
"column" : "name",
"runtimeCalculated" : false
}
},
"concept_code" : {
"value" : {
"column" : "concept_code",
"runtimeCalculated" : false
}
},
"id" : {
"value" : {
"column" : "id",
"runtimeCalculated" : false
}
}
},
"textSearchMapping" : {
"searchString" : {
"column" : "text",
"runtimeCalculated" : false
}
},
"hierarchyMappings" : { }
}
}
Loading

0 comments on commit 5a688e5

Please sign in to comment.