Commit Graph

6353 Commits

Author SHA1 Message Date
Rebecca Law
a3f33b5cc3 Merge pull request #2504 from alphagov/reduce-number-of-billing-days-to-calculate
Reduce the number of days to recalculate billing.
2019-05-17 16:12:07 +01:00
Chris Hill-Scott
3e782c6dbc Merge pull request #2428 from alphagov/give-users-folder-permissions
Give existing users all folder permissions
2019-05-17 12:48:27 +01:00
Pea Tyczynska
67e3a7689a Give existing users all folder permissions
This will be done just before we turn on folder permissions
to all services to ensure that all users start with all the
permissions.
2019-05-17 10:33:05 +01:00
Leo Hemsted
961b548367 Merge pull request #2509 from alphagov/start-migrations
Can't use --no-start flag on migration
2019-05-16 17:49:13 +01:00
Leo Hemsted
1e4f98868c Merge pull request #2510 from alphagov/revert-2508-break-the-build
Revert "testing build failure"
2019-05-16 17:23:09 +01:00
Leo Hemsted
5d05a55857 Revert "testing build failure" 2019-05-16 17:06:34 +01:00
Leo Hemsted
42ffe673ae Merge pull request #2508 from alphagov/break-the-build
testing build failure
2019-05-16 16:22:33 +01:00
Leo Hemsted
652ccbb990 Can't use --no-start flag
--no-start doesn't actually stage, which we need to get the files containing the new migrations.
2019-05-16 16:20:15 +01:00
Leo Hemsted
e225c95bdc testing build failure
please don't deploy this to production
2019-05-16 15:53:41 +01:00
Leo Hemsted
cbe5c0d23b Merge pull request #2507 from alphagov/new-migration
remove unnecessary unique index
2019-05-16 15:52:42 +01:00
Leo Hemsted
9d415cd292 remove unnecessary unique index
primary key provides the same control. also catch the right exception
in the related command
2019-05-16 14:36:17 +01:00
Leo Hemsted
907e13da87 Merge pull request #2506 from alphagov/zdt-mk-2
update manifest file to use zdt-push
2019-05-16 12:03:39 +01:00
Leo Hemsted
05c9144a89 update manifest file to use zdt-push
this way we keep db bindings etc, and avoid accidentally dropping
connections.
2019-05-16 10:52:54 +01:00
Leo Hemsted
01844d4a56 Merge pull request #2505 from alphagov/healthcheck
add routes for all apps
2019-05-15 16:53:20 +01:00
Leo Hemsted
10a6f32a09 add routes for all apps
all apps get a route assigned when using v3-zdt-push.

> By default, the web process has a route and one instance. Other processes have zero instances by default.

([source](https://docs.cloudfoundry.org/devguide/multiple-processes.html))

When we push apps to multiple environments they need different routes
or the second push will fail, so this means that we need to define
routes ourselves for every app.

We're also manually flagging the health-check as either "http" or
"process" - http for the api, process for all others.

If not specified, healthcheck is set to `port` by cloudfoundry - we've
seen some issues with upgrading the deployment from v2 to v3 when using
port - it adds apps to load balancer when they're not ready, which can
result in 404s. by setting healthcheck to http it'll wait for the
/status endpoint to return 200, which will wait for flask to get
everything up and running properly
2019-05-15 16:01:28 +01:00
Katie Smith
3ae3b0e7af Merge pull request #2491 from alphagov/support-welsh-characters
Bump utils to bring in new fragment count for unicode SMS
2019-05-15 14:46:55 +01:00
Rebecca Law
e3ee99e70d Reduce the number of days to recalculate billing. It's not necessary to calculate longer than 4 days. 2019-05-15 14:40:53 +01:00
Katie Smith
1fac8e8e29 Bump utils to bring in new fragment count for unicode SMS
Version 32.0.0 of notifications-utils changes how SMS fragment count is
calculated. Certain Welsh characters will cause the SMS to be encoded in
unicode encoding (instead of GSM) so the fragment counts will be lower.
2019-05-15 14:02:07 +01:00
Leo Hemsted
b4b346c764 Merge pull request #2503 from alphagov/revert-2498-zdt-deploy
Revert "Zero downtime deploy"
2019-05-15 14:01:15 +01:00
Leo Hemsted
7a711cf314 Revert "Zero downtime deploy" 2019-05-15 13:48:40 +01:00
Leo Hemsted
836933eba7 Merge pull request #2498 from alphagov/zdt-deploy
Zero downtime deploy
2019-05-15 10:59:30 +01:00
Katie Smith
21f1153bd1 Merge pull request #2500 from alphagov/add-requires-approval-column
Add request_to_go_live_notes column to Organisation table
2019-05-14 16:10:28 +01:00
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
39c8e1ede4 update readme 2019-05-09 14:50:38 +01:00
Leo Hemsted
b2f87378c3 update manifest file to use zdt-push
this way we keep db bindings etc, and avoid accidentally dropping
connections.
2019-05-09 14:37:47 +01:00
Leo Hemsted
53806f168d add routes for all apps
all apps get a route assigned when using v3-zdt-push.

> By default, the web process has a route and one instance. Other processes have zero instances by default.

([source](https://docs.cloudfoundry.org/devguide/multiple-processes.html))

When we push apps to multiple environments they need different routes
or the second push will fail, so this means that we need to define
routes ourselves for every app.

We're also manually flagging the health-check as either "http" or
"process" - http for the api, process for all others.
2019-05-09 14:37:03 +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