Commit Graph

6328 Commits

Author SHA1 Message Date
Katie Smith
84c35cbf67 Add request_to_go_live_notes column to Organisation table
This column will be used to stores extra notes that should go in the
Zendesk ticket when a service belonging to that organisation requests to
go live.
2019-05-13 14:45:01 +01:00
Pea (Malgorzata Tyczynska)
a5ae77f5e0 Merge pull request #2499 from alphagov/precompiled_for_everyone_migration
Precompiled for everyone migration
2019-05-13 14:28:06 +01:00
Pea (Malgorzata Tyczynska)
c18bc9afe2 Merge pull request #2497 from alphagov/precompiled_for_everyone
Don't require precompiled_letter service permission
2019-05-13 13:16:13 +01:00
Pea Tyczynska
150e14de96 remove precompiled_letter permission from the database 2019-05-13 13:05:34 +01:00
Pea Tyczynska
eec5f5490d Don't require precompiled_letter service permission
Everyone can send precompiled letters now yay
2019-05-13 13:04:29 +01:00
Leo Hemsted
f54c27479f Merge pull request #2495 from alphagov/pyup-scheduled-update-2019-05-08
Scheduled weekly dependency update for week 18
2019-05-09 11:40:44 +01:00
Leo Hemsted
a46394f997 freeze-requirements 2019-05-09 10:55:41 +01:00
pyup-bot
96d4518fe5 Update marshmallow-sqlalchemy from 0.16.2 to 0.16.3 2019-05-08 14:00:10 +01:00
pyup-bot
5be92a159f Update flask-marshmallow from 0.10.0 to 0.10.1 2019-05-08 14:00:05 +01:00
Rebecca Law
0eb23a8e1f Merge pull request #2494 from alphagov/revert-2469-stub-staging-sms-providers
Revert "Stub out SMS providers on staging for the perf tests"
2019-05-08 13:31:59 +01:00
Rebecca Law
57a3c71063 Merge pull request #2492 from alphagov/fix-billable-units
Fix billable units
2019-05-08 13:17:11 +01:00
Katie Smith
8ced4b70c5 Merge pull request #2493 from alphagov/always-set-billable-units
Ensure notifications have billable units and provider set if sending fails
2019-05-08 11:56:39 +01:00
Katie Smith
ce24b13654 Combine two tests into one 2019-05-08 11:39:01 +01:00
Katie Smith
c809bf2207 Ensure notifications have billable units and provider if sending fails
If we try to send an SMS to the provider and the provider throws an exception
(because they return a 503 status code) the notification should retry. But if
we get the callback from the provider before the notification has been retried, the
notification will have no billable units or provider set.

To avoid this, we now set billable_units and provider even if there has been
an exception from our provider.
2019-05-08 10:54:01 +01:00
Rebecca Law
3a421a0642 Added commit 2019-05-07 16:47:43 +01:00
Rebecca Law
439b11d9c2 Oops! I need notification_type and what not. 2019-05-07 16:46:09 +01:00
Rebecca Law
ef2bbbe683 Fix billable units
There was a situation where the SMS was sent, the request timed out we got a 503 so the notification was put on the retry queue. However, the provider got the notification and sent the message. This means we didn't set the billable_units on the notification and the service will not be billed.
This PR is to fix the notifications that we can accurrately update.
2019-05-07 16:31:12 +01:00
Leo Hemsted
fda3f4b41a Revert "Stub out SMS providers on staging for the perf tests" 2019-05-07 15:32:35 +01:00
Pea (Malgorzata Tyczynska)
a4ae5a0a90 Merge pull request #2486 from alphagov/delivery-worker-split
Change distribution of queues among notify delivery workers
2019-05-07 11:36:15 +01:00
Katie Smith
df1855f08e Merge pull request #2484 from alphagov/show-sms-provider-traffic
Change get_providers endpoint to return no of SMS sent by each provider
2019-05-07 09:56:24 +01:00
Katie Smith
cf7997d925 Change get_providers endpoint to return no of SMS sent by each provider
In addition to the existing provider data, we also want return the number of
billable units (muliplied by the rate multiplier) that each SMS provider sent
this month. This will be used on the platform admin providers page.

Since we can no longer get all the information we need from the provider details
schema, this makes a new DAO function to get all the data for the endpoint.
2019-05-07 08:31:04 +01:00
Pea (Malgorzata Tyczynska)
26502a91f9 Merge pull request #2490 from alphagov/live_services_organisation_type
Add organisation type to live services report
2019-05-03 15:19:44 +01:00
Pea Tyczynska
689ff57c32 Add organisation type to live services report 2019-05-03 15:09:54 +01:00
Rebecca Law
b89ab0cd87 Merge pull request #2487 from alphagov/dont-update-notification-history-in-realtime
Insert/update NotificationHistory just before we delete from Notifications
2019-05-02 13:57:41 +01:00
Rebecca Law
d5d2b3d2a6 Update insert to use select_from - this allows the insert query to run as a single bulk insert and should be more efficient. 2019-05-02 13:46:15 +01:00
Pea (Malgorzata Tyczynska)
75b484abf0 Merge pull request #2488 from alphagov/only_show_live_services
Only show live services in live services query
2019-05-02 11:26:10 +01:00
Pea Tyczynska
e7add1c729 Only show live services in live services query 2019-05-02 11:15:53 +01:00
Pea (Malgorzata Tyczynska)
b280181a00 Merge pull request #2483 from alphagov/serialize-sent-stats
Add get_live_services_data endpoint and related query
2019-05-01 16:10:25 +01:00
Pea Tyczynska
83f39730d0 Order results by live date ascending order 2019-05-01 15:58:08 +01:00
Pea Tyczynska
382d1de857 Only count_as_live services
Add comments to live services dao test for context
2019-05-01 15:57:59 +01:00
Pea Tyczynska
c15d7878fc Only include ft_billing data for current financial year
Test get_live_services_data endpoint

