Skip to content

Commit 71460b5

Browse files
feyisayo-afolabi-nhsfeyisayo-afolabi-nhs
committed
Merge branch 'main' into feature/Eli-751-error-handling
# Conflicts: # utils/data_helper.py
2 parents e90c862 + dafb0f6 commit 71460b5

10 files changed

Lines changed: 112 additions & 47 deletions

File tree

‎.github/workflows/quality-checks.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,14 @@ jobs:
6767
.venv
6868
node_modules
6969
.git
70+
71+
- name: SonarQube
72+
uses: actions/checkout@v6.0.2
73+
with:
74+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
75+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
76+
77+
- name: SonarQube Scan
78+
uses: SonarSource/sonarqube-scan-action@a31c9398be7ace6bbfaf30c0bd5d415f843d45e9
79+
env:
80+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎data/configs/consumerMappings/consumer_mapping_config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"P.WTJ-FJT": [
2+
"test-P.WTJ-FJT": [
33
{
44
"CampaignConfigID": "VITA_Campaign_Config_ID_RSV",
55
"Description": "RSV Ongoing for My Vaccines"
@@ -17,7 +17,7 @@
1717
"Description": "Shared Config for My Vaccines and NBS"
1818
}
1919
],
20-
"P.XWA-VFF": [
20+
"test-P.XWA-VFF": [
2121
{
2222
"CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
2323
"Description": "RSV Ongoing for NBS"
@@ -43,7 +43,7 @@
4343
"Description": "Shared Config for My Vaccines and NBS"
4444
}
4545
],
46-
"Story_Test_Consumer_ID": [
46+
"test-Story_Test_Consumer_ID": [
4747
{
4848
"CampaignConfigID": "Story_Campaign_Config_ID",
4949
"Description": "General Config ID"

‎data/configs/consumerMappings/preprod/consumer_mapping_config.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"P.WTJ-FJT": [
3+
{
4+
"CampaignConfigID": "VITA_Campaign_Config_ID_RSV",
5+
"Description": "RSV Ongoing for My Vaccines"
6+
},
7+
{
8+
"CampaignConfigID": "VITA_Campaign_Config_ID_COVID",
9+
"Description": "RSV Ongoing for My Vaccines"
10+
},
11+
{
12+
"CampaignConfigID": "VITA_Campaign_Config_ID_FLU",
13+
"Description": "RSV Ongoing for My Vaccines"
14+
},
15+
{
16+
"CampaignConfigID": "VITA_NBS_Campaign_Config_ID_COVID",
17+
"Description": "Shared Config for My Vaccines and NBS"
18+
}
19+
],
20+
"P.XWA-VFF": [
21+
{
22+
"CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
23+
"Description": "RSV Ongoing for NBS"
24+
},
25+
{
26+
"CampaignConfigID": "NBS_Campaign_Config_ID_RSV",
27+
"Description": "RSV Ongoing for NBS"
28+
},
29+
{
30+
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID",
31+
"Description": "COVID Ongoing for NBS"
32+
},
33+
{
34+
"CampaignConfigID": "NBS_Campaign_Config_ID_COVID_ACTIVE",
35+
"Description": "COVID Ongoing for NBS"
36+
},
37+
{
38+
"CampaignConfigID": "NBS_Campaign_Config_ID_FLU",
39+
"Description": "FLU Ongoing for NBS"
40+
},
41+
{
42+
"CampaignConfigID": "VITA_NBS_Campaign_Config_ID_COVID",
43+
"Description": "Shared Config for My Vaccines and NBS"
44+
}
45+
]
46+
}

‎package-lock.json‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88
"dependencies": {
99
"@playwright/test": "^1.56.0",
10-
"npm": "^11.12.0"
10+
"npm": "^11.12.1"
1111
}
1212
}

‎poetry.lock‎

Lines changed: 23 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ flake8 = "^7.3.0"
1919
isort = "^8.0.1"
2020
black = "^26.3.1"
2121
assertpy = "^1.1"
22-
requests = "^2.32.4"
22+
requests = "^2.33.0"
2323
jsonschema = "^4.26.0"
24-
pip-licenses = "^5.5.1"
24+
pip-licenses = "^5.5.5"
2525
requests-oauthlib = "^2.0.0"
2626
pre-commit = "^4.5.1"
27-
boto3 = "^1.42.73"
28-
faker = "^40.11.0"
27+
boto3 = "^1.42.76"
28+
faker = "^40.11.1"
2929
pyright = "^1.1.408"
3030
pyflakes = "^3.4.0"
3131
locust = "^2.43.3"

‎tests/test_config.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
# Consumer Mapping file - this is a single one for all environments but this may change
3434
CONSUMER_MAPPING_FILE = "data/configs/consumerMappings/consumer_mapping_config.json"
35+
PREPROD_CONSUMER_MAPPING_FILE = (
36+
"data/configs/consumerMappings/preprod/consumer_mapping_config.json"
37+
)
3538

3639
# Location of Integration Test Configs
3740
INT_TEST_CONFIG_PATHS: list[str] = [

‎tests/test_error_scenario_tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def test_no_config_error(eligibility_client):
357357
nhs_number="9990032010",
358358
headers={
359359
"nhs-login-nhs-number": "9990032010",
360-
"NHSE-Product-ID": "Story_Test_Consumer_ID",
360+
"NHSE-Product-ID": "test-Story_Test_Consumer_ID",
361361
},
362362
raise_on_error=False,
363363
)

‎tests/test_upload_consumer_configs.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
from tests import test_config
2-
from utils.s3_config_manager import upload_configs_to_s3
2+
from utils.s3_config_manager import (
3+
upload_configs_to_s3,
4+
upload_consumer_mapping_file_to_s3,
5+
)
36

47

58
def test_upload_current_configs():
69
configs = test_config.INT_TEST_CONFIG_PATHS
710
upload_configs_to_s3(configs)
11+
upload_consumer_mapping_file_to_s3(test_config.PREPROD_CONSUMER_MAPPING_FILE)

0 commit comments

Comments
 (0)