406 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicholas Staples	1eb18e7f07	Code review fix.	2016-02-12 14:08:48 +00:00
Nicholas Staples	918c561726	Code added to now check service id matches the authorization token service for sending an sms.	2016-02-12 11:13:54 +00:00
Nicholas Staples	4865622128	Merge remote-tracking branch 'origin/master' into validate_template_for_a_service	2016-02-12 10:22:17 +00:00
NIcholas Staples	91164b0afd	Merge pull request #70 from alphagov/return-notification-id ... Return notification is when adding notification to queue	2016-02-12 09:48:56 +00:00
Martyn Inglis	fcc1585fdf	Merge branch 'master' into celery-spike ... Conflicts: app/__init__.py app/notifications/rest.py config.py wsgi.py	2016-02-12 09:36:49 +00:00
Rebecca Law	0cd5fa278b	Fix a intermittent test. ... Removed the need for sample_admin_service_id in service/test_rest	2016-02-10 13:09:36 +00:00
Rebecca Law	2db0f9737e	Added a test to check endpoint works with an id in payload.	2016-02-10 12:46:52 +00:00
Rebecca Law	a01828a6d0	Return notification_id on create notification endpoints ... - /notification/sms - /notification/email - /notificaiton/sms/service/<service_id> Update message attribute on SQS to notification_id from message_id	2016-02-10 12:46:52 +00:00
minglis	ea22e53453	Merge pull request #68 from alphagov/bump-client ... Updated python client verion	2016-02-10 12:38:33 +00:00
Martyn Inglis	a1be4e3ca5	Updated python client verion	2016-02-10 12:33:54 +00:00
NIcholas Staples	33dafafece	Merge pull request #67 from alphagov/notfication-job-nullable ... job on notification now nullable.	2016-02-10 11:20:53 +00:00
Adam Shimali	3a2cfc96e6	job on notification now nullable.	2016-02-10 11:08:24 +00:00
Martyn Inglis	d38ba0d36a	bumped client version	2016-02-09 18:48:02 +00:00
Adam Shimali	e6a7e07505	Fix for create job id on api side	2016-02-09 18:28:28 +00:00
Adam Shimali	a42a99250e	Merge pull request #66 from alphagov/remove_alpha_client_from_api ... Remove alpha client from api	2016-02-09 16:26:01 +00:00
Nicholas Staples	1b25a3c762	Removed alpha client imports.	2016-02-09 16:13:48 +00:00
Nicholas Staples	09d2f0d79d	Fix tests.	2016-02-09 16:04:49 +00:00
Nicholas Staples	68b6444eed	Comment added for missing code.	2016-02-09 16:02:38 +00:00
Nicholas Staples	bd947d0743	Merge remote-tracking branch 'origin/master' into remove_alpha_client_from_api	2016-02-09 15:54:21 +00:00
NIcholas Staples	3fd333ef94	Merge pull request #65 from alphagov/add-notification-status-endpoints ... [WIP] Added endpoints under /job for creating, updating and reading	2016-02-09 14:53:34 +00:00
Adam Shimali	17e5e70f6c	[WIP] Added endpoints under /job for creating, updating and reading ... notification status.	2016-02-09 14:17:42 +00:00
Adam Shimali	6007cdc24e	Merge pull request #64 from alphagov/separate_queue_name_per_environment ... updated environment variables.	2016-02-09 14:12:01 +00:00
Nicholas Staples	38e30034d1	updated environment variables.	2016-02-09 14:07:43 +00:00
NIcholas Staples	42b18897f0	Merge pull request #63 from alphagov/read-environment-from-file ... Added code to read environemnt from a file	2016-02-09 14:03:42 +00:00
Martyn Inglis	66763a061c	Added preview and staging config blocks	2016-02-09 13:56:11 +00:00
Martyn Inglis	c2424d6509	Added code to read environemnt from a file ... If file does not exist default to live config.	2016-02-09 13:41:20 +00:00
Martyn Inglis	fb41acdac9	Celery tests	2016-02-09 13:31:45 +00:00
NIcholas Staples	db3c787caf	Merge pull request #62 from alphagov/add-refs-to-notification ... [WIP] Added service and template relationship to notification model.	2016-02-09 12:53:07 +00:00
Adam Shimali	e5e049d735	Added service and template relationship to notification model. ... This makes it more consistent with other model classes with respect to marhmallow serialisation/deserialisation.	2016-02-09 12:48:27 +00:00
Rebecca Law	d24a356205	Merge pull request #61 from alphagov/add-notification ... [WIP] New model class and dao for notification. This will be used for	2016-02-09 12:23:33 +00:00
Adam Shimali	c7121be5a2	[WIP] New model class and dao for notification. This will be used for ... recording status and outcome of sending notifications.	2016-02-09 12:03:40 +00:00
Nicholas Staples	2fda7ee59b	Alpha client removed from code. Tests fixed but will wait till other notifications jobs are done before creating a pull request.	2016-02-09 11:38:57 +00:00
NIcholas Staples	c1b0cef864	Merge pull request #60 from alphagov/delivery-new-endpoint ... New endpoint for delivery app to use.	2016-02-08 16:29:22 +00:00
Adam Shimali	0580f5ab06	New endpoint for delivery app to use. ... Once removal of code that uses existing alpha is done, then duplicated code from /notifications/sms and the new endpoint can be merged. Job id is now avaiable in notificaiton but is not used yet.	2016-02-08 14:54:15 +00:00
Adam Shimali	d99776d6cc	Merge pull request #59 from alphagov/add-logging-for-auth-errors ... Update the error response from the authentication method	2016-02-08 13:36:46 +00:00
Rebecca Law	416dd00ac8	Added a test for the case when there is no secret for the api client. ... Fix codestyle	2016-02-08 11:33:24 +00:00
Rebecca Law	877a8a0411	Added logging for the authentication errors. ... Moved the "no api secret" error message to the end and only create it if there are no api client secrets	2016-02-08 11:10:54 +00:00
NIcholas Staples	db1c6749a6	Merge pull request #57 from alphagov/job-details-bug ... Fix for incorrect property name for service and template.	2016-02-08 10:51:01 +00:00
Adam Shimali	314689cc42	Merge pull request #58 from alphagov/send_verify_code_email_bug_fix ... Bug fixed for posting the correct type of notification to the aws queue.	2016-02-08 09:53:54 +00:00
Nicholas Staples	409857fba6	Now done.	2016-02-08 09:43:19 +00:00
Nicholas Staples	4ecdc9e420	Bug fixed for posting the correct type of notification to the aws queue.	2016-02-08 09:41:10 +00:00
Adam Shimali	23f4ce7255	Fix for incorrect property name for service and template.	2016-02-05 16:33:07 +00:00
NIcholas Staples	0f3bb23225	Merge pull request #56 from alphagov/all-job-details ... As job update is a PUT then all non nullable fields	2016-02-05 13:24:27 +00:00
Adam Shimali	e024db6858	As job update is a PUT then all non nullable fields ... need to be sent with update. Also bug in not committing update fixed.	2016-02-05 13:07:02 +00:00
Adam Shimali	bd88cf1e93	Merge pull request #55 from alphagov/update_queue_names ... Update queues with a prefix.	2016-02-05 11:24:45 +00:00
Nicholas Staples	cc5dad3744	Update queues with a prefix.	2016-02-05 11:12:59 +00:00
Rebecca Law	1d2b098cfe	Merge pull request #54 from alphagov/update-job-status ... Endpoint and dao method for updating job status.	2016-02-05 09:50:07 +00:00
Adam Shimali	bec4bbe04e	Endpoint and dao method for updating job status.	2016-02-04 20:55:09 +00:00
NIcholas Staples	c395069bb9	Merge pull request #53 from alphagov/more-job-properties ... Add more properties of job to job message.	2016-02-04 15:40:46 +00:00
Adam Shimali	aa57730fc9	Add more properties of job to job message.	2016-02-04 12:36:53 +00:00