Skip to content

Commit eabcb28

Browse files
Akol125Akol125
authored
Merge branch 'master' into VED-740b-Searh-link
2 parents 1873ab3 + 7c7b8a3 commit eabcb28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2826
-2913
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ updates:
5151
- "/"
5252
- "/ack_backend"
5353
- "/backend"
54+
- "/batch_processor_filter"
5455
- "/delta_backend"
5556
- "/e2e"
5657
- "/e2e_batch"

‎ack_backend/poetry.lock‎

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

‎ack_backend/pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ packages = [
1010

1111
[tool.poetry.dependencies]
1212
python = "~3.11"
13-
boto3 = "~1.38.42"
14-
mypy-boto3-dynamodb = "^1.38.4"
13+
boto3 = "~1.40.20"
14+
mypy-boto3-dynamodb = "^1.40.20"
1515
freezegun = "^1.5.2"
1616
moto = "^4"
17-
coverage = "^7.9.1"
17+
coverage = "^7.10.5"
1818

1919

2020
[build-system]

‎backend/poetry.lock‎

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

‎backend/pyproject.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ packages = [{include = "src"}]
99
[tool.poetry.dependencies]
1010
python = "~3.11"
1111
"fhir.resources" = "~7.0.2"
12-
boto3 = "~1.38.42"
13-
boto3-stubs-lite = {extras = ["dynamodb"], version = "~1.38.42"}
12+
boto3 = "~1.40.20"
13+
boto3-stubs-lite = {extras = ["dynamodb"], version = "~1.40.20"}
1414
aws-lambda-typing = "~2.20.0"
1515
redis = "^4.6.0"
16-
moto = "^5.1.6"
17-
requests = "~2.32.4"
16+
moto = "^5.1.11"
17+
requests = "~2.32.5"
1818
responses = "~0.25.7"
1919
pydantic = "~1.10.13"
2020
pyjwt = "~2.10.1"
@@ -25,7 +25,7 @@ simplejson = "^3.19.2"
2525
structlog = "^24.1.0"
2626
python-stdnum = "^2.1"
2727
freezegun = "^1.5.1"
28-
coverage = "^7.9.1"
28+
coverage = "^7.10.5"
2929

3030
[build-system]
3131
requires = ["poetry-core ~= 1.5.0"]

‎batch_processor_filter/poetry.lock‎

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

‎batch_processor_filter/pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ packages = [{include = "src"}]
88

99
[tool.poetry.dependencies]
1010
python = "~3.11"
11-
coverage = "^7.9.1"
11+
coverage = "^7.10.5"
1212
aws-lambda-typing = "~2.20.0"
13-
boto3 = "~1.38.42"
14-
moto = "^4"
13+
boto3 = "~1.40.20"
14+
moto = "^5.1.11"
1515

1616
[build-system]
1717
requires = ["poetry-core ~= 1.5.0"]

‎batch_processor_filter/tests/test_lambda_handler.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from unittest.mock import patch
77

88
import botocore
9-
from moto import mock_dynamodb, mock_sqs, mock_s3
9+
from moto import mock_aws
1010

1111
from batch_file_created_event import BatchFileCreatedEvent
1212
from exceptions import InvalidBatchSizeError, EventAlreadyProcessingForSupplierAndVaccTypeError
@@ -22,9 +22,7 @@
2222
s3_client = boto3.client("s3", region_name=REGION_NAME)
2323

2424

25-
@mock_dynamodb
26-
@mock_sqs
27-
@mock_s3
25+
@mock_aws
2826
class TestLambdaHandler(TestCase):
2927
default_batch_file_event: BatchFileCreatedEvent = BatchFileCreatedEvent(
3028
message_id="df0b745c-b8cb-492c-ba84-8ea28d9f51d5",

‎config/dev/permissions_config.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
{
33
"supplier": "DPSFULL",
44
"permissions": [
5+
"3IN1.CRUDS",
56
"COVID19.CRUDS",
67
"FLU.CRUDS",
7-
"MMR.CRUDS",
8-
"RSV.CRUDS",
98
"HPV.CRUDS",
109
"MENACWY.CRUDS",
11-
"3IN1.CRUDS"
10+
"MMR.CRUDS",
11+
"RSV.CRUDS"
1212
],
1313
"ods_codes": ["DPSFULL"]
1414
},
1515
{
1616
"supplier": "DPSREDUCED",
1717
"permissions": [
18+
"3IN1.CRUDS",
1819
"COVID19.CRUDS",
1920
"FLU.CRUDS",
20-
"MMR.CRUDS",
21-
"RSV.CRUDS",
2221
"HPV.CRUDS",
2322
"MENACWY.CRUDS",
24-
"3IN1.CRUDS"
23+
"MMR.CRUDS",
24+
"RSV.CRUDS"
2525
],
2626
"ods_codes": ["DPSREDUCED"]
2727
},
2828
{
2929
"supplier": "MAVIS",
3030
"permissions": [
31-
"HPV.CRUDS",
3231
"3IN1.CRUDS",
32+
"FLU.CRUDS",
33+
"HPV.CRUDS",
3334
"MENACWY.CRUDS",
34-
"MMR.CRUDS",
35-
"FLU.CRUDS"
35+
"MMR.CRUDS"
3636
],
3737
"ods_codes": ["V0V8L"]
3838
},
@@ -48,39 +48,39 @@
4848
},
4949
{
5050
"supplier": "RAVS",
51-
"permissions": ["RSV.CRUDS", "MMR.CRUDS"],
51+
"permissions": ["MMR.CRUDS", "RSV.CRUDS"],
5252
"ods_codes": ["X26", "X8E5B"]
5353
},
5454
{
5555
"supplier": "EMIS",
5656
"permissions": [
57-
"RSV.CRUDS",
58-
"MMR.CRUDS",
59-
"HPV.CRUDS",
6057
"3IN1.CRUDS",
61-
"MENACWY.CRUDS"
58+
"HPV.CRUDS",
59+
"MENACWY.CRUDS",
60+
"MMR.CRUDS",
61+
"RSV.CRUDS"
6262
],
6363
"ods_codes": ["YGM41", "YGJ"]
6464
},
6565
{
6666
"supplier": "TPP",
6767
"permissions": [
68-
"RSV.CRUDS",
69-
"MMR.CRUDS",
70-
"HPV.CRUDS",
7168
"3IN1.CRUDS",
72-
"MENACWY.CRUDS"
69+
"HPV.CRUDS",
70+
"MENACWY.CRUDS",
71+
"MMR.CRUDS",
72+
"RSV.CRUDS"
7373
],
7474
"ods_codes": ["YGA"]
7575
},
7676
{
7777
"supplier": "MEDICUS",
7878
"permissions": [
79-
"RSV.CRUDS",
80-
"MMR.CRUDS",
81-
"HPV.CRUDS",
8279
"3IN1.CRUDS",
83-
"MENACWY.CRUDS"
80+
"HPV.CRUDS",
81+
"MENACWY.CRUDS",
82+
"MMR.CRUDS",
83+
"RSV.CRUDS"
8484
],
8585
"ods_codes": ["YGMYW"]
8686
},
@@ -131,25 +131,25 @@
131131
{
132132
"supplier": "Test_App",
133133
"permissions": [
134+
"3IN1.CRUDS",
134135
"COVID19.CRUDS",
135136
"FLU.CRUDS",
136-
"MMR.CRUDS",
137-
"RSV.CRUDS",
138137
"HPV.CRUDS",
139138
"MENACWY.CRUDS",
140-
"3IN1.CRUDS"
139+
"MMR.CRUDS",
140+
"RSV.CRUDS"
141141
]
142142
},
143143
{
144144
"supplier": "Postman_Auth",
145145
"permissions": [
146+
"3IN1.CRUDS",
146147
"COVID19.CRUDS",
147148
"FLU.CRUDS",
148-
"MMR.CRUDS",
149-
"RSV.CRUDS",
150149
"HPV.CRUDS",
151150
"MENACWY.CRUDS",
152-
"3IN1.CRUDS"
151+
"MMR.CRUDS",
152+
"RSV.CRUDS"
153153
]
154154
}
155155
]

0 commit comments

Comments
 (0)