Expand dao_fetch_live_services_data test with more ft_billing records
2019-05-01 15:57:45 +01:00
Pea Tyczynska
669db0b4ca New db query that returns data about live services
This data includes service and org name, consent to research,
contact details and both intended and factual notifications
volumes by notification type.

This query was created to get data for a csv report for our
platform admins.
2019-05-01 15:57:20 +01:00
Rebecca Law
c9265aab68 Don't do anything if the query doesn't yield results. 2019-05-01 15:07:59 +01:00
Pea Tyczynska
b59bca0fc2 Rename workers so they are less wordy xd 2019-05-01 14:51:43 +01:00
Rebecca Law
0def0b7fd0 We want to staop inserting and updating NotificationHistory each time we insert/update Notification.
This PR adds a function to upsert (insert or update if exists) NotificationHistory all the rows from Notification that we are about to delete in the nightly task. This will happen just before the delete function. Since it is a upsert query the function can be called more than once.
This should allow us remove all the insert/updates to NotificationHistory.

However, there is a consern that this will double the length of time the tasks take. So do we do these upserts in a separate task or in the same one?
2019-05-01 14:26:11 +01:00
Leo Hemsted
0b0a7cc57c Merge pull request #2464 from alphagov/unpin-runtime
unpin patch version of python
2019-04-30 15:14:04 +01:00
Sakis
bc058e9cb5 Merge pull request #2473 from alphagov/ensure-correct-cf-target
Explicitly target the right space before deploying
2019-04-30 14:34:17 +01:00
Pea Tyczynska
39d521cfc0 Update instructions about creating a new worker app in the README 2019-04-30 12:07:42 +01:00
Pea Tyczynska
6163ca8b45 Change distribution of queues among notify delivery workers
This is so that retry-tasks queue, which can have quite a lot of
load, has its own worker, and other queues are paired with queues
that flow similarly:
- letter-tasks with create-letters-pdf-tasks
- job-tasks with database-tasks
2019-04-30 12:03:06 +01:00
Katie Smith
6de67411df Merge pull request #2485 from alphagov/pin-pytest-xdist
Make pyup ignore pytest-xdist
2019-04-29 14:30:55 +01:00
Katie Smith
2f497f5557 Merge pull request #2474 from alphagov/pyup-update-cffi-1.12.2-to-1.12.3
Update cffi to 1.12.3
2019-04-29 14:19:06 +01:00
Katie Smith
f34c183806 Merge pull request #2478 from alphagov/pyup-update-moto-1.3.7-to-1.3.8
Update moto to 1.3.8
2019-04-29 14:18:59 +01:00
Katie Smith
8c33fadd4d Make pyup ignore pytest-xdist
The next available version of pytest-xdist is 1.28.0, which requires
pytest>=4.4. We currently have Pytest pinned to version 3.

https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst#pytest-xdist-1280-2019-04-02
2019-04-29 14:15:43 +01:00
pyup-bot
a22e7a0679 Update cffi from 1.12.2 to 1.12.3 2019-04-29 14:05:47 +01:00
Katie Smith
b214ea22e1 Merge pull request #2479 from alphagov/pyup-update-pytest-mock-1.10.2-to-1.10.4
Update pytest-mock to 1.10.4
2019-04-29 13:49:42 +01:00
Katie Smith
e27657c161 Merge pull request #2470 from alphagov/bump-requirements
Bump requirements
2019-04-29 13:49:28 +01:00
Rebecca Law
37e580eed3 Update requirements 2019-04-29 09:46:16 +01:00
Rebecca Law
ee69e70b76 Bump requirements.
Minor weekly updated and a bump for a security alert in urllib3.
Sort list in test, to ensure it passes everytime.
2019-04-26 10:49:25 +01:00
Katie Smith
fdb3d7e899 Merge pull request #2482 from alphagov/bump-utils
Bump utils to bring in changes to RecipientCSV rows
2019-04-26 10:09:03 +01:00
Katie Smith
c02b7edb92 Bump utils to bring in changes to RecipientCSV rows
Bumped utils to version 31.2.5, which changes when the rows of a
RecipientCSV get created. Switched to using `.get_rows()` from
RecipientCSV (a generator) instead of the `.rows` property (which builds
a list of the rows in memory).
2019-04-25 10:58:19 +01:00