tidy

Author: nhsdevws

README.md

@@ -25,7 +25,7 @@ See https://nhsd-confluence.digital.nhs.uk/display/APM/Glossary.
 | `recordprocessor`   | **Imms Batch** – Handles batch record processing. |
 | `redis_sync`        | **Imms Redis** – Handles sync s3 to REDIS. |
 | `id_sync`           | **Imms Redis** – Handles sync SQS to IEDS. |
-| `id_sync`           | **Imms Redis** – Not a lambda but Shared Code for lambdas |
+| `shared`            | **Imms Redis** – Not a lambda but Shared Code for lambdas |
 ---
 
 ### Pipelines
@@ -74,22 +74,22 @@ See https://nhsd-confluence.digital.nhs.uk/display/APM/Glossary.
 - `pyenv` manages multiple Python versions at the system level, allowing you to install and switch between different Python versions for different projects.
 - `direnv` automates the loading of environment variables and can auto-activate virtual environments (.venv) when entering a project directory, making workflows smoother.
 - `.venv` (created via python -m venv or poetry) is Python’s built-in tool for isolating dependencies per project, ensuring that packages don’t interfere with global Python packages.
-- `Poetry` is an all-in-one dependency and virtual environment manager that automatically creates a virtual environment (.venv), manages package installations, and locks dependencies (poetry.lock) for reproducibility, making it superior to using pip manually and it is used in all the lambda projects.
+- `Poetry` is an all-in-one dependency and virtual environment manager that automatically creates a virtual environment (.venv), manages package installations, and locks dependencies (poetry.lock) for reproducibility, making it superior to using pip manually and it is used in all the lambda projects. 
 
-## Project structure
-To support a modular and maintainable architecture, each Lambda function in this project is structured as a self-contained folder with its own dependencies, configuration, and environment.
+## Project structure 
+To support a modular and maintainable architecture, each Lambda function in this project is structured as a self-contained folder with its own dependencies, configuration, and environment. 
 
-We use Poetry to manage dependencies and virtual environments, with the virtualenvs.in-project setting enabled to ensure each Lambda has an isolated `.venv` created within its folder.
+We use Poetry to manage dependencies and virtual environments, with the virtualenvs.in-project setting enabled to ensure each Lambda has an isolated `.venv` created within its folder. 
 
-Additionally, direnv is used alongside `.envrc` and `.env` files to automatically activate the appropriate virtual environment and load environment-specific variables when entering a folder.
+Additionally, direnv is used alongside `.envrc` and `.env` files to automatically activate the appropriate virtual environment and load environment-specific variables when entering a folder. 
 
 Each Lambda folder includes its own `.env` file for Lambda-specific settings, while the project root contains a separate `.env` and `.venv` for managing shared tooling, scripts, or infrastructure-related configurations. This setup promotes clear separation of concerns, reproducibility across environments, and simplifies local development, testing, and packaging for deployment.
 
 ## Environment setup
 These dependencies are required for running and debugging the Lambda functions and end-to-end (E2E) tests.
 
