Rebecca Law
d252dc8976
New endpoint to search by "to" field of the notification.
...
The query ignores case and spaces.
2017-05-05 14:12:50 +01:00
Rebecca Law
93e76d2362
Update the valid_from date for the rate that is intended to start at the begining of the financial year.
...
It was the start of the financial year in BST, needed to convert it to UTC.
Small change to the logic to find the rates.
2017-05-03 17:11:48 +01:00
Ken Tsang
a1a8397f74
Update billing data to handle future dates
2017-05-02 19:23:57 +01:00
Rebecca Law
3e0221adec
Change get_financial_year to return ending date as 1 microsecond earlier.
...
That way we can write the queries as between start and end dates, making it easier to read.
This makes more sense.
2017-05-02 10:00:47 +01:00
Rebecca Law
88d92d6070
Fix the logic gettting the rates for a financial year.
...
The is_between_end_date_exclusive is a bit funny.
Perhaps the better way to handle it is to make the function is_between but change the financial year function return an enddate that is one millisecond less. That way we can always use the between logic and it will be easier to use.
2017-04-28 16:55:41 +01:00
Rebecca Law
1a64509186
Change the resultset from the yearly and monthly billing data queries.
...
Fix some formatting of the return objects.
2017-04-28 10:10:49 +01:00
Rebecca Law
fdbadf967e
Fix the email billing data when there is no results.
2017-04-28 10:10:48 +01:00
Rebecca Law
a186fc95be
Added new endpoints to return the yearly-usage and monthly-usage for a given financial year and service id.
...
Since the response has changed I have created new endpoints so that the deployments for Admin are more managable.
Removed print statements from some tests.
2017-04-28 10:10:48 +01:00
Rebecca Law
e1e55edd9c
Add new fields to the usage queries: rate_multiplier, international, phone_prefix.
2017-04-28 10:10:48 +01:00
Rebecca Law
4c37c8bdbb
New query to get billing data per month.
2017-04-28 10:10:48 +01:00
Rebecca Law
6dc336ad6c
Created new queries to return the rate with the sum of billable units for the year totals.
...
Once we have the new columns in notifications table, the query will need to include the rate multiplier and if the number is international.
The monthly billing query will be built next.
2017-04-28 10:10:48 +01:00
Imdad Ahad
c5bd685cef
Don't update sent notifications (dao)
2017-04-27 16:55:39 +01:00
Martyn Inglis
349fb3529e
Handle case for international SMS - use correct phone validator, and also set status correctly.
...
This relies on some other code so this commit has placeholder failing tests to be populated when other PRs are merged.
2017-04-27 16:27:14 +01:00
Martyn Inglis
ba58c55c3b
Filter provider details by international flags
2017-04-27 12:13:58 +01:00
Rebecca Law
e8a7762688
Merge branch 'master' into update-sms-rate
2017-04-25 10:15:54 +01:00
Rebecca Law
6c8ff80440
Rename class to be singular
2017-04-25 09:53:43 +01:00
Rebecca Law
43226dc932
Added a new rates table.
...
We only need one rate per channel. This reflects that. The provider_rates has been left for now, it is still not being used.
New dao has been added to select the right rate for the given notification_type and date of notificaiton.
2017-04-24 16:20:03 +01:00
Imdad Ahad
ce2401c6e0
Ensure get_current_provider only returns active
2017-04-24 16:06:14 +01:00
Imdad Ahad
c4fac1d937
Revert "Revert "add DVLA organisations to API""
2017-04-21 16:05:07 +01:00
Leo Hemsted
c3e56d5d2d
Revert "add DVLA organisations to API"
2017-04-20 18:21:56 +01:00
Leo Hemsted
95b3248a5e
Merge pull request #906 from alphagov/dvla-orgs
...
add DVLA organisations to API
2017-04-20 17:41:27 +01:00
Leo Hemsted
f127bac600
add GET /dvla_organisation endpoint
2017-04-20 15:35:31 +01:00
Leo Hemsted
67002cd608
Merge pull request #905 from alphagov/letter-scheduled-task
...
exclude letters from scheduled cleanup tasks
2017-04-19 16:19:44 +01:00
Leo Hemsted
935e566284
add tests for letters not getting excluded
2017-04-19 14:22:25 +01:00
Leo Hemsted
b381aeefa1
don't include letters when timing out/deleting old notifications
...
also refactored those functions, since they were pretty gnarly and
repeated themselves a lot
2017-04-19 11:34:00 +01:00
Ken Tsang
fc0cfa5dbf
Corrected code to handle template types
2017-04-19 10:51:12 +01:00
Martyn Inglis
b8cfaf02f6
Ordered the query - ambiguous orders made tests flaky
2017-04-13 12:52:30 +01:00
Leo Hemsted
c7c47a029f
remove slow join from template-last-use query
2017-04-10 17:33:31 +01:00
Rebecca Law
7ba9b1d261
Update the update statements with the updated_at and sent_at timestamps.
2017-04-07 15:21:27 +01:00
Rebecca Law
2d9a449d1e
Changed styling
2017-04-07 14:36:00 +01:00
Rebecca Law
f7ab49246a
Added an endpoint that returns all letter jobs, ordered by created_at desc.
2017-04-07 11:50:56 +01:00
Rebecca Law
61d228e797
Remove test filter
2017-04-07 11:22:03 +01:00
Rebecca Law
50a5bedcbf
Refactor update to notifcations to be a bulk update. This is much better for performance.
2017-04-07 10:59:12 +01:00
Rebecca Law
b6abb82212
Merge pull request #887 from alphagov/update-job-status
...
Update job status for letter jobs.
2017-04-06 14:22:09 +01:00
Rebecca Law
24c871179d
Merge pull request #885 from alphagov/platform-admin-query
...
Platform admin query
2017-04-06 13:58:34 +01:00
Rebecca Law
9e175f42e8
Refactor to make code more readible.
2017-04-06 11:18:21 +01:00
Rebecca Law
4f6a66c904
Merge branch 'master' into update-job-status
...
Conflicts:
app/dao/jobs_dao.py
tests/app/dao/test_jobs_dao.py
2017-04-06 11:11:37 +01:00
Martyn Inglis
832005efef
Updates to the delete CSV file job to reduce the number of eligible jobs in any run
...
- previously this was unbounded, so it got all jobs older then 7 days. In excess of 75,000 🔥
- this meant that the job took (a) a long time and (b) a lot memory and (c) doing the same thing every day
These changes mean that the job has a 2 day eligible window for jobs, minimising the number of eligible jobs in a run, whilst still retaining some leeway in event if it failing one night.
In principle the job runs early morning on a given day. The previous 7 days are left along, and then the previous 2 days worth of files are deleted:
so:
runs on
31st
30,29,28,27,26,25,24 are ignored
23,22 jobs here have files deleted
21 and earlier are ignored.
2017-04-05 16:23:41 +01:00
Rebecca Law
c49217b1bf
Update job status to ready to send, indicating the file for the job has been uploaded to S3.
2017-04-05 11:57:56 +01:00
Rebecca Law
0506bc3b0c
Updated the fetch_stats_by_date_range to return test notifications if the start and end date are with in the last 7 days.
...
If the date range is with the last 7 days we query Notifcations.
If the date range is outside of the last 7 days we query NotificationHistory.
NotificationHistory does not persist notifications created with a test api key.
2017-04-04 16:34:20 +01:00
Rebecca Law
eee662e5be
Make the code neater for the query.
2017-04-03 15:52:52 +01:00
Ken Tsang
5f945ab30e
Refactored code, changed now to utcnow in test
2017-03-29 11:47:41 +01:00
Ken Tsang
af78efd137
Fix get_detailed_services BST
2017-03-29 11:03:28 +01:00
Rebecca Law
d090451dd8
Update code as per review comment.
2017-03-17 10:01:28 +00:00
Rebecca Law
140179b4b6
Create new task to build dvla file.
...
This will transform each notification in a job to a row in a file.
The file is then uploaded to S3.
The files will later be aggregated by the notifications-ftp app to send to dvla.
The method to upload the file to S3 should be pulled into notifications-utils package.
It is the same method used in notifications-admin.
2017-03-15 15:26:58 +00:00
Rebecca Law
ea4214c7d5
Added a jobs_dao method to answer if the all the notifications have been created in the database for the given job.
2017-03-14 10:50:09 +00:00
imdadahad
c11f4b5d5d
Merge pull request #829 from alphagov/feat-add-endpoint-for-service-monthly-usage-stats
...
Add endpoint for service monthly usage stats by template
2017-03-09 16:12:22 +00:00
Imdad Ahad
a4dc614ef7
Restore dao_create_template and use custom template fixture instead
2017-03-08 13:03:44 +00:00
Imdad Ahad
36d52c6e42
Add template type to response and refactor
2017-03-08 12:01:38 +00:00
Imdad Ahad
8272a4388d
Add dao method to get template stats per month in financial year for service
2017-03-08 12:01:38 +00:00
