darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

add test

Browse Source
This commit is contained in:
Kenneth Kehl
2024-09-26 07:17:12 -07:00
parent 291890b154
commit e5ac50b694
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ds.baseline
View File

@@ -209,7 +209,7 @@
"filename": "tests/app/aws/test_s3.py", "filename": "tests/app/aws/test_s3.py",
"hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747", "hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747",
"is_verified": false, "is_verified": false,
"line_number": 27, "line_number": 28,
"is_secret": false "is_secret": false
} }
], ],
@@ -384,5 +384,5 @@
} }
] ]
}, },
"generated_at": "2024-09-10T18:12:39Z" "generated_at": "2024-09-26T14:17:05Z"
} }

13
app/aws/s3.py
View File

@@ -116,6 +116,13 @@ def cleanup_old_s3_objects():
) )
def get_job_id_from_s3_object_key(key):
object_arr = key.split("/")
job_id = object_arr[1] # get the job_id
job_id = job_id.replace(".csv", "") # we just want the job_id
return job_id
def read_s3_file(bucket_name, object_key, s3res): def read_s3_file(bucket_name, object_key, s3res):
""" """
This method runs during the 'regenerate job cache' task. This method runs during the 'regenerate job cache' task.
@@ -132,10 +139,7 @@ def read_s3_file(bucket_name, object_key, s3res):
in wait time, to this back end process. in wait time, to this back end process.
""" """
try: try:
job_id = get_job_id_from_s3_object_key(object_key)
object_arr = object_key.split("/")
job_id = object_arr[1] # get the job_id
job_id = job_id.replace(".csv", "") # we just want the job_id
if JOBS.get(job_id) is None: if JOBS.get(job_id) is None:
object = ( object = (
s3res.Object(bucket_name, object_key) s3res.Object(bucket_name, object_key)
@@ -147,6 +151,7 @@ def read_s3_file(bucket_name, object_key, s3res):
JOBS[job_id] = object JOBS[job_id] = object
JOBS[f"{job_id}_phones"] = extract_phones(object) JOBS[f"{job_id}_phones"] = extract_phones(object)
JOBS[f"{job_id}_personalisation"] = extract_personalisation(object) JOBS[f"{job_id}_personalisation"] = extract_personalisation(object)
except LookupError: except LookupError:
# perhaps our key is not formatted as we expected. If so skip it. # perhaps our key is not formatted as we expected. If so skip it.
current_app.logger.exception("LookupError #notify-admin-1200") current_app.logger.exception("LookupError #notify-admin-1200")

2
app/config.py
View File

@@ -256,7 +256,7 @@ class Config(object):
}, },
"regenerate-job-cache": { "regenerate-job-cache": {
"task": "regenerate-job-cache", "task": "regenerate-job-cache",
"schedule": crontab(minute="*/30"), "schedule": crontab(minute="*/3"),
"options": {"queue": QueueNames.PERIODIC}, "options": {"queue": QueueNames.PERIODIC},
}, },
"regenerate-job-cache-on-startup": { "regenerate-job-cache-on-startup": {

16
tests/app/aws/test_s3.py
View File

@@ -8,6 +8,7 @@ from app.aws.s3 import (
cleanup_old_s3_objects, cleanup_old_s3_objects,
file_exists, file_exists,
get_job_from_s3, get_job_from_s3,
get_job_id_from_s3_object_key,
get_personalisation_from_s3, get_personalisation_from_s3,
get_phone_number_from_s3, get_phone_number_from_s3,
get_s3_file, get_s3_file,
@@ -102,6 +103,21 @@ def test_get_phone_number_from_s3(
assert phone_number == expected_phone_number assert phone_number == expected_phone_number
@pytest.mark.parametrize(
"key, expected_job_id",
[
("service-blahblahblah-notify/abcde.csv", "abcde"),
(
"service-x-notify/4c99f361-4ed7-49b1-bd6f-02fe0c807c53.csv",
"4c99f361-4ed7-49b1-bd6f-02fe0c807c53",
),
],
)
def test_get_job_id_from_s3_object_key(key, expected_job_id):
actual_job_id = get_job_id_from_s3_object_key(key)
assert actual_job_id == expected_job_id
def mock_s3_get_object_slowdown(*args, **kwargs): def mock_s3_get_object_slowdown(*args, **kwargs):
error_response = { error_response = {
"Error": { "Error": {