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
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
5bb20e41b3
Update dao_fetch_services_by_ss_sender
2017-08-17 18:15:22 +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
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
e14fa2d87e
Refactored to use service_id to set flag
2017-08-16 12:50:44 +01:00
Ken Tsang
6f12b760f3
Removed print
2017-08-16 12:50:44 +01:00
Ken Tsang
22956b7427
Refactor code
2017-08-16 12:50:44 +01:00
Ken Tsang
838401ebb3
Refactored endpoints
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
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
61c09f142c
Refactored model and dao
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
Imdad Ahad
f5e38a896c
Update the last template usage query to check Notification table:
...
* Don't check the NotificationHistory table (this can cause a timeout)
* Check template actually exists first
2017-08-07 10:19:21 +01:00
Imdad Ahad
e148fafd53
Merge pull request #1144 from alphagov/imdad-feat-schedule-billing-and-adjust-backfill
...
Populate monthly billing on a schedule and make backfill less granular
2017-08-03 10:54:16 +01:00
Leo Hemsted
9c940ab8b4
Merge pull request #1136 from alphagov/letter-api
...
Letter api
2017-08-02 16:15:30 +01:00
Leo Hemsted
372b10f19c
fix up tests to be internally consistent
...
notifications should always have at least one of job and api key, and
the key type should match the api key's key type (or be 'normal')
2017-08-02 15:35:56 +01:00
Imdad Ahad
824063ddb8
Fix to return billing data before a rate begins
2017-08-02 15:32:34 +01:00
Leo Hemsted
5d61b3644c
add tests for new test-key handling
2017-08-02 11:14:05 +01:00
Leo Hemsted
13917c9c57
give test letter api notifications a different filename
...
so they can be distinguished on the frontend.
Also, some related cleanup:
* don't show test api letters on the frontpage
* make sure the subject is returned from the API for letters
* make sure the letter's address is returned for letters
2017-08-01 18:23:29 +01:00
Imdad Ahad
d01d875f7e
Fix issue where monthly billing data was not being updated:
2017-07-31 17:47:53 +01:00
Leo Hemsted
2ab105aaf4
add tests for letter api notifications
2017-07-27 16:43:55 +01:00
Rebecca Law
c1f2634c90
Removed month and year and replaced it with start_date and end_date.
...
This will allow us to sort the data properly.
2017-07-26 13:19:17 +01:00
Rebecca Law
9c55fa7f34
Use the end date for the month, when we are in BST the first day of the month is an hour behind and in the previous month.
2017-07-25 18:08:46 +01:00
Rebecca Law
b62ee8380c
Use BST to calculate monthly billing
2017-07-25 17:38:53 +01:00
Rebecca Law
e23d38de26
Fix bug in get rates function.
2017-07-25 15:50:14 +01:00
Rebecca Law
5612ca023e
- Add transactional
...
- Rename function for clarity
2017-07-25 14:26:42 +01:00
Rebecca Law
d2a1da9ea6
Removed comment
2017-07-25 11:44:39 +01:00
Rebecca Law
eaf5cbb868
Add labels to query so that the named tuples can be referenced later.
...
Remove unnecessary function
2017-07-25 11:43:41 +01:00
Rebecca Law
3e2b8190b9
- Added a scheduled task to create or update billing for the month, yesterday is used to calculate the start and end date for the month.
...
- The new task has not been added to the beat application yet.
- Added an updated_at column to the monthly billing table, we may want to only calculate from the last updated date rather than the entire month.
2017-07-24 15:13:18 +01:00
Rebecca Law
9400988d72
Monthly billing - part 1
...
This is still a work in progress but it would be good to get some eyes on it.
This commit includes creating and updating a row in the monthly billing table and a method to fetch the results.
There is a command to populate the monthly billing for a service and month so we can try it out.
The total cost at the moment are wrong, they do not take into account the free allowance - see notes below about adding that to the table.
Left to do:
create a nightly task to run to update the monthly totals.
create an endpoint to return the yearly billing, the current day will need to be calculated on the fly and added to the totals.
Add the free allowance into the total costs.
2017-07-18 18:21:35 +01:00
Rebecca Law
4b05c32b62
Create a new table to warehouse the monthly billing numbers
2017-07-13 17:22:11 +01:00
Ken Tsang
0c77f2d010
Refactored dao_update_organisation
2017-07-12 12:01:50 +01:00
Ken Tsang
106d59006b
Removed dao_update_organisation
2017-07-12 12:01:50 +01:00
Ken Tsang
3b1f229384
Renamed migration script and refactor code
2017-07-12 12:01:50 +01:00
Ken Tsang
2f8bc0feae
Add create and update fns for organisation dao
2017-07-12 12:01:50 +01:00
Ken Tsang
f76962ad4d
Add versioning to Organisations
2017-07-12 12:01:50 +01:00
