darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 08:51:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
474 Commits 128 Branches 60 Tags
024e390c2f2825bd7fd68c6ac03b4d317039dc14
Commit Graph

207 Commits

Author SHA1 Message Date
Adam Shimali
883ad02c25 [WIP] added dao and rest endpoint for retrieving invited users 
by service and by id.
 2016-02-25 11:22:36 +00:00
Martyn Inglis
10a764a2c1 Renamed the header of the CSV to 'to' from 'number' to allow for email jobs 
- added new columns to Job and Notification to capture the start/end dates accurately
 2016-02-25 09:59:50 +00:00
Martyn Inglis
b3884e2d6c Move job processing into celery 
- brings boto S3 into new AWS folder
- CSV processing utils method

Rejigs the jobs rest endpoint - removes some now unused endpoints,

Calls to the task with the job, job processing in task, delegating SMS calls to the sms task
 2016-02-24 17:12:30 +00:00
NIcholas Staples
064fec5ad5 Merge pull request #95 from alphagov/get-users-for-service 
New endpoint to get users for service id.
 2016-02-24 14:29:39 +00:00
Adam Shimali
e6fe10cbdc [WIP] added endpoint and dao to create invites for users. 
Droped token as later code to send email invite can generate
timebased url to send to user. That can then be checked
against configurable time threshold for expiry. Therefore
no need to store a token.
 2016-02-24 14:18:56 +00:00
Martyn Inglis
1667f82df1 Removed some unused template dao methods 2016-02-24 11:51:02 +00:00
Martyn Inglis
6ac6a64b46 Tests for email job notifications endpoint 2016-02-24 11:44:11 +00:00
Martyn Inglis
8389976250 Use service ID, not from token to build notification 2016-02-24 11:11:02 +00:00
Rebecca Law
f1fdfbb308 Return empty list when there are no users for the service. 
Added a test for when there are no users for the service.
Added a test_url_for - do we want to add this test and use url_for in our tests?
Or explictly write the url in the test?
 2016-02-24 10:30:00 +00:00
Martyn Inglis
b0609b1813 More refactors 
- single base method to send notifications
- knows about service id (present if job based)
- knows about jobs - if needed
- knows about type

Does the right thing

Was lots of shared code around error checking now in one place.
 2016-02-24 09:55:05 +00:00
Martyn Inglis
0007c69972 Restored code to share sms creation logic between: 
- sms for API calls
- sms for Jobs
 2016-02-24 09:23:21 +00:00
Rebecca Law
12a2d8db0a New endpoint to get users for service id. 
/service/<service_id>/users returns a list of all users associated with the service
 2016-02-23 17:53:54 +00:00
Martyn Inglis
201c2d01ba Task is the same whether job based or not 
- use notification to build action
- notification has job
- based in encrypted blob
 2016-02-23 17:39:08 +00:00
Martyn Inglis
635debb5a6 Moved the sending sms for a job into celery tasks 2016-02-23 17:30:50 +00:00
NIcholas Staples
8de4ae5cf2 Merge pull request #91 from alphagov/send-email-from-templates 
Send Email via the API
 2016-02-23 13:18:45 +00:00
Adam Shimali
21e791b25c Add endpoint for getting user by email address 2016-02-23 11:03:59 +00:00
Martyn Inglis
b01782bbe6 Send Email via the API 
- uses the new subject/email from fields present on the templates / service tables
- brings the send email api call into line with the sms one.
- same fields (to/template_id)
- same rules regarding restricted services
- wired in as a task into celery

Requires
- new celery queue
- new env property (NOTIFY_EMAIL_DOMAIN)
 2016-02-22 17:17:29 +00:00
Adam Shimali
c36b64c91b Added notification count to jobs. 2016-02-22 14:57:33 +00:00
Martyn Inglis
dbe914f401 Changed error format on template subject duplication error 2016-02-22 14:32:41 +00:00
Martyn Inglis
b3b3cca65f Merge branch 'master' into email-templates-part-2 2016-02-22 14:04:01 +00:00
Martyn Inglis
530c8a2faa Fixed merge issues 2016-02-22 13:27:47 +00:00
Martyn Inglis
2c51535b7e Merge branch 'master' into email-templates 2016-02-22 13:12:41 +00:00
Martyn Inglis
886b206d63 Merge branch 'master' into email-templates 
Conflicts:
	app/user/rest.py
	tests/app/user/test_rest.py
 2016-02-22 13:12:24 +00:00
Nicholas Staples
c8bb96b883 Fixes added. 2016-02-22 13:02:09 +00:00
Martyn Inglis
9bb95a53ec Updates to template endpoints: 
- moved into templates rest class
- updated dao
- removed delete methods
- constraint on subject line
 2016-02-22 12:55:18 +00:00
