Leo Hemsted
c36e50bef1
update dependencies
2017-08-18 17:02:31 +01:00
Imdad Ahad
e05160bdfb
Aggregate monthly totals from billing data
2017-08-18 16:12:01 +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
d7d2ff7af4
Query the correct table for monthly billing usage:
...
* Query `MonthlyBilling` for the monthly usage and transform
response for admin
2017-08-18 13:38:53 +01:00
Imdad Ahad
2371c2c9a7
Add helper to get months for a financial year:
...
* No tests have been added as this was taken from the admin
where it is already tested thoroughly.
* TODO: Move to utils
2017-08-18 12:45:05 +01:00
Ken Tsang
39cb66a882
Update script to only update unassigned inbound
2017-08-18 11:49:05 +01:00
Ken Tsang
e6582b90be
Add db command to update inbound_numbers
...
Updates the service_id with the service.id that matches the sms_sender
2017-08-18 11:49:05 +01:00
kentsanggds
3bfbb9d71f
Merge pull request #1178 from alphagov/ken-use-inbound-number
...
Use inbound number for delivering sms and to show on service settings
2017-08-18 11:42:52 +01:00
Ken Tsang
5bb20e41b3
Update dao_fetch_services_by_ss_sender
2017-08-17 18:15:22 +01:00
Chris Hill-Scott
953e2ae5bd
Merge pull request #1180 from alphagov/return-template-name
...
Return template name in public API
2017-08-17 12:44:24 +01:00
Imdad Ahad
f40889e6e0
This adds new endpoints to retrieve billing data from the new table:
...
1. Create a separate billing blueprint to house these endpoints
2. Return monthly breakdown in same format as we did before
3. Return yearly breakdown but only return {billing units, rate,
notification_type}. Admin only makes use of these.
2017-08-17 11:10:42 +01:00
Ken Tsang
9ab1dfd6d0
Just order by updated_at for inbound_numbers
2017-08-16 16:28:21 +01:00
Ken Tsang
902b28e00f
Refactor to check active flag
2017-08-16 16:27:42 +01:00
Imdad Ahad
9b88dadb83
Update command populate billing data for services that require it
2017-08-16 15:15:34 +01:00
Ken Tsang
084eac5735
Update dao to order by updated_at, number
2017-08-16 14:02:47 +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
ce962380e3
Update to return empty json block not ''
2017-08-16 12:50:44 +01:00
Ken Tsang
667ee57a35
Refactor code to use inbound_numbers if set
2017-08-16 12:50:44 +01:00
Ken Tsang
e14fa2d87e
Refactored to use service_id to set flag
2017-08-16 12:50:44 +01:00
Ken Tsang
4eba6335d6
Moved url_prefix to inbound_number rest.py
2017-08-16 12:50:44 +01:00
Ken Tsang
81754712ce
Removed number col size migration
2017-08-16 12:50:44 +01:00
Ken Tsang
7f1de19592
Refactored to put logic into API
2017-08-16 12:50:44 +01:00
Ken Tsang
f0e9b93136
Update path to use dash
2017-08-16 12:50:44 +01:00
Ken Tsang
6f12b760f3
Removed print
2017-08-16 12:50:44 +01:00
Ken Tsang
faae6e3537
Update inbound_number number col size
2017-08-16 12:50:44 +01:00
Ken Tsang
22956b7427
Refactor code
2017-08-16 12:50:44 +01:00
Ken Tsang
d2a618cf0a
Refactor set_inbound_number_for_service
...
As don't need the check for available inbound numbers
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
838401ebb3
Refactored endpoints
2017-08-16 12:50:44 +01:00
Ken Tsang
104fc93503
Refactor code
2017-08-16 12:50:44 +01:00
Ken Tsang
6908ec4821
Add inbound_number rest and tests
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
Chris Hill-Scott
04e41e3147
Return template name in public API
...
The use for the public template API is for building caseworking systems
or similar, where you might need a list of templates to pick from (ie
instead of using the Notify web interface to pick from and send a
message).
Right now our API isn’t returning the template name as part of the
response. The name is a useful, human-friendly way of identifying a
template.
This commit changes the response to include the name.
Some clients will need updating before this can be useful.
2017-08-15 14:46:30 +01:00
Imdad Ahad
46ca086aa2
Update command to populate monthly billing data for email and sms
2017-08-11 16:57:18 +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
63e1167098
Make sure we update the correct month for billing:
...
When populating the monthly billing records on a schedule, we need
to ensure the correct month is being updated.
As an example, if the current datetime is 31 Mar 2016, 23:00. The
BST equivalent is the 1st April. Therefore we need to ensure we
update billing for April, not March. This takes care of that.
2017-08-11 16:57:17 +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
Imdad Ahad
19b09f2a27
Rename method to convert from utc to bst for consistency
2017-08-11 16:56:46 +01:00
kentsanggds
955ec60fe3
Merge pull request #1157 from alphagov/ken-add-inbound-number-model-dao
...
Add inbound number model and DAO
2017-08-11 15:17:47 +01:00
Ken Tsang
9a55e167f7
Refactored inbound_number dao
2017-08-11 12:56:59 +01:00
Ken Tsang
cfabab0785
Refactor code to add updated_at
2017-08-11 12:56:59 +01:00
Ken Tsang
a127a6e871
Added active flag setting in inbound_number_dao
2017-08-11 12:56:59 +01:00
Ken Tsang
ffc2da2369
Update serialization for services
2017-08-11 12:56:59 +01:00
Ken Tsang
61c09f142c
Refactored model and dao
2017-08-11 12:56:59 +01:00
Ken Tsang
3c392596a3
Add backref in InboundNumber model
2017-08-11 12:56:59 +01:00
Ken Tsang
4de6060694
Add data models, dao for inbound_numbers
2017-08-11 12:56:59 +01:00
Rebecca Law
4b33f7e987
Stop purging the DVLA response files from S3
...
We are not processing the data in these files yet so we need to stop deleting them until the data is recorded.
2017-08-11 12:00:20 +01:00
