Ken Tsang
9784ee438a
Refactored code in tasks.py
2017-12-12 12:07:55 +00:00
Ken Tsang
6b118ec1ef
Add create-letters-pdf queue name
2017-12-12 12:07:55 +00:00
Ken Tsang
bad129c5e9
Add extra logging for upload_letters_pdf
2017-12-12 12:07:55 +00:00
Ken Tsang
16136317f9
Add letters pdf task
2017-12-12 12:07:55 +00:00
Ken Tsang
c8a434fe98
Updated config for template preview env vars
2017-12-12 12:07:55 +00:00
Rebecca Law
a26588decd
Update the json in the service callback task to read completed_at rather than updated_at
2017-12-11 17:14:36 +00:00
Rebecca Law
0e93e98c6a
Merge branch 'master' into fix-service-history
2017-12-08 15:03:07 +00:00
Rebecca Law
624acf9ffe
Removed the events data for the service/{id}/history page. It does not make sense there.
2017-12-08 15:01:19 +00:00
venusbb
46226a25b4
modified dao_timeout_notifications
...
added send delivery status in scheduled timeout sending email/sms tasks
2017-12-07 16:44:08 +00:00
Ken Tsang
68659bab1b
Fixed processing of incomplete letter jobs
...
- `template` argument passed in to `job_complete` should be `template.template_type` otherwise the job status is incorrectly set
2017-12-07 12:03:16 +00:00
Rebecca Law
ad060435ca
Merge branch 'master' into refactor-letter-rates
2017-12-06 17:25:39 +00:00
Rebecca Law
14be85160c
Insert initial letter rates.
...
Create letter rates dao.
Query to fetch letter rates.
2017-12-06 16:40:38 +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
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
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
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
91e6cb9215
Merge branch 'master' into refactor-letter-rates
2017-12-05 12:03:13 +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
00d2e543dc
Refactor letter_rates table to include everything needed to calculate billing for letter notificaitons.
...
It is ok to drop the existing tables as they are not used anywhere as of yet.
2017-12-05 10:32:19 +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
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
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
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
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
venusbb
096657799c
Added send delivery status to SES callbacks
2017-12-01 21:13:01 +00:00
venusbb
a604fb82bb
added sms delivery status callback
2017-12-01 21:11:56 +00:00
Ken Tsang
907a9d62a1
Add letters_as_pdf service permission
2017-12-01 17:25:20 +00:00
Alexey Bezhan
1bcca032c2
Merge pull request #1424 from alphagov/create-history-using-init-kwargs
...
Use model constructors when creating history instances
2017-12-01 16:42:29 +00:00
venusbb
489f43a2c9
rename callback_tasks.py to process_ses_receipts.py
...
create service_callback_tasks.py for tasks to send delivery statuses to services
2017-12-01 16:15:21 +00:00
Richard Chapman
344e5c1f5d
dded statsd to the endpoint and removed it from a letters only method
...
as we are not interested int he letters performance at the moment.
2017-12-01 15:46:31 +00:00
Richard Chapman
5f25d3162a
Disable Redis for Staging added statsd for post methods
...
- Disable Redis as there is a current connection limit of 256 which
could slow down the request if they are all used
- Added statd to methods in the post to help spot any bottlenecks
2017-12-01 15:41:53 +00:00
venusbb
ad861f2d55
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-receipt-callback-dao
2017-12-01 14:36:25 +00:00
venusbb
988b22391b
added send_delivery_status_to_service task worker
2017-12-01 14:06:13 +00:00