Leo Hemsted
6fe54e220b
Merge branch 'master' into pyup-update-marshmallow-2.14.0-to-2.15.0
2017-12-06 15:36:29 +00:00
Leo Hemsted
093fe5dd8e
Merge pull request #1467 from alphagov/pyup-update-awscli-1.14.2-to-1.14.4
...
Update awscli to 1.14.4
2017-12-06 15:36:20 +00:00
Leo Hemsted
c69d7be732
Merge branch 'master' into pyup-update-awscli-1.14.2-to-1.14.4
2017-12-06 15:17:03 +00:00
Leo Hemsted
8c170d859e
Merge pull request #1457 from alphagov/bye-bye-free-fragments
...
Bye bye free fragments
2017-12-06 15:16:50 +00:00
Leo Hemsted
f29e08c778
don't update current year twice
2017-12-06 14:45:44 +00:00
Leo Hemsted
78099de776
make sure POST /free-sms-fragment-limit always creates
...
refactored billing/rest.py and annual_billing_dao.py to remove logic
from the dao, and simplify the process around creating new rows. Make
sure that the POST always creates (it previously wouldn't create rows
for years that don't already exist). Clean up some tests that were
doing too much set-up/data verification via rest calls rather than
directly inserting test data in to the DB.
2017-12-06 14:45:44 +00:00
Leo Hemsted
4cdcc4e035
no longer add an annual billing entry creating a service
...
this is now handled by a separate call from the admin app
2017-12-06 14:45:44 +00:00
Leo Hemsted
8cd422ebea
remove unnecessary None from .get
2017-12-06 14:45:43 +00:00
Leo Hemsted
a4e2a40134
update dao tests to pass in free sms fragment limit, remove command
2017-12-06 14:45:43 +00:00
Leo Hemsted
664187f878
update model to reflect service.prefix_sms not being nullable
2017-12-06 14:45:43 +00:00
Leo Hemsted
b0d4044ff5
remove free_sms_fragment_limit from service
...
* remove from model
* still required when calling POST /service - we just call through
from dao_create_service to add a new annual billing entry.
* removed from POST /service/<id> update_service - if you want to
update/add a new one, use POST /service/<id>/free-sms-fragment-limit
* made sure tests create services with default 250k limit.
2017-12-06 14:45:43 +00:00
Pete Herlihy
f0ba491d04
Merge pull request #1428 from alphagov/new-dwp-letter-orgs
...
Add a new organisation for letter branding
2017-12-06 14:22:35 +00:00
Pete Herlihy
aeb3b44a98
Merge branch 'master' into new-dwp-letter-orgs
2017-12-06 13:37:39 +00:00
Richard Chapman
739f484361
Merge branch 'master' into pyup-update-marshmallow-2.14.0-to-2.15.0
2017-12-06 11:02:44 +00:00
Richard Chapman
4f1cb0eb4d
Merge pull request #1469 from alphagov/rc_performance_testing_updates_staging
...
Revert changes to staging for performance tests and increased rate limit
2017-12-06 10:21:57 +00:00
Rebecca Law
bc1f9cf6aa
Merge branch 'master' into new-dwp-letter-orgs
2017-12-06 10:18:28 +00:00
Richard Chapman
af1ab437be
Revert changes to staging for performance tests and increased rate limit
...
- Reverted the Gunicorn worker number to 5 (this should be investigated
further on a well baselined system to compare)
- Enabled REDIS
- Increased the rate limit to 400 req/sec as using early testing
yesterday 450+ was being achieved
2017-12-06 09:38:31 +00:00
pyup-bot
0d12b06667
Update awscli from 1.14.2 to 1.14.4
2017-12-05 23:50:00 +00:00
kentsanggds
e85b4b6ea3
Merge pull request #1462 from alphagov/ken-add-letters-pdf-s3-bucket
...
Add letters pdf s3 bucket
2017-12-05 16:19:17 +00:00
Ken Tsang
7b390e74c4
Upper case the filename to meet requirements
2017-12-05 16:03:08 +00:00
kentsanggds
30d66c3d62
Merge branch 'master' into ken-add-letters-pdf-s3-bucket
2017-12-05 15:29:28 +00:00
Venus Bailey
6e90993371
Merge pull request #1459 from alphagov/vb-callback-receipt-1
...
Send delivery status back to services for email, letter and sms
2017-12-05 15:17:13 +00:00
venusbb
549913889e
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-callback-receipt-1
2017-12-05 13:57:54 +00:00
venusbb
20b306bfdb
added more unit tests
2017-12-05 13:57:46 +00:00
Chris Hill-Scott
64f13a0064
Add a new organisation for letter branding
2017-12-05 13:56:13 +00:00
Sakis
9260d35208
Merge pull request #1465 from alphagov/less-complaining
...
Touch log files in the initialization
2017-12-05 13:54:56 +00:00
Athanasios Voutsadakis
444876222e
Touch log files in the initialization
...
The logs agent would complain for the missing gunicorn error log file.
2017-12-05 13:36:45 +00:00
venusbb
185155a521
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-callback-receipt-1
2017-12-05 12:04:18 +00:00
Rebecca Law
d3cc443d1e
Merge pull request #1464 from alphagov/add-crown-column-to-services
...
Add crown column to services
2017-12-05 12:02:41 +00:00
venusbb
81ead8b246
code style fix
2017-12-05 11:23:21 +00:00
Rebecca Law
956907c170
Revert the last commit. It was intended for another branch.
2017-12-05 10:54:55 +00:00
venusbb
1c1cdbdf7c
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-callback-receipt-1
2017-12-05 10:49:05 +00:00
Rebecca Law
06a6d37595
Merge branch 'master' into add-crown-column-to-services
2017-12-05 10:28:26 +00:00
Rebecca Law
b4a1d635f7
Rebuild the letter_rates table to include everything it needs.
...
The current letter_rates table is not used so it is ok to drop and re-create it
2017-12-05 10:27:29 +00:00
venusbb
5482ee4fe7
- wrap apply_async parameter notification_id in a str() argument
...
- check if service_callback_api exist before putting tasks on queue
- create_service_callback_api in tests before asserting if send_delivery_status_to_service has been called.
2017-12-04 17:58:38 +00:00
Ken Tsang
aa39f47d8e
Added letters pdf S3 upload function
...
- uses s3upload from notifications_utils which will create an s3 bucket if it doesn't already exist
2017-12-04 16:48:38 +00:00
Ken Tsang
d62b350fcb
Add config for letters pdf s3 bucket different environments
2017-12-04 16:29:04 +00:00
Sakis
b93421208b
Merge pull request #1437 from alphagov/enable-proxy-header-live
...
Enable proxy header check on live
2017-12-04 16:21:58 +00:00
Athanasios Voutsadakis
c2228bb7d2
Enable proxy header check on live
2017-12-04 16:14:30 +00:00
Rebecca Law
7fa4e7ffc7
Set crown if organisation_type is updated on service.
...
Add some tests.
Update the initial values of crown.
2017-12-04 16:07:26 +00:00
Richard Chapman
3976f7b435
Merge pull request #1461 from alphagov/redis-for-real
...
don't hit the query to get daily msg stats if redis is disabled
2017-12-04 14:51:56 +00:00
Leo Hemsted
5bb6b68e57
fix tests that expect to be rate limited (which is off if redis is disabled)
2017-12-04 14:13:43 +00:00
Katie Smith
f73319f5ef
Add and populate crown column to services and services_history
...
- Added the boolean 'crown' column to services and services_history tables
- We populate this column in the same migration script by checking the
'organisation_type' of a service
2017-12-04 13:31:08 +00:00
Leo Hemsted
88c878c83e
don't hit the query to get daily msg stats if redis is disabled
2017-12-04 11:12:26 +00:00
kentsanggds
3ba7e8abd9
Merge pull request #1455 from alphagov/ken-add-letters_as_pdf-permission
...
Add letters_as_pdf service permission
2017-12-04 10:30:49 +00:00
Richard Chapman
c63cb6572b
Merge pull request #1453 from alphagov/pyup-update-awscli-1.14.1-to-1.14.2
...
Update awscli to 1.14.2
2017-12-04 09:29:54 +00:00
Richard Chapman
12665912ca
Merge pull request #1456 from alphagov/rc_performance_testing_updates_staging
...
Disable Redis for Staging added statsd for post methods
2017-12-04 09:26:22 +00:00
pyup-bot
47d18a8b82
Update marshmallow from 2.14.0 to 2.15.0
2017-12-02 23:18:50 +00:00
venusbb
771ce9e2bc
fixed code style
2017-12-01 22:24:53 +00:00
venusbb
f5a0ca9184
Added delivery status to services for letter callbacks
2017-12-01 21:59:46 +00:00
