diff --git a/.github/workflows/automated-staging-test-submit.yml b/.github/workflows/automated-staging-test-submit.yml index 8fe4a9898..51c6527a4 100644 --- a/.github/workflows/automated-staging-test-submit.yml +++ b/.github/workflows/automated-staging-test-submit.yml @@ -44,21 +44,16 @@ jobs: --silent \ "$host/api/token" | jq -r ".access_token") - sendFiles () { - folder_path=$1 - for file in "$(pwd)/examples/Test/$folder_path"; do - echo "Sending $file" - curl \ - --header "Content-Type: application/hl7-v2" \ - --header "Client: $client_id.$client_sender" \ - --header "Authorization: Bearer $token" \ - --data-binary "@$file" \ - --silent \ - "$host/api/waters" - done - } - sendFiles "'Automated/*.hl7'" - sendFiles "'GoldenCopy/Input/*.hl7'" + for file in $(pwd)/examples/Test/Automated/**/*.hl7; do + echo "Sending $file" + curl \ + --header "Content-Type: application/hl7-v2" \ + --header "Client: $client_id.$client_sender" \ + --header "Authorization: Bearer $token" \ + --data-binary "@$file" \ + --silent \ + "$host/api/waters" + done - name: Clean up private key if: always() diff --git a/examples/Test/Automated/001_Staging_ORM_O01_short_linked_to_002_ORU.hl7 b/examples/Test/Automated/Assertion/001_Staging_ORM_O01_short_linked_to_002_ORU.hl7 similarity index 100% rename from examples/Test/Automated/001_Staging_ORM_O01_short_linked_to_002_ORU.hl7 rename to examples/Test/Automated/Assertion/001_Staging_ORM_O01_short_linked_to_002_ORU.hl7 diff --git a/examples/Test/Automated/002_Staging_ORU_O01_short_linked_to_001_ORM.hl7 b/examples/Test/Automated/Assertion/002_Staging_ORU_O01_short_linked_to_001_ORM.hl7 similarity index 100% rename from examples/Test/Automated/002_Staging_ORU_O01_short_linked_to_001_ORM.hl7 rename to examples/Test/Automated/Assertion/002_Staging_ORU_O01_short_linked_to_001_ORM.hl7 diff --git a/examples/Test/Automated/003_CA_ORU_R01_CDPH_produced.hl7 b/examples/Test/Automated/Assertion/003_CA_ORU_R01_CDPH_produced.hl7 similarity index 100% rename from examples/Test/Automated/003_CA_ORU_R01_CDPH_produced.hl7 rename to examples/Test/Automated/Assertion/003_CA_ORU_R01_CDPH_produced.hl7 diff --git a/examples/Test/Automated/004_CA_ORU_R01_leading_zeroes.hl7 b/examples/Test/Automated/Assertion/004_CA_ORU_R01_leading_zeroes.hl7 similarity index 100% rename from examples/Test/Automated/004_CA_ORU_R01_leading_zeroes.hl7 rename to examples/Test/Automated/Assertion/004_CA_ORU_R01_leading_zeroes.hl7 diff --git a/examples/Test/Automated/005_CA_ORU_R01_no_leading_zeroes.hl7 b/examples/Test/Automated/Assertion/005_CA_ORU_R01_no_leading_zeroes.hl7 similarity index 100% rename from examples/Test/Automated/005_CA_ORU_R01_no_leading_zeroes.hl7 rename to examples/Test/Automated/Assertion/005_CA_ORU_R01_no_leading_zeroes.hl7 diff --git a/examples/Test/Automated/006_CA_ORU_R01_LOINC.hl7 b/examples/Test/Automated/Assertion/006_CA_ORU_R01_LOINC.hl7 similarity index 100% rename from examples/Test/Automated/006_CA_ORU_R01_LOINC.hl7 rename to examples/Test/Automated/Assertion/006_CA_ORU_R01_LOINC.hl7 diff --git a/examples/Test/Automated/007_CA_ORU_R01_PLT.hl7 b/examples/Test/Automated/Assertion/007_CA_ORU_R01_PLT.hl7 similarity index 100% rename from examples/Test/Automated/007_CA_ORU_R01_PLT.hl7 rename to examples/Test/Automated/Assertion/007_CA_ORU_R01_PLT.hl7 diff --git a/examples/Test/Automated/008_ORU_R01_micro_character_encoding.hl7 b/examples/Test/Automated/Assertion/008_ORU_R01_micro_character_encoding.hl7 similarity index 100% rename from examples/Test/Automated/008_ORU_R01_micro_character_encoding.hl7 rename to examples/Test/Automated/Assertion/008_ORU_R01_micro_character_encoding.hl7 diff --git a/examples/Test/Automated/009_CA_ORU_R01_remove_99717-5_OBX.hl7 b/examples/Test/Automated/Assertion/009_CA_ORU_R01_remove_99717-5_OBX.hl7 similarity index 100% rename from examples/Test/Automated/009_CA_ORU_R01_remove_99717-5_OBX.hl7 rename to examples/Test/Automated/Assertion/009_CA_ORU_R01_remove_99717-5_OBX.hl7 diff --git a/examples/Test/Automated/010_LA_ORU_R01_NBS_0_initial_obr_flatten_example_1.hl7 b/examples/Test/Automated/Assertion/010_LA_ORU_R01_NBS_0_initial_obr_flatten_example_1.hl7 similarity index 100% rename from examples/Test/Automated/010_LA_ORU_R01_NBS_0_initial_obr_flatten_example_1.hl7 rename to examples/Test/Automated/Assertion/010_LA_ORU_R01_NBS_0_initial_obr_flatten_example_1.hl7 diff --git a/examples/Test/Automated/README.md b/examples/Test/Automated/Assertion/README.md similarity index 96% rename from examples/Test/Automated/README.md rename to examples/Test/Automated/Assertion/README.md index 122330276..c7a01e231 100644 --- a/examples/Test/Automated/README.md +++ b/examples/Test/Automated/Assertion/README.md @@ -1,5 +1,5 @@ This folder contains the HL7 sample files that are used in the automated ReportStream -integration tests. The [automated-staging-test-submit.yml](/.github/workflows/staging-test-submit.yml) +integration tests. The [automated-staging-test-submit.yml](/.github/workflows/automated-staging-test-submit.yml) Github workflow that runs daily will grab these files and send them to ReportStream in staging. The files are expected to go through the whole flow and to be delivered to an Azure blob container that will later be used by the diff --git a/examples/Test/GoldenCopy/Expected/001_ORU_R01_golden_copy_expected_acylc_1.fhir b/examples/Test/Automated/GoldenCopy/Expected/001_ORU_R01_golden_copy_expected_acylc_1.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/001_ORU_R01_golden_copy_expected_acylc_1.fhir rename to examples/Test/Automated/GoldenCopy/Expected/001_ORU_R01_golden_copy_expected_acylc_1.fhir diff --git a/examples/Test/GoldenCopy/Expected/002_ORU_R01_golden_copy_expected_acylc_2.fhir b/examples/Test/Automated/GoldenCopy/Expected/002_ORU_R01_golden_copy_expected_acylc_2.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/002_ORU_R01_golden_copy_expected_acylc_2.fhir rename to examples/Test/Automated/GoldenCopy/Expected/002_ORU_R01_golden_copy_expected_acylc_2.fhir diff --git a/examples/Test/GoldenCopy/Expected/003_ORU_R01_golden_copy_expected_aa_unusual.fhir b/examples/Test/Automated/GoldenCopy/Expected/003_ORU_R01_golden_copy_expected_aa_unusual.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/003_ORU_R01_golden_copy_expected_aa_unusual.fhir rename to examples/Test/Automated/GoldenCopy/Expected/003_ORU_R01_golden_copy_expected_aa_unusual.fhir diff --git a/examples/Test/GoldenCopy/Expected/004_ORU_R01_golden_copy_expected_in_range.fhir b/examples/Test/Automated/GoldenCopy/Expected/004_ORU_R01_golden_copy_expected_in_range.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/004_ORU_R01_golden_copy_expected_in_range.fhir rename to examples/Test/Automated/GoldenCopy/Expected/004_ORU_R01_golden_copy_expected_in_range.fhir diff --git a/examples/Test/GoldenCopy/Expected/005_ORU_R01_golden_copy_expected_out_of_range.fhir b/examples/Test/Automated/GoldenCopy/Expected/005_ORU_R01_golden_copy_expected_out_of_range.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/005_ORU_R01_golden_copy_expected_out_of_range.fhir rename to examples/Test/Automated/GoldenCopy/Expected/005_ORU_R01_golden_copy_expected_out_of_range.fhir diff --git a/examples/Test/GoldenCopy/Expected/006_ORU_R01_golden_copy_expected_sma_incomplete.fhir b/examples/Test/Automated/GoldenCopy/Expected/006_ORU_R01_golden_copy_expected_sma_incomplete.fhir similarity index 100% rename from examples/Test/GoldenCopy/Expected/006_ORU_R01_golden_copy_expected_sma_incomplete.fhir rename to examples/Test/Automated/GoldenCopy/Expected/006_ORU_R01_golden_copy_expected_sma_incomplete.fhir diff --git a/examples/Test/GoldenCopy/Input/001_ORU_R01_golden_copy_input_acylc_1.hl7 b/examples/Test/Automated/GoldenCopy/Input/001_ORU_R01_golden_copy_input_acylc_1.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/001_ORU_R01_golden_copy_input_acylc_1.hl7 rename to examples/Test/Automated/GoldenCopy/Input/001_ORU_R01_golden_copy_input_acylc_1.hl7 diff --git a/examples/Test/GoldenCopy/Input/002_ORU_R01_golden_copy_input_acylc_2.hl7 b/examples/Test/Automated/GoldenCopy/Input/002_ORU_R01_golden_copy_input_acylc_2.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/002_ORU_R01_golden_copy_input_acylc_2.hl7 rename to examples/Test/Automated/GoldenCopy/Input/002_ORU_R01_golden_copy_input_acylc_2.hl7 diff --git a/examples/Test/GoldenCopy/Input/003_ORU_R01_golden_copy_input_aa_unusual.hl7 b/examples/Test/Automated/GoldenCopy/Input/003_ORU_R01_golden_copy_input_aa_unusual.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/003_ORU_R01_golden_copy_input_aa_unusual.hl7 rename to examples/Test/Automated/GoldenCopy/Input/003_ORU_R01_golden_copy_input_aa_unusual.hl7 diff --git a/examples/Test/GoldenCopy/Input/004_ORU_R01_golden_copy_input_in_range.hl7 b/examples/Test/Automated/GoldenCopy/Input/004_ORU_R01_golden_copy_input_in_range.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/004_ORU_R01_golden_copy_input_in_range.hl7 rename to examples/Test/Automated/GoldenCopy/Input/004_ORU_R01_golden_copy_input_in_range.hl7 diff --git a/examples/Test/GoldenCopy/Input/005_ORU_R01_golden_copy_input_out_of_range.hl7 b/examples/Test/Automated/GoldenCopy/Input/005_ORU_R01_golden_copy_input_out_of_range.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/005_ORU_R01_golden_copy_input_out_of_range.hl7 rename to examples/Test/Automated/GoldenCopy/Input/005_ORU_R01_golden_copy_input_out_of_range.hl7 diff --git a/examples/Test/GoldenCopy/Input/006_ORU_R01_golden_copy_input_sma_incomplete.hl7 b/examples/Test/Automated/GoldenCopy/Input/006_ORU_R01_golden_copy_input_sma_incomplete.hl7 similarity index 100% rename from examples/Test/GoldenCopy/Input/006_ORU_R01_golden_copy_input_sma_incomplete.hl7 rename to examples/Test/Automated/GoldenCopy/Input/006_ORU_R01_golden_copy_input_sma_incomplete.hl7 diff --git a/examples/Test/GoldenCopy/README.md b/examples/Test/Automated/GoldenCopy/README.md similarity index 97% rename from examples/Test/GoldenCopy/README.md rename to examples/Test/Automated/GoldenCopy/README.md index bf104ae6b..74cee7714 100644 --- a/examples/Test/GoldenCopy/README.md +++ b/examples/Test/Automated/GoldenCopy/README.md @@ -1,5 +1,5 @@ This folder contains the HL7 sample files that are used in the Golden Copy ReportStream -integration tests. The [golden-copy-staging-test-submit.yml](/.github/workflows/staging-test-submit.yml) +integration tests. The [golden-copy-staging-test-submit.yml](/.github/workflows/automated-staging-test-submit.yml) Github workflow that runs daily will grab these files and send them to ReportStream in staging. The files are expected to go through the whole flow and to be delivered to an Azure blob container that will later be used by the