Commit Graph

849 Commits

Author SHA1 Message Date
Nicholas Staples
bd898a4526 Upgrade and downgrade now works.
Fix bug with repeated upgrade and downgrade.

Fix script revision number.
2016-03-02 10:44:20 +00:00
Nicholas Staples
47c4368007 Merge with master. 2016-03-01 17:18:46 +00:00
Nicholas Staples
a2f021efad Fix git review. 2016-03-01 14:22:46 +00:00
Nicholas Staples
22f550dd34 Add missing file. 2016-03-01 11:45:54 +00:00
Nicholas Staples
8ad13b6356 Manage template permission added. All tests passing. 2016-02-29 15:21:35 +00:00
Adam Shimali
59aec1939c [WIP] invited user now has comma separated permission values
stored against it so that user can be created with correct
permissions.
2016-02-29 14:05:02 +00:00
Nicholas Staples
fa77d7d83e Add default permissions for existing services. 2016-02-29 12:59:38 +00:00
Nicholas Staples
16e1ecb134 Working permissions and all tests passing.
Remove print statements.

Fix for review comments.
2016-02-26 15:00:29 +00:00
Martyn Inglis
5bbd3aad39 Reorder sql files 2016-02-25 16:02:36 +00:00
Martyn Inglis
1be003cffb Moved missing migtations to end of run 2016-02-25 15:58:01 +00:00
Rebecca Law
ff6cad1acf Merge branch 'master' into service-not-found-returns-404
Conflicts:
	app/errors.py
2016-02-25 15:33:53 +00:00
Rebecca Law
42f2065920 Migration file to add unique constraint on user_to_service. 2016-02-25 15:16:00 +00:00
Martyn Inglis
34f2016b19 Reorder DB scripts after merge from master 2016-02-25 12:19:48 +00:00
Martyn Inglis
a3a9d673a6 Merge branch 'master' into celery-jobs 2016-02-25 12:06:53 +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
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
Adam Shimali
c02b304d1e Add model class and migration script for invited user. 2016-02-23 16:46:39 +00:00
Adam Shimali
a143b9492c Fix migration script for existing jobs 2016-02-22 15:51:38 +00:00
Adam Shimali
5d2a3bdc31 Fixed clashing migration file number 2016-02-22 15:02:01 +00:00
Adam Shimali
c36b64c91b Added notification count to jobs. 2016-02-22 14:57:33 +00:00
Martyn Inglis
b3b3cca65f Merge branch 'master' into email-templates-part-2 2016-02-22 14:04:01 +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
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
Martyn Inglis
f8ac14ea30 Update model
- adds email_from field to the service model
- adds subject_line to the template model

These are unique and not null fields, so there is a migration here for email_from to populate it.
2016-02-19 15:52:19 +00:00
Nicholas Staples
0396148853 Permissions added. 2016-02-19 14:47:45 +00:00
Adam Shimali
3a2cfc96e6 job on notification now nullable. 2016-02-10 11:08:24 +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
Adam Shimali
9978672ee7 Another migration fix 2016-02-02 17:22:24 +00:00
Adam Shimali
9a6f1ed1d7 Add default value for non nullable column 2016-02-02 16:55:08 +00:00
Adam Shimali
0ade39e63f Add job to queue as soon as it in created.
Added status to job.
2016-02-02 15:14:04 +00:00
Rebecca Law
b5c662eca8 Change services.id to a UUID
Ideally all the primary keys in the db would be UUID in order to guarantee unique ids across distributed dbs.
This updates the services.id to a UUID. All the tables with a foreign key to the services.id are also updated.
The endpoints no longer state a data type of the <service_id> path param.
All the tests are updated to reflect this update.

The thing to pay attention to is the 0011_uuid_service_id.py migration script.
This commit must go with a commit on the notifications_admin app to keep things working.
There will be a small outage until both deploys have happened.
2016-02-02 14:22:22 +00:00
Rebecca Law
42a4c8b0b1 Add sms notifications from a service to a queue. 2016-01-27 17:42:05 +00:00
Rebecca Law
daff1c3f53 Add queue name to service table.
Set queue name when creating the service
2016-01-27 14:18:11 +00:00
Nicholas Staples
209173551f Merge fix. 2016-01-22 14:52:07 +00:00
Nicholas Staples
11c7795396 Merged with master. 2016-01-22 14:46:03 +00:00
Nicholas Staples
6b035cd324 All tests working, second time around. 2016-01-21 17:29:24 +00:00
Rebecca Law
2486c17dc9 Add unique constraint for api_key on service_id and name 2016-01-21 16:53:53 +00:00
Rebecca Law
43d54b6ad3 Update the down revision to the version 0006 file. 2016-01-19 12:17:01 +00:00
Rebecca Law
4fc5c34320 Change Tokens to ApiKey
Added name to ApiKey model
2016-01-19 12:13:47 +00:00
Adam Shimali
f839bae1f5 Add rest of user model fields to api.
First step to moving user interactions to api.
2016-01-19 11:39:59 +00:00
Adam Shimali
f3b6769193 Add convenience fields to job to make processing
easier.
2016-01-16 10:14:48 +00:00
Adam Shimali
ef6d1008e5 Fix revision ID 2016-01-15 11:33:47 +00:00
Adam Shimali
b9f6db1856 Added model and dao for Jobs. 2016-01-15 11:12:05 +00:00
Rebecca Law
5e61515eb6 Fix the migration script so that the down revision is pointing to the migration scripts in the merge 2016-01-14 10:23:06 +00:00
Rebecca Law
4a692d555e Create a relationship between services and tokens 2016-01-14 10:19:22 +00:00
Rebecca Law
725b976d31 Created endpoints for create and delete token. 2016-01-14 10:17:36 +00:00
Nicholas Staples
dad0fff4ba Template rest api skeleton added. 2016-01-13 11:04:13 +00:00
Nicholas Staples
752a359d3d Added versions file for initial db and fixed tests. 2016-01-12 09:56:42 +00:00
Nicholas Staples
a327702ad0 Initial code added for models and services not functional yet. Bootstrap and migrations added for db. 2016-01-07 17:50:55 +00:00