-### Install dependencies
-Steps:
+### Install dependencies 
+Steps: 
 1. Install [WSL](https://learn.microsoft.com/en-us/windows/wsl/install) if running on Windows and install [Docker](https://docs.docker.com/engine/install/).
 2. Install the following tools inside WSL. These will be used by the lambda and infrastructure code:
 - [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)
@@ -119,7 +119,7 @@ Once connected, you should see the path as something similar to: `/mnt/d/Source/
     echo 'eval "$(direnv hook bash)"' >> ~/.bashrc
     ```
 
-7. Install poetry
+7. Install poetry 
     ```
     pip install poetry
     ```
@@ -129,7 +129,7 @@ The steps below must be performed in each Lambda function folder and e2e folder
 
 For detailed instructions on running individual Lambdas, refer to the README.md files located inside each respective Lambda folder.
 
-Steps:
+Steps: 
 1. Set the python version in the folder with the code used by lambda for example `./backend` (see [lambdas](#lambdas)) folder.
     ```
     pyenv local 3.11.13 # Set version in backend (this creates a .python-version file)
@@ -158,7 +158,7 @@ Steps:
     dotenv
     ```
 
-5. Restart bash and run `direnv allow`. You should see something similar like:
+5. Restart bash and run `direnv allow`. You should see something similar like: 
     ```
     direnv: loading /mnt/d/Source/immunisation-fhir-api/.envrc
     direnv: export +AWS_PROFILE +IMMUNIZATION_ENV +VIRTUAL_ENV ~PATH
@@ -167,15 +167,15 @@ Steps:
 
 ### Setting up the root level environment
 The root-level virtual environment is primarily used for linting, as we create separate virtual environments for each folder that contains Lambda functions.
-Steps:
-1. Follow instructions above to [install dependencies](#install-dependencies) & [set up a virtual environment](#setting-up-a-virtual-environment-with-poetry).
+Steps: 
+1. Follow instructions above to [install dependencies](#install-dependencies) & [set up a virtual environment](#setting-up-a-virtual-environment-with-poetry). 
 **Note: While this project uses Python 3.10 (e.g. for Lambdas), the NHSDigital/api-management-utils repository — which orchestrates setup and linting — defaults to Python 3.8.
 The linting command is executed from within that repo but calls the Makefile in this project, so be aware of potential Python version mismatches when running or debugging locally or in the pipeline.**
 2. Run `make lint`. This will:
     - Check the linting of the API specification yaml.
     - Run Flake8 on all Python files in the repository, excluding files inside .venv and .terraform directories.
 
-## IDE setup
+## IDE setup 
 The current team uses VS Code mainly. So this setup is targeted towards VS code. If you use another IDE please add the documentation to set up workspaces here.
 
 ### VS Code
@@ -209,7 +209,7 @@ The root (`immunisation-fhir-api`) should point to `/mnt/d/Source/immunisation-f
 
 
 ## Verified commits
-Please note that this project requires that all commits are verified using a GPG key.
+Please note that this project requires that all commits are verified using a GPG key. 
 To set up a GPG key please follow the instructions specified here:
 https://docs.github.com/en/authentication/managing-commit-signature-verification
 

azure/templates/deploy-stage.yml

@@ -150,6 +150,7 @@ jobs:
               echo "##vso[task.setvariable variable=FULLY_QUALIFIED_SERVICE_NAME]${FULLY_QUALIFIED_SERVICE_NAME}"
             fi
           displayName: Override FULLY_QUALIFIED_SERVICE_NAME
+
       - checkout: self
         path: "s/${{ parameters.service_name }}"
 

lambdas/id_sync/README.md

@@ -1,44 +1,35 @@
-# Redis Sync Lambda
+# Id_Sync Lambda
 
 ## Overview
 
-**Redis Sync** is an AWS Lambda function designed to monitor a configuration S3 bucket and synchronize its contents with an ElastiCache Redis instance. Whenever a new configuration file is uploaded or updated in the S3 bucket, the Lambda function processes the file, applies any required transformations, and uploads the result to the Redis cache.
+**Id Sync** is an AWS Lambda function designed to trigger from SQS. It receives a list of NHS Numbers and checks for changes in PDS. If change found, it updates the Events Table.
 
 ## Features
 
-- **S3 Event Driven:** Automatically triggered by S3 events (e.g., file uploads or updates) in the config bucket.
-- **Transformation Support:** Applies custom transformation logic to configuration files before caching.
-- **Redis Integration:** Uploads processed configuration data to ElastiCache Redis for fast, centralized access.
+- **SQS Event Driven:** Automatically triggered by SQS event.
+- **DynamoDb Integration:** Reviews contents of DynbamoDb Events table and updates where required..
 - **Logging:** Provides detailed logging for monitoring and troubleshooting.
 
 ## How It Works
 
-1. **S3 Event Trigger:** The Lambda is triggered by S3 events on the config bucket.
-2. **File Processing:** The Lambda reads the new or updated file from S3.
-3. **Transformation:** If required, the file content is transformed to the appropriate format.
-4. **Redis Upload:** The transformed data is uploaded to the Redis cache under a key corresponding to the file.
-5. **Monitoring:** Logs are generated for each step, aiding in monitoring and debugging.
+1. **SQS Event Trigger:** The Lambda is triggered by SQS events.
+2. **File Processing:** The Lambda reads the NHS Number from SQS.
+3. **DynamoDb Update:** If a new NHS Number is returned from PDS, all relevant records are updated with new value.
+4. **Monitoring:** Logs are generated for each step, aiding in monitoring and debugging.
 
 ## Configuration
 
 - **Environment Variables:**
-  - `CONFIG_BUCKET_NAME`: Name of the S3 bucket to monitor.
-  - `AWS_REGION`: AWS region for S3 and Redis.
-  - `REDIS_HOST`: Redis endpoint.
-  - `REDIS_PORT`: Redis port (default: 6379).
-
-## Usage
-
-1. **Deploy the Lambda** using your preferred IaC tool (e.g., Terraform, AWS SAM).
-2. **Configure S3 event notifications** to trigger the Lambda on object creation or update.
-3. **Ensure Redis and S3 permissions** are set for the Lambda execution role.
+  - `IEDS_TABLE_NAME`: Name of events table.
+  - `PDS_ENV`: Targeted PDS service environment, eg INT.
+  - `SPLUNK_FIREHOSE_NAME`: Name of the splunk firehose for logging
 
 ## Development
 
-- Code is located in the `src/` directory.
-- Unit tests are in the `tests/` directory.
+- Code is located in the `lambdas/id_sync/src/` directory.
+- Unit tests are in the `lambdas/id_sync/tests/` directory.
 - Use the provided Makefile and Dockerfile for building, testing, and packaging.
 
 ## License
 
-This project is maintained by NHS. See [LICENSE](../LICENSE) for details.
+This project is maintained by NHS. See [LICENSE](../LICENSE) for details.

lambdas/id_sync/src/junk.json

@@ -1,4 +1,3 @@
-# os_vars.py - Improved approach (✅ Better)
 import os
 from typing import Optional