Martyn Inglis
8dc7a86148
Merge branch 'master' into async-job-stats
...
Conflicts:
app/dao/services_dao.py
2017-05-18 09:34:54 +01:00
kentsanggds
7850781245
Merge pull request #961 from alphagov/ken-default-permissions-when-creating-service
...
Ken default permissions when creating service
2017-05-17 16:49:25 +01:00
Ken Tsang
e68c3900e8
Add restricted argument for service mock
2017-05-17 16:06:35 +01:00
Chris Hill-Scott
d33e19da28
Merge pull request #950 from alphagov/bump-utils-placeholder-contact
...
Output contact blocks with placeholders replaced
2017-05-17 14:43:13 +01:00
minglis
0b4f0b35d5
Merge pull request #960 from alphagov/fix-created-at-date
...
Fix created at date
2017-05-17 14:24:17 +01:00
Ken Tsang
edff192efc
Remove whitespace
2017-05-17 14:18:12 +01:00
Ken Tsang
54446d5f4d
Add default permissions when creating a service
2017-05-17 14:18:12 +01:00
Martyn Inglis
ee5bb5f01a
Fixed issues caused by single evaluation of method signature defaults
2017-05-17 13:27:05 +01:00
Martyn Inglis
09f45332eb
Fixed issues caused by single evaluation of method signature defaults
2017-05-17 13:25:40 +01:00
minglis
05a179c6ef
Merge pull request #941 from alphagov/load-service-on-auth
...
Load service on auth
2017-05-17 10:49:00 +01:00
Martyn Inglis
83a1b1526e
Merge branch 'master' into async-job-stats
...
Conflicts:
app/notifications/notifications_ses_callback.py
2017-05-17 09:49:43 +01:00
kentsanggds
c4964d8cf4
Merge pull request #956 from alphagov/add-service-permissions
...
Add service permissions DAO and refactor user service permission mock
2017-05-16 14:26:15 +01:00
Martyn Inglis
d2a7a7b3c9
Fixed error in code
2017-05-16 13:55:32 +01:00
Ken Tsang
3602431c2a
Renamed test and refactored fixtures
2017-05-16 13:41:54 +01:00
Martyn Inglis
1dc3970595
Code tidy up as be @imdad comments.
2017-05-16 12:55:12 +01:00
Ken Tsang
2a48891025
Removed unused pytest from test
2017-05-16 12:54:32 +01:00
Ken Tsang
b233ae46f3
Tidy up test code for service permissions
2017-05-16 12:53:46 +01:00
Martyn Inglis
a5dae0bebd
Fixed test - I had deliberately failed the test as part of debugging and not fixed the assert. Doh.
2017-05-16 12:49:20 +01:00
Ken Tsang
733c16b2bb
Update to strip down DAO and clarify tests
2017-05-16 12:33:27 +01:00
Imdad Ahad
0f0afab372
Merge pull request #958 from alphagov/imdad-fix-sns-plaintext-header-json
...
Force parse JSON received from SNS
2017-05-16 11:39:26 +01:00
Martyn Inglis
d1aff5bb6e
Complex test to check updating one type of notification job, doesn't update the other
...
- so if we timeout both SMS and Email the counts are correct
2017-05-16 11:36:52 +01:00
Ken Tsang
54d801979c
Refactored to handle single service permission
2017-05-16 10:57:57 +01:00
Imdad Ahad
e6db9ffc1b
Force parse JSON received from SNS:
...
* An SNS callback containing JSON has a plaintext header set. Using
* request.get_json() will return None if the header is not
* application/json unless the force parameter is set to True
2017-05-16 10:29:27 +01:00
Imdad Ahad
98aeb9f9da
Merge pull request #951 from alphagov/imdad-feat-auto-send-email-live-service
...
Send a welcome email to newly live services
2017-05-15 17:39:38 +01:00
Ken Tsang
114d4d84d4
Add service permissions DAO and refactor user service permission mock
2017-05-15 17:28:14 +01:00
Imdad Ahad
54cedf39e7
Merge pull request #954 from alphagov/imdad-feat-process-dvla-sns-callback
...
Add callback to process DVLA response file
2017-05-15 16:23:43 +01:00
Imdad Ahad
aa5f8ba443
Refactor tests for clarity
2017-05-15 15:02:16 +01:00
Imdad Ahad
d993e1a43e
Don't send notification if other service attrs changed
2017-05-15 15:02:01 +01:00
kentsanggds
8eeb40b2c8
Merge pull request #955 from alphagov/add-service-permission-db-model
...
Add service permissions model + migration script
2017-05-15 13:56:45 +01:00
Ken Tsang
380bc22f22
Add relationship for service in ServicePermission
2017-05-15 13:44:52 +01:00
Ken Tsang
359c4d2138
add service permissions model + migration script
2017-05-15 12:52:28 +01:00
Imdad Ahad
4003edfa67
Add DVLA callback:
...
* Process SNS callback, trigger the update notifications celery task
* Put autoconfirm into its own method and use in callbacks
2017-05-15 11:12:31 +01:00
Imdad Ahad
ee484ec368
Add get_s3_file method for use in DVLA processing
2017-05-15 10:48:37 +01:00
Imdad Ahad
cd85550889
Merge pull request #953 from alphagov/revert-939-imdad-feat-process-dvla-sns-callback
...
Revert "Process SNS request triggered by a DVLA S3 update"
2017-05-12 17:23:00 +01:00
Imdad Ahad
7a10a91262
Revert "Process SNS request triggered by a DVLA S3 update"
2017-05-12 17:21:07 +01:00
Imdad Ahad
c1e41e7dc8
Merge pull request #939 from alphagov/imdad-feat-process-dvla-sns-callback
...
Process SNS request triggered by a DVLA S3 update
2017-05-12 16:37:39 +01:00
Martyn Inglis
fd542024a3
Merge branch 'master' into load-service-on-auth
2017-05-12 16:14:44 +01:00
Martyn Inglis
8936b63dcc
Removed redis from API requirements - it's pulled in by the utils.
2017-05-12 16:11:01 +01:00
Martyn Inglis
f4020aec05
these three tests replicate some testing that is done in the client tests themselves.
2017-05-12 16:10:21 +01:00
Martyn Inglis
8ac821fcc4
Fixed import paths
2017-05-12 16:10:00 +01:00
Imdad Ahad
0f7093fc38
Refactor and add filename in logging
2017-05-12 14:32:01 +01:00
Imdad Ahad
95aa5680f9
Add more logging in update letter notifications task
2017-05-12 14:24:27 +01:00
Imdad Ahad
4d82512ec6
Update SES callback to use autconfirm method
2017-05-12 14:24:27 +01:00
Imdad Ahad
37165e5b6a
Add autoconfirm sns in dvla callback
2017-05-12 14:24:27 +01:00
Imdad Ahad
8a5e82904e
Update to pull from correct bucket and fix tests not mocking out correctly
2017-05-12 14:24:26 +01:00
Imdad Ahad
20bb91bfdd
Update DVLA callback to process request and call task (if it can)
2017-05-12 14:24:26 +01:00
Imdad Ahad
f766f90207
Add task to process a DVLA response file:
...
* Currently we do nothing with the parsed response. We will
* update the status of the notifications in a separate PR
2017-05-12 14:24:26 +01:00
Imdad Ahad
5eb02a45a5
Send go live email when service goes live
2017-05-12 14:07:06 +01:00
Imdad Ahad
570d0ec9db
Send notification to active service users with user fields (optional)
2017-05-12 14:06:29 +01:00
Martyn Inglis
835dcc6273
Not null job_id and rebuilt the migration script to include this
2017-05-12 13:18:12 +01:00
