Chris Hill-Scott
d28775800c
Merge pull request #519 from alphagov/update-utils
...
Bring in changes to template and CSV processing
2016-07-07 16:32:56 +01:00
Chris Hill-Scott
9f3bf763e9
Merge pull request #515 from alphagov/pip-accel
...
add pip-accel to travis to speed up builds
2016-07-07 16:32:50 +01:00
Chris Hill-Scott
a09333a678
Merge pull request #514 from alphagov/rates
...
mmg rates set to 1.65p
2016-07-07 16:32:45 +01:00
Chris Hill-Scott
824085ead8
Bring in changes to template and CSV processing
...
Functional changes:
- adds the blue bar
Performance changes
- faster CSV processing
Depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/47
- [ ] https://github.com/alphagov/notifications-utils/pull/48
Also brings in some breaking changes, which do not affect utils (apart
from a weird import).
2016-07-07 15:44:30 +01:00
Rebecca Law
638ea1b12b
Set the start date for the new rate as July 1
2016-07-07 14:31:50 +01:00
Rebecca Law
3e6a59ad46
Merge pull request #516 from alphagov/fix-counts
...
Fix update script
2016-07-06 16:54:07 +01:00
Rebecca Law
fac5727ad7
Fix update script
2016-07-06 16:42:49 +01:00
Leo Hemsted
a39552f81f
add pip-accel to travis to cache builds better
2016-07-06 16:12:23 +01:00
Leo Hemsted
2b7972dc1d
mmg rates set to 1.65p
...
note this db value not actually used in app yet
2016-07-06 16:02:10 +01:00
Rebecca Law
f58ee7a8f8
Merge pull request #512 from alphagov/fix-count
...
Fix bug where all notifications were getting a type = email.
2016-07-06 15:17:09 +01:00
Rebecca Law
16eb20371f
Fix import
2016-07-06 15:07:09 +01:00
Rebecca Law
764bfc6203
Fix file name for migration script
2016-07-06 14:46:46 +01:00
Rebecca Law
a1209ed9a4
Merge branch 'master' into fix-count
2016-07-06 14:45:10 +01:00
Rebecca Law
8bea8b6a8f
Fix bug where all notifications were getting a type = email.
...
Includes a fix to notification and notification_statistics data.
2016-07-06 14:31:52 +01:00
Leo Hemsted
447086d065
Merge pull request #510 from alphagov/test-api-keys
...
Test api keys
2016-07-06 14:12:07 +01:00
Leo Hemsted
96513442fe
notifications from test api keys dont send for real - a la research_mode
...
also added a bunch more tests around api keys to help ensure we're behaving in at least a consistent way
2016-07-05 16:29:53 +01:00
Leo Hemsted
eee98e3e52
move callback tests into separate file
...
also fix syntax errors
2016-07-05 16:20:03 +01:00
Leo Hemsted
011afa4b16
make tests parametrized for all three key types
2016-07-05 16:20:02 +01:00
Leo Hemsted
a5e488c035
add test api key type
2016-07-05 16:20:02 +01:00
Leo Hemsted
c46622993b
Merge pull request #507 from alphagov/reply-to-nondestructive-part-b
...
remove reply_to_addresses from task kwargs
2016-07-05 15:17:51 +01:00
Leo Hemsted
242be97bfa
remove reply_to_addresses from task kwargs
...
also added a test for aws_ses.send_email to prove it handles reply_to_address correctly
2016-07-04 17:29:41 +01:00
Leo Hemsted
e5b417305f
Merge pull request #504 from alphagov/reply-to-nondestructive-part-a
...
dont pass reply-to-addresses about
2016-07-04 16:24:27 +01:00
Leo Hemsted
f5e14f043d
dont pass reply-to-addresses about
...
dont send reply_to_addresses around from process_job and send_email -
take it from the service in send_email_to_provider. also clean up
the kwarg in aws_ses.send_email to more accurately reflect what we
might pass in
2016-07-04 15:04:43 +01:00
Adam Shimali
8dafab952e
Merge pull request #501 from alphagov/fix-alembic-clash
...
Fix alembic clash.
2016-07-04 10:50:11 +01:00
Adam Shimali
1f4fc77a1e
Fix alembic clash.
2016-07-04 10:45:56 +01:00
Adam Shimali
19f2ccb594
Merge pull request #498 from alphagov/set-sms-sender-api
...
Set sms sender on service
2016-07-04 10:32:04 +01:00
Leo Hemsted
0b9ccd1acc
Merge pull request #496 from alphagov/notifications-get-api-key-filter
...
filter GET /notifications by api type
2016-07-04 09:53:53 +01:00
Leo Hemsted
4e2a14ed28
Merge branch 'master' into notifications-get-api-key-filter
2016-07-01 17:12:03 +01:00
Adam Shimali
b32f0ab2cd
Resolve conflicts
2016-07-01 16:53:12 +01:00
Rebecca Law
2a904b5ff7
Merge pull request #497 from alphagov/split-send_email-task
...
Split send email task
2016-07-01 16:47:03 +01:00
Leo Hemsted
f992240192
make notification.key_type not nullable
...
set to 'normal' for all existing notifications, and all job notifications also created as 'normal' - so if your eg reporting service hits notify, it gets notifications created from both API calls and front-end csv jobs.
2016-07-01 16:36:11 +01:00
Adam Shimali
c29dd23702
Add sms sender to service to be used in sms templates
...
in place of default numeric short code.
If not present default short code is used.
2016-07-01 15:27:54 +01:00
Rebecca Law
4a321497fc
Remove print
2016-07-01 15:03:28 +01:00
Rebecca Law
3aff22cf87
Improve the logging message
2016-07-01 14:42:40 +01:00
Leo Hemsted
2cf1d22748
add filters to GET /notifications endpoints to only return for provided key_type
...
if api_key used to access endpoint is type team, endpoints only return that type -
will 404 if you provide a different ID. Same applies for normal (normal api keys
cannot see team notifications)
also, for convenience, set sample_notification to supply key_type of KEY_TYPE_NORMAL
by default
2016-07-01 14:35:02 +01:00
Leo Hemsted
01419e7894
store api_key_id and key_type on notification
...
pass through from POST /notification/<type> to the celery task
also removed a couple of asserts that can fail (based on unfrozen time comparisons)
2016-07-01 14:35:02 +01:00
Leo Hemsted
5ae7ed1acb
only send to team emails/phones if POST /notificaiton/<type> with team api_key
...
uses same restriction as a service in trial mode
2016-07-01 14:33:25 +01:00
Rebecca Law
f52755742c
Split send_email task into one task to create the notification and one to send it to the provider.
...
Is there is an exception the task will go to the retry queue.
2016-07-01 14:14:28 +01:00
Chris Hill-Scott
5e0033e36d
Merge pull request #488 from alphagov/email-breathing-room
...
Add breathing room around GOV.UK logo in emails
2016-07-01 13:50:08 +01:00
Leo Hemsted
11093530f9
Merge pull request #485 from alphagov/api_user-cleanup
...
Api user cleanup
2016-07-01 10:58:18 +01:00
Rebecca Law
d5382120ad
Merge pull request #489 from alphagov/use_type_from_model
...
Use type from model
2016-07-01 10:40:04 +01:00
Rebecca Law
3f11447bc8
A small refactor to use the SMS_TYPE and EMAIL_TYPE in code rather that 'sms' or 'email'
2016-06-30 15:41:51 +01:00
Chris Hill-Scott
0358bdfe05
Add breathing room around GOV.UK logo in emails
...
Implements and depends on:
- [ ] https://github.com/alphagov/notifications-utils/pull/44
2016-06-30 15:27:21 +01:00
Chris Hill-Scott
a26d2a2551
Merge pull request #482 from alphagov/swagger-spike
...
Publish a Swagger specification
2016-06-30 13:41:33 +01:00
Leo Hemsted
3838715077
refactored the requires_auth handler to raise exceptions
...
hopefully cleans up code flow and readability [a tiny bit].
raise an AuthException in auth.py, and catch it in errors.py to
save on returning error_repsonse values throughout the function
2016-06-30 10:44:21 +01:00
Leo Hemsted
39519e3f36
attach api_key to app
...
we previously attached the service id and the key's secret
also more refactoring of auth.py
2016-06-30 10:44:21 +01:00
Leo Hemsted
adbe02783d
refactor authentication code
...
moved api_key secret manipulation (generating and getting) into
authentiation/utils, and added a property on the model, to facilitate
easier matching of authenticated requests and the api keys they used
2016-06-30 10:44:21 +01:00
Leo Hemsted
18b30de452
fix calling init_app twice
...
this was causing flask decorators like auth check to be mounted twice
2016-06-30 10:44:21 +01:00
Leo Hemsted
2b645f490a
move get_all_notifications_for_service and get_all_notifications_for_job
...
moved from notifications/rest -> service/rest and job/rest respectively
endpoint routes not affected
removed requires_admin decorator - that should be set by nginx config
as opposed to python code
2016-06-30 10:44:21 +01:00
Rebecca Law
848858f4e4
Merge pull request #481 from alphagov/add-notification-type
...
Add notification type
2016-06-29 13:27:03 +01:00