Nicholas Staples
180caf3ce6 Merge with master 
.
 2016-02-22 11:07:37 +00:00
Martyn Inglis
443691402f Slight tiny up of templates_dao 
- 1 method per get query
- logic around create/update removed
 2016-02-22 09:46:16 +00:00
Martyn Inglis
cc720b137f Merge branch 'master' into email-templates 
Conflicts:
	app/user/rest.py
 2016-02-19 17:33:28 +00:00
Martyn Inglis
98314485d3 Generate the email_from from the service name. 2016-02-19 17:07:59 +00:00
Rebecca Law
04ca1bc00f Remove code_type 2016-02-19 16:06:45 +00:00
Martyn Inglis
dc294c32ae Fix all other dependant classes that are affected by the DAO / Service / Model changes 2016-02-19 15:54:11 +00:00
Martyn Inglis
1a136885c3 Update service rest class to handle new fields and updated dao 2016-02-19 15:53:45 +00:00
Martyn Inglis
5bfae689c2 Refactored the services dao to be a little cleaner 
- some things we don't need
	- bulk update of users
	- delete service

Now returns None if can't find an object
 2016-02-19 15:53:15 +00:00
Nicholas Staples
0396148853 Permissions added. 2016-02-19 14:47:45 +00:00
Rebecca Law
17d14f291e Refactor user/<user_id>/code into two endpoints. 
- Created new endpoint user/<user_id>/sms-code to send the sms verification code to the user.
- Create new endpoirtn user/<user_id>/email-code to send the email verifcation code to the user.
- Marked the old methods, schema, tests with a TODO to be deleted when the admin app is no longer sending messages to /user/<user_id>/code
- Added error handlers for DataError and NoResultFound. Data error catches invalid input errors.
- Added error handler for SqlAlchemyError which catches any other database errors.
- Removed the need for the try catches around the db calls in the user endpoints with the addition of the db error handlers.
- We may want to wrap db excpetions in the dao, if we want the No results found message to be more specific and say no result found for user.
 2016-02-19 11:37:35 +00:00
Rebecca Law
9ea2acfdae Use dashes in the celery queue names 2016-02-18 11:18:35 +00:00
minglis
9b99782662 Merge pull request #83 from alphagov/celery-send-email-code 
Celery send email code
 2016-02-18 11:03:23 +00:00
Rebecca Law
4d9d511575 Merge pull request #81 from alphagov/celery-send-sms-code 
Use Celery to send sms code
 2016-02-18 10:51:16 +00:00
Rebecca Law
aff948e9ca Merge branch 'celery-send-sms-code' into celery-send-email-code 
Conflicts:
	app/celery/tasks.py
	app/user/rest.py
	scripts/run_celery.sh
 2016-02-18 10:50:14 +00:00
Rebecca Law
3ce6758f3e Change names for clarity sake. 
Rename test.
What we do when the validation_code fails to send is still to be decided.
 2016-02-18 09:59:18 +00:00
Rebecca Law
c1df61a7d4 Use celery to send the email verification code. 2016-02-18 09:52:27 +00:00
Rebecca Law
9073814d9f I have an issue with the test, not sure why? 2016-02-17 17:48:23 +00:00
Adam Shimali
4f33b6f406 Wire up error handlers. 
Replace some 400s with more appropriate 500s.

DAO methods that cause unexpected exceptions get caught and
logged by errors.py 500 error handler.
 2016-02-17 17:04:50 +00:00
Rebecca Law
66cf6cfd30 Use Firetext client 2016-02-17 15:52:09 +00:00
Rebecca Law
7afa87c367 Merge branch 'master' into celery-send-sms-code 
Conflicts:
	tests/app/celery/test_tasks.py
 2016-02-17 15:43:57 +00:00
Rebecca Law
d022d036dc Celery task to send the sms verify code. 
Each celery task will use it's own queue.
 2016-02-17 15:41:33 +00:00
Martyn Inglis
837c9b7cdb Removed logging, and make fire text only client. 2016-02-17 13:59:01 +00:00
Martyn Inglis
e0e47b40fc Setup celery config 2016-02-17 10:22:25 +00:00
Martyn Inglis
85a8e6d2b4 Added moto back for methods not yet celery'd 2016-02-17 09:47:34 +00:00
Martyn Inglis
cb265896a7 Merge branch 'master' into move-sms-notifications-into-celery 
Conflicts:
	app/__init__.py
	tests/conftest.py
 2016-02-17 09:14:37 +00:00