Skip to content

Commit fd995f8

Browse files
dlzhry2nhsdependabot[bot]motolamfjarvisJamesW1-NHS
committed
Feature/ved 000 merge latest from master (#1216)
* VED-1059 Made adjustment to batch queueing logic (#1189) * Bump @redocly/cli from 2.15.1 to 2.16.0 in the npm-minor-patch group (#1188) Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli). Updates `@redocly/cli` from 2.15.1 to 2.16.0 - [Release notes](https://github.com/Redocly/redocly-cli/releases) - [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.15.1...@redocly/cli@2.16.0) --- updated-dependencies: - dependency-name: "@redocly/cli" dependency-version: 2.16.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * OAS documentation for name field characters (#1190) * VED-901: Update extended attribute file destination. (#1141) * VED-901: Update extended attributes destination prefix. * VED-901: Update tests. * VED-901: Upload EA files directly to the S3 submission upload bucket. * VED-901: Lint tfvars files. * VED-1017: Generate JSON ACK file (#1168) * init * log bugfix * interim: create_json_ack_file. pending new unit test and fixing old ones * TEMP_ACK_FILE * update_json_ack_file * ingestion_start_time * complete_batch_file_process * obtain_current_json_ack_content * cut/paste fix * mock out get_ingestion_start_time_by_message_id * fix & test get_ingestion_start_time_by_message_id * bugfix * bugfix split()[] * test_update_ack_file * test_complete_batch_file_process_json_ack_file II * code cleanup * extra mocks * supplier * restored move_file * json ack file unit tests for lambda_handler (part 1) * archive source file test - to support e2e testing * remove redundant functions * bugfix: get message_id from correct place for JSON ack file * Trigger build * bug fix: get_ingestion_start_time_by_message_id * fixed filename in JSON ack file * fixed filename in JSON ack file II * supplier * unit tests * cleanup * kick pipeline * remove duplicate update_audit_table_item() call * remove duplicate update_audit_table_item() call II * review changes * success -> succeeded * _make_json_ack_file_row * refactor json_ack_data helper functions * _generated_date test values * update_csv_ack_file * obtain_current_csv_ack_content * _generated_date comment * _make_json_ack_data_row * manual merge of e2e_automation from #1177 * Remove grafana code, dependabot, README references and sonar config (#1193) * Bump @redocly/cli from 2.16.0 to 2.17.0 in the npm-minor-patch group (#1192) Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli). Updates `@redocly/cli` from 2.16.0 to 2.17.0 - [Release notes](https://github.com/Redocly/redocly-cli/releases) - [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.16.0...@redocly/cli@2.17.0) --- updated-dependencies: - dependency-name: "@redocly/cli" dependency-version: 2.17.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * VED-000 [NOJIRA] Update Python dependencies. (#1196) * VED-1039 Added the new vaccine types permitted for TPP and Optum (EMIS) (#1200) * Bump @redocly/cli from 2.17.0 to 2.18.0 in the npm-minor-patch group (#1198) Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli). Updates `@redocly/cli` from 2.17.0 to 2.18.0 - [Release notes](https://github.com/Redocly/redocly-cli/releases) - [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.17.0...@redocly/cli@2.18.0) --- updated-dependencies: - dependency-name: "@redocly/cli" dependency-version: 2.18.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * Bump @redocly/cli from 2.18.0 to 2.18.1 in the npm-minor-patch group (#1208) * Bump @redocly/cli from 2.18.0 to 2.18.1 in the npm-minor-patch group Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli). Updates `@redocly/cli` from 2.18.0 to 2.18.1 - [Release notes](https://github.com/Redocly/redocly-cli/releases) - [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.18.0...@redocly/cli@2.18.1) --- updated-dependencies: - dependency-name: "@redocly/cli" dependency-version: 2.18.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Trigger build --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * Bump the terraform-minor-patch group across 2 directories with 1 update (#1209) Bumps the terraform-minor-patch group with 1 update in the /infrastructure/account directory: [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws). Bumps the terraform-minor-patch group with 1 update in the /infrastructure/instance directory: [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws). Updates `hashicorp/aws` from 6.31.0 to 6.32.1 - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1) Updates `hashicorp/aws` from 6.31.0 to 6.32.1 - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1) Updates `hashicorp/aws` from 6.31.0 to 6.32.1 - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1) Updates `hashicorp/aws` from 6.31.0 to 6.32.1 - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1) --- updated-dependencies: - dependency-name: hashicorp/aws dependency-version: 6.32.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-minor-patch - dependency-name: hashicorp/aws dependency-version: 6.32.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-minor-patch - dependency-name: hashicorp/aws dependency-version: 6.32.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-minor-patch - dependency-name: hashicorp/aws dependency-version: 6.32.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * VED-1038 updated lint issue (#1207) * updated the smoke tag and add scenarios as required in ticket * ruff format * fix the broken tests * updated lint issue * Update tests/e2e_automation/features/APITests/update.feature Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * fix broken test by adding the valid vaccination in pre-condition * fix lint issue --------- Co-authored-by: Daniel Yip <daniel.yip4@nhs.net> * VED-981 Add base infrastructure for the MNS Publisher feature (#1191) * VED-981 (Part 2) Add DLQ, redrive policy, and encryption to queues (#1203) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Akinola Olutola <akinola.olutola1@nhs.net> Co-authored-by: Matt Jarvis <61870561+mfjarvis@users.noreply.github.com> Co-authored-by: James W. <218585646+JamesW1-NHS@users.noreply.github.com> Co-authored-by: Ed Hall <239591530+edhall-nhs@users.noreply.github.com> Co-authored-by: FimranNHS <fatima.imran3@nhs.net>
1 parent bd7c3ea commit fd995f8

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

lambdas/mesh_processor/poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
"license": "MIT",
1616
"homepage": "https://github.com/NHSDigital/immunisation-fhir-api",
1717
"devDependencies": {
18+
<<<<<<< HEAD
1819
"@redocly/cli": "^2.19.2",
20+
=======
21+
"@redocly/cli": "^2.18.1",
22+
>>>>>>> 150388467 (Feature/ved 000 merge latest from master (#1216))
1923
"husky": "^9.1.7",
2024
"lint-staged": "^16.2.7",
2125
"prettier": "^3.8.1"

tests/e2e_automation/features/APITests/search.feature

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,19 @@ Feature: Search the immunization of a patient
154154
Then The request will be successful with the status code '200'
155155
And The Search Response should contain search results and OperationOutcome for unauthorized immunization targets
156156

157+
@smoke
158+
@Delete_cleanUp @supplier_name_Postman_Auth
159+
Scenario Outline: Verify that the immunization events retrieved in the response of Search API should be within Date From and Date To range
160+
Given Valid vaccination record is created for '<NHSNumber>' and Disease Type '<vaccine_type>' with recorded date as '<DateFrom>'
161+
When Send a search request with GET method with valid NHS Number '<NHSNumber>' and Disease Type '<vaccine_type>' and Date From '<DateFrom>' and Date To '<DateTo>'
162+
Then The request will be successful with the status code '200'
163+
And The occurrenceDateTime of the immunization events should be within the Date From and Date To range
164+
When Send a search request with POST method with valid NHS Number '<NHSNumber>' and Disease Type '<vaccine_type>' and Date From '<DateFrom>' and Date To '<DateTo>'
165+
Then The request will be successful with the status code '200'
166+
And The occurrenceDateTime of the immunization events should be within the Date From and Date To range
167+
Examples:
168+
| NHSNumber | vaccine_type | DateFrom | DateTo |
169+
| 9728403348 | FLU | 2023-01-01 | 2023-06-04 |
157170

158171
@supplier_name_MAVIS @vaccine_type_RSV
159172
Scenario Outline: Verify that Search API will throw error if date from is invalid

0 commit comments

Comments
 (0)