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

Merge pull request #711 from alphagov/extend-scheduling-to-96-hours

Browse Source 
Let jobs be scheduled up to 96 hours in the future
This commit is contained in:
Chris Hill-Scott
2016-10-14 15:33:44 +01:00
committed by GitHub
parent d9ced9f912 9f36b363f2
commit 2a65bf3bb5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/schemas.py
View File

@@ -39,8 +39,8 @@ def _validate_positive_number(value, msg="Not a positive integer"):
raise ValidationError(msg) raise ValidationError(msg)
def _validate_datetime_not_more_than_24_hours_in_future(dte, msg="Date cannot be more than 24hrs in the future"): def _validate_datetime_not_more_than_96_hours_in_future(dte, msg="Date cannot be more than 96hrs in the future"):
if dte > datetime.utcnow() + timedelta(hours=24): if dte > datetime.utcnow() + timedelta(hours=96):
raise ValidationError(msg) raise ValidationError(msg)
@@ -227,7 +227,7 @@ class JobSchema(BaseSchema):
@validates('scheduled_for') @validates('scheduled_for')
def validate_scheduled_for(self, value): def validate_scheduled_for(self, value):
_validate_datetime_not_in_past(value) _validate_datetime_not_in_past(value)
_validate_datetime_not_more_than_24_hours_in_future(value) _validate_datetime_not_more_than_96_hours_in_future(value)
class Meta: class Meta:
model = models.Job model = models.Job

8
tests/app/job/test_rest.py
View File

@@ -137,7 +137,7 @@ def test_create_scheduled_job(notify_api, sample_template, mocker, fake_uuid):
with notify_api.test_request_context(): with notify_api.test_request_context():
with notify_api.test_client() as client: with notify_api.test_client() as client:
with freeze_time("2016-01-01 12:00:00.000000"): with freeze_time("2016-01-01 12:00:00.000000"):
scheduled_date = (datetime.utcnow() + timedelta(hours=23, minutes=59)).isoformat() scheduled_date = (datetime.utcnow() + timedelta(hours=95, minutes=59)).isoformat()
mocker.patch('app.celery.tasks.process_job.apply_async') mocker.patch('app.celery.tasks.process_job.apply_async')
data = { data = {
'id': fake_uuid, 'id': fake_uuid,
@@ -163,7 +163,7 @@ def test_create_scheduled_job(notify_api, sample_template, mocker, fake_uuid):
resp_json = json.loads(response.get_data(as_text=True)) resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['data']['id'] == fake_uuid assert resp_json['data']['id'] == fake_uuid
assert resp_json['data']['scheduled_for'] == datetime(2016, 1, 2, 11, 59, 0, assert resp_json['data']['scheduled_for'] == datetime(2016, 1, 5, 11, 59, 0,
tzinfo=pytz.UTC).isoformat() tzinfo=pytz.UTC).isoformat()
assert resp_json['data']['job_status'] == 'scheduled' assert resp_json['data']['job_status'] == 'scheduled'
assert resp_json['data']['template'] == str(sample_template.id) assert resp_json['data']['template'] == str(sample_template.id)
@@ -174,7 +174,7 @@ def test_should_not_create_scheduled_job_more_then_24_hours_hence(notify_api, sa
with notify_api.test_request_context(): with notify_api.test_request_context():
with notify_api.test_client() as client: with notify_api.test_client() as client:
with freeze_time("2016-01-01 11:09:00.061258"): with freeze_time("2016-01-01 11:09:00.061258"):
scheduled_date = (datetime.utcnow() + timedelta(hours=24, minutes=1)).isoformat() scheduled_date = (datetime.utcnow() + timedelta(hours=96, minutes=1)).isoformat()
mocker.patch('app.celery.tasks.process_job.apply_async') mocker.patch('app.celery.tasks.process_job.apply_async')
data = { data = {
@@ -202,7 +202,7 @@ def test_should_not_create_scheduled_job_more_then_24_hours_hence(notify_api, sa
resp_json = json.loads(response.get_data(as_text=True)) resp_json = json.loads(response.get_data(as_text=True))
assert resp_json['result'] == 'error' assert resp_json['result'] == 'error'
assert 'scheduled_for' in resp_json['message'] assert 'scheduled_for' in resp_json['message']
assert resp_json['message']['scheduled_for'] == ['Date cannot be more than 24hrs in the future'] assert resp_json['message']['scheduled_for'] == ['Date cannot be more than 96hrs in the future']
def test_should_not_create_scheduled_job_in_the_past(notify_api, sample_template, mocker, fake_uuid): def test_should_not_create_scheduled_job_in_the_past(notify_api, sample_template, mocker, fake_uuid):