diff --git a/.github/workflows/deploy-lambda-artifact.yml b/.github/workflows/deploy-lambda-artifact.yml index d371b1254b..4125a32ee9 100644 --- a/.github/workflows/deploy-lambda-artifact.yml +++ b/.github/workflows/deploy-lambda-artifact.yml @@ -235,7 +235,7 @@ jobs: - name: Login to Amazon ECR id: login-ecr if: ${{ steps.decide.outputs.deployment_mode == 'build' && !steps.build-check.outputs.existing_image_digest }} - uses: aws-actions/amazon-ecr-login@f2e9fc6c2b355c1890b65e6f6f0e2ac3e6e22f78 + uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a - name: Set up Docker Buildx if: ${{ steps.decide.outputs.deployment_mode == 'build' && !steps.build-check.outputs.existing_image_digest }} diff --git a/package-lock.json b/package-lock.json index 4bed551b50..d06240cfa6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1039,14 +1039,11 @@ "dev": true }, "node_modules/dompurify": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.2.tgz", - "integrity": "sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.0.tgz", + "integrity": "sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==", "dev": true, "license": "(MPL-2.0 OR Apache-2.0)", - "engines": { - "node": ">=20" - }, "optionalDependencies": { "@types/trusted-types": "^2.0.7" } diff --git a/tests/e2e_automation/features/APITests/create.feature b/tests/e2e_automation/features/APITests/create.feature index 072feae92f..877dd873d4 100644 --- a/tests/e2e_automation/features/APITests/create.feature +++ b/tests/e2e_automation/features/APITests/create.feature @@ -75,7 +75,7 @@ Feature: Create the immunization event for a patient And MNS event will be triggered with correct data for created event @Delete_cleanUp @vaccine_type_BCG @patient_id_InvalidInPDS @supplier_name_EMIS - Scenario: Verify that VACCINATION_PROCEDURE_TERM, VACCINE_PRODUCT_TERM fields are mapped to first instance of coding.display fields in imms delta table + Scenario: Verify that VACCINATION_PROCEDURE_TERM, VACCINE_PRODUCT_TERM , SITE_OF_VACCINATION_TERM, ROUTE_OF_VACCINATION_TERM fields are mapped to first instance of coding.display fields in imms delta table Given Valid json payload is created where vaccination terms has multiple instances of coding When Trigger the post create request Then The request will be successful with the status code '201' diff --git a/tests/e2e_automation/features/APITests/steps/test_create_steps.py b/tests/e2e_automation/features/APITests/steps/test_create_steps.py index 181ea11547..2ceeaf2fe5 100644 --- a/tests/e2e_automation/features/APITests/steps/test_create_steps.py +++ b/tests/e2e_automation/features/APITests/steps/test_create_steps.py @@ -94,9 +94,13 @@ def createValidJsonPayloadWithProcedureMultipleCodings(context): valid_json_payload_is_created(context) procedures_list = get_all_the_vaccination_codes(VACCINATION_PROCEDURE_MAP[context.vaccine_type.upper()]) product_list = get_all_the_vaccination_codes(VACCINE_CODE_MAP[context.vaccine_type.upper()]) + site_list = get_all_the_vaccination_codes(SITE_MAP) + route_list = get_all_the_vaccination_codes(ROUTE_MAP) context.immunization_object.extension[0].valueCodeableConcept.coding = procedures_list context.immunization_object.vaccineCode.coding = product_list + context.immunization_object.site.coding = site_list + context.immunization_object.route.coding = route_list @given( diff --git a/tests/e2e_automation/utilities/vaccination_constants.py b/tests/e2e_automation/utilities/vaccination_constants.py index 2de8376a6f..02f5a9a2ca 100644 --- a/tests/e2e_automation/utilities/vaccination_constants.py +++ b/tests/e2e_automation/utilities/vaccination_constants.py @@ -672,8 +672,16 @@ ] REASON_CODE_MAP = [ - {"system": "http://snomed.info/sct", "code": "443684005", "display": "Disease outbreak (event)"}, - {"system": "http://snomed.info/sct", "code": "310578008", "display": "Routine immunization schedule"}, + { + "system": "http://snomed.info/sct", + "code": "443684005", + "display": "Disease outbreak (event)", + }, + { + "system": "http://snomed.info/sct", + "code": "310578008", + "display": "Routine immunization schedule", + }, ] PROTOCOL_DISEASE_MAP = { @@ -686,9 +694,19 @@ ], "FLU": [{"system": "http://snomed.info/sct", "code": "6142004", "display": "Influenza"}], "RSV": [ - {"system": "http://snomed.info/sct", "code": "55735004", "display": "Respiratory syncytial virus infection"} + { + "system": "http://snomed.info/sct", + "code": "55735004", + "display": "Respiratory syncytial virus infection", + } + ], + "HPV": [ + { + "system": "http://snomed.info/sct", + "code": "240532009", + "display": "Human papilloma virus infection", + } ], - "HPV": [{"system": "http://snomed.info/sct", "code": "240532009", "display": "Human papilloma virus infection"}], "MMR": [ {"system": "http://snomed.info/sct", "code": "14189004", "display": "Measles"}, {"system": "http://snomed.info/sct", "code": "36989005", "display": "Mumps"}, @@ -698,15 +716,33 @@ {"system": "http://snomed.info/sct", "code": "14189004", "display": "Measles"}, {"system": "http://snomed.info/sct", "code": "36989005", "display": "Mumps"}, {"system": "http://snomed.info/sct", "code": "36653000", "display": "Rubella"}, - {"system": "http://snomed.info/sct", "code": "38907003", "display": "Varicella"}, + { + "system": "http://snomed.info/sct", + "code": "38907003", + "display": "Varicella", + }, ], "PERTUSSIS": [{"system": "http://snomed.info/sct", "code": "27836007", "display": "Pertussis"}], - "SHINGLES": [{"system": "http://snomed.info/sct", "code": "4740000", "display": "Herpes zoster"}], + "SHINGLES": [ + { + "system": "http://snomed.info/sct", + "code": "4740000", + "display": "Herpes zoster", + } + ], "PNEUMOCOCCAL": [ - {"system": "http://snomed.info/sct", "code": "16814004", "display": "Pneumococcal infectious disease"} + { + "system": "http://snomed.info/sct", + "code": "16814004", + "display": "Pneumococcal infectious disease", + } ], "3IN1": [ - {"system": "http://snomed.info/sct", "code": "398102009", "display": "Acute poliomyelitis"}, + { + "system": "http://snomed.info/sct", + "code": "398102009", + "display": "Acute poliomyelitis", + }, { "system": "http://snomed.info/sct", "code": "397430003", @@ -714,33 +750,79 @@ }, {"system": "http://snomed.info/sct", "code": "76902006", "display": "Tetanus"}, ], - "MENACWY": [{"system": "http://snomed.info/sct", "code": "23511006", "display": "Meningococcal infectious disease"}], + "MENACWY": [ + { + "system": "http://snomed.info/sct", + "code": "23511006", + "display": "Meningococcal infectious disease", + } + ], "4IN1": [ - {"system": "http://snomed.info/sct", "code": "398102009", "display": "Acute poliomyelitis"}, + { + "system": "http://snomed.info/sct", + "code": "398102009", + "display": "Acute poliomyelitis", + }, { "system": "http://snomed.info/sct", "code": "397430003", "display": "Diphtheria caused by Corynebacterium diphtheriae", }, - {"system": "http://snomed.info/sct", "code": "27836007", "display": "Pertussis"}, + { + "system": "http://snomed.info/sct", + "code": "27836007", + "display": "Pertussis", + }, {"system": "http://snomed.info/sct", "code": "76902006", "display": "Tetanus"}, ], "6IN1": [ - {"system": "http://snomed.info/sct", "code": "398102009", "display": "Acute poliomyelitis"}, + { + "system": "http://snomed.info/sct", + "code": "398102009", + "display": "Acute poliomyelitis", + }, { "system": "http://snomed.info/sct", "code": "397430003", "display": "Diphtheria caused by Corynebacterium diphtheriae", }, - {"system": "http://snomed.info/sct", "code": "709410003", "display": "Haemophilus influenzae type b infection"}, - {"system": "http://snomed.info/sct", "code": "27836007", "display": "Pertussis"}, + { + "system": "http://snomed.info/sct", + "code": "709410003", + "display": "Haemophilus influenzae type b infection", + }, + { + "system": "http://snomed.info/sct", + "code": "27836007", + "display": "Pertussis", + }, {"system": "http://snomed.info/sct", "code": "76902006", "display": "Tetanus"}, - {"system": "http://snomed.info/sct", "code": "66071002", "display": "Type B viral hepatitis"}, + { + "system": "http://snomed.info/sct", + "code": "66071002", + "display": "Type B viral hepatitis", + }, + ], + "BCG": [ + { + "system": "http://snomed.info/sct", + "code": "56717001", + "display": "Tuberculosis", + } + ], + "HEPB": [ + { + "system": "http://snomed.info/sct", + "code": "66071002", + "display": "Type B viral hepatitis", + } ], - "BCG": [{"system": "http://snomed.info/sct", "code": "56717001", "display": "Tuberculosis"}], - "HEPB": [{"system": "http://snomed.info/sct", "code": "66071002", "display": "Type B viral hepatitis"}], "HIB": [ - {"system": "http://snomed.info/sct", "code": "709410003", "display": "Haemophilus influenzae type b infection"} + { + "system": "http://snomed.info/sct", + "code": "709410003", + "display": "Haemophilus influenzae type b infection", + } ], "MENB": [ { @@ -749,5 +831,11 @@ "display": "Meningococcal infectious disease caused by Neisseria meningitidis serogroup B", } ], - "ROTAVIRUS": [{"system": "http://snomed.info/sct", "code": "186150001", "display": "Enteritis caused by rotavirus"}], + "ROTAVIRUS": [ + { + "system": "http://snomed.info/sct", + "code": "186150001", + "display": "Enteritis caused by rotavirus", + } + ], }