Commit Graph
1192 Commits
Author SHA1 Message Date
Rebecca Law b195257d94 Added another test 2017-09-25 11:14:29 +01:00
Rebecca Law 64db8cb18d Merge branch 'master' into select-inbound-number-to-assign 2017-09-25 11:13:12 +01:00
Rebecca Law 03ea09fd6a Add order by in the dao_get_reply_to_by_service_id() 2017-09-22 10:02:59 +01:00
Rebecca Law 795bd4271c New endpoint to fetch a single reply-to email address by id 2017-09-21 17:02:58 +01:00
Rebecca Law 18581c754a Add new endpoint to get available inbound number.
Add new endpoint to allocate a specific number to a given service.

This will allow the platform admin user to choose a number when setting the inbound_sms permission for a service.
2017-09-21 15:18:52 +01:00
Chris Hill-Scott 8360b9a122 Merge pull request #1265 from alphagov/logoless-organsations
Make organisation logo nullable
2017-09-21 13:01:06 +01:00
Leo Hemsted 9afb2c36e7 Merge pull request #1241 from alphagov/letter-received
Letters are accepted, not created or sending
2017-09-20 16:51:31 +01:00
Rebecca Law 877d8a2877 Remove the default value - expect it to always be set. 2017-09-20 12:20:12 +01:00
Rebecca Law c6bf38e869 - is_default is required on the add_service_email_reply_to_request schema
- Added check that the service exists for the POST reply-to methods.
- Added tests
2017-09-20 11:58:18 +01:00
Leo Hemsted 10ceb0467e fix ordering to prevent random test failures 2017-09-20 11:20:13 +01:00
Chris Hill-Scott bde6a9e131 Make organisation logo nullable
Now we have the org banner branding, not all organisations need a logo.
So it shouldn’t be an error to not provide one.
2017-09-20 11:06:16 +01:00
Rebecca Law 6b2c2962c9 New endpoint to insert new service reply to email address and update existing one. 2017-09-14 17:54:38 +01:00
Rebecca Law 5366968cc9 Added some more tests 2017-09-14 12:23:52 +01:00
Katie Smith 72760550bd Add endpoint to get the email reply to addresses for a service
- Changed the dao_get_reply_to_by_service_id method to return a list of
results.
- Added a GET /service/<service_id>/email-reply-to endpoint
2017-09-13 16:58:36 +01:00
Rebecca Law f624f4f033 Insert and update methods for service_sms_sender 2017-09-11 17:40:37 +01:00
Katie Smith 01eef6c7f5 Add service_email_reply_to DAO with an upsert method 2017-09-08 14:56:05 +01:00
Imdad Ahad 3f34f8fa3e Merge pull request #1222 from alphagov/get-performance-stats
Get performance stats
2017-08-31 14:17:42 +01:00
Imdad Ahad 96443f5d6e Combine test to query notifications within date range instead 2017-08-31 13:52:56 +01:00
Imdad Ahad 72de309b26 Make perf platform processing stats query the NotificationHistory table 2017-08-31 12:52:59 +01:00
Imdad Ahad ea2f838510 Fix typo 2017-08-31 11:10:54 +01:00
Imdad Ahad e39c202a01 Merge pull request #1195 from alphagov/imdad-refactor-remove-unused-billing-code
Remove unused billing usage code
2017-08-31 10:39:12 +01:00
Katie Smith 49a6bfc06b Send '0', not 'null', to perf platform if no notifications are sent 2017-08-30 16:02:30 +01:00
Imdad Ahad af54d98faa Remove unused imports 2017-08-30 14:40:54 +01:00
Imdad Ahad 994e797b26 Replace 'sms' with SMS_TYPE 2017-08-30 14:40:29 +01:00
Imdad Ahad c92b72da6e Remove yearly billing data dao methods 2017-08-30 14:40:29 +01:00
Katie Smith 132d65bc75 Add query to get processing time stats for performance platform
We are only interested in API notifications, not including test
messages. Letters are not included.
2017-08-30 14:40:10 +01:00
Chris Hill-Scott 26f50af6e9 Let whitelist and user have int. phone numbers
On the frontend, we’re letting users register with international phone
numbers. So we shouldn’t block users from doing this on the API side.

Same thing for the whitelist, where we’re also allowing international
phone numbers now.
2017-08-30 10:55:18 +01:00
kentsanggds 549601a6df Merge pull request #1200 from alphagov/ken-refactor-inbound_numbers
Refactor inbound numbers
2017-08-25 13:27:16 +01:00
Rebecca Law f9ee8bba91 Merge pull request #1209 from alphagov/remove-unused-endpoint
Removed unused endpoint and dao methods.
2017-08-24 16:32:37 +01:00
Rebecca Law 17f62723fa Removed unused endpoint and dao methods. 2017-08-24 16:09:48 +01:00
Ken Tsang 1b35731fb2 Refactor code
- updated dao_get_letter_jobs_by_status to dao_get_letter_job_ids_by_status to return array of strings
2017-08-24 11:57:46 +01:00
Ken Tsang d99ab329eb Refactored code to use inbound_number.number
- Removed filter on sms_sender for `dao_fetch_services_by_inbound_number`
2017-08-23 14:14:32 +01:00
Ken Tsang b2b74e2b5d Fixed bug in letter job schedule 2017-08-23 13:22:07 +01:00
Ken Tsang bd79a6f770 Improved tests on letter jobs by status 2017-08-23 13:22:07 +01:00
Ken Tsang 18881cd580 Add scheduled letter jobs 2017-08-23 13:22:07 +01:00
Leo Hemsted ae683cad6e Merge pull request #1192 from alphagov/deps
update dependencies
2017-08-22 15:39:49 +01:00
Chris Hill-Scott bdc935a8b1 Exclude test keys when searching by recipient
The activity page doesn’t show notifications sent with a test key.

However it _does_ when you search by recipient. This is confusing
and inconsistent.
2017-08-21 17:38:21 +01:00
Leo Hemsted c2152f9cb8 remove billable-units endpoint
it wasn't used anywhere, and the return value changed when flask was upgraded
2017-08-21 10:57:15 +01:00
Imdad Ahad 58baa9919c Merge pull request #1190 from alphagov/imdad-feat-get-monthly-usage-from-billing-table
Get monthly usage breakdown from the correct table
2017-08-18 14:21:12 +01:00
Imdad Ahad dfd431516b Remove redundant method 2017-08-18 13:52:13 +01:00
Ken Tsang 902b28e00f Refactor to check active flag 2017-08-16 16:27:42 +01:00
Ken Tsang c36423aac6 Refactor code for dao_fetch_servies_by_sms_sender to use inbound_numbers
This will need to be refactored after the deployment of api and admin and after the update script for existing services using inbound numbers has been executed.
2017-08-16 12:51:31 +01:00
Ken Tsang e14fa2d87e Refactored to use service_id to set flag 2017-08-16 12:50:44 +01:00
Ken Tsang 0c4c467cac Added extra tests after refactoring 2017-08-16 12:50:44 +01:00
Ken Tsang 47a1403591 Refactor code to add updated_at 2017-08-16 12:50:44 +01:00
Imdad Ahad 94605d31fa Change how we populate and retrieve MonthlyBilling totals:
1. For both email and sms, store [] in monthly_totals if
there is no billing data (no notifications sent etc.) and
return this via the API

2. General refactoring of indentation
2017-08-15 16:09:42 +01:00
Imdad Ahad 69845e9f37 Add helper methods to retrieve billing data from the new table:
Get yearly and monthly billing data from the new table
with filter by notification type. Additionally let's calculate
current day delta totals
2017-08-11 16:57:18 +01:00
Imdad Ahad 35ad5d74f9 Retrieve billing data (for month) by notification type:
* Previously we were only returning SMS. Let's make this return for
a given notification type.
* General refactor of the monthly retrieval query
* Return an empty BillingData tuple if email billing data is empty
2017-08-11 16:57:18 +01:00
Imdad Ahad 839c161628 Update monthly billing for SMS and Email:
* Refactor code to update for EMAIL_TYPE and SMS_TYPE
* Make tests more robust (overlapping rates, multiple months, multiple noti
* types)
*
2017-08-11 16:57:18 +01:00
Imdad Ahad 782f3ea693 Rename method to get start and end date of a month for clarity 2017-08-11 16:56:47 +01:00