Martyn Inglis
07daa369a3
Fixed some config issues
2017-05-05 15:20:34 +01:00
Martyn Inglis
34c9198d0c
Make the service available to code on the request context
2017-05-05 15:20:23 +01:00
Martyn Inglis
0c160c3419
Store the service we have used to authenticate the client API user against the request.
...
We can then use this later - saving an extra DB query on every client facing API call
- Note this doesn't affect admin calls which do not use the service from the api key, but use the one passed as part of the URL path.
2017-05-05 15:19:57 +01:00
kentsanggds
61eb8cd625
Merge pull request #938 from alphagov/fix-rates
...
Update the valid_from date for the rate
2017-05-04 10:10:48 +01:00
Rebecca Law
81e10896ea
Remove print statement
2017-05-04 09:47:27 +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
minglis
64ef843777
Merge pull request #936 from alphagov/switch-on-rate-limit-in-prod
...
Switch on API rate limiting on production.
2017-05-03 16:11:23 +01:00
kentsanggds
195f8a305a
Merge pull request #937 from alphagov/udpate_rates
...
Udpate rates
2017-05-03 13:52:50 +01:00
Ken Tsang
03885fea2f
Update tests with new rates
2017-05-03 13:13:13 +01:00
Ken Tsang
d0df5c2180
Adjust rates in line to what admin expects
2017-05-03 13:02:36 +01:00
Martyn Inglis
97dcf766bc
Switch on API rate limiting on production.
...
Limits POST API calls to send notifications on V1/V2 to 3000 in 60 seconds.
2017-05-03 12:13:32 +01:00
kentsanggds
31069ea5f5
Merge pull request #935 from alphagov/fix-usage_future_dates
...
Update billing data to handle future dates
2017-05-03 10:18:14 +01:00
Ken Tsang
a1a8397f74
Update billing data to handle future dates
2017-05-02 19:23:57 +01:00
Sakis
01e3a88d55
Merge pull request #920 from alphagov/autoconfirm_http_subscriptions
...
Autoconfirm http subscriptions
2017-05-02 17:03:41 +01:00
minglis
2dcebc0b52
Merge pull request #917 from alphagov/rate-limit-api-calls
...
Rate limit api calls
2017-05-02 15:07:54 +01:00
Rebecca Law
93a325eaae
Merge pull request #934 from alphagov/fix-get_rates_for_year
...
Fix get rates for year
2017-05-02 11:40:50 +01:00
Rebecca Law
c40111a576
Split up a test
2017-05-02 11:20:01 +01:00
Martyn Inglis
b0baa1532a
Added some logging around rate limiting.
2017-05-02 11:14:45 +01:00
Martyn Inglis
a9539d892c
Merge branch 'master' into rate-limit-api-calls
...
Conflicts:
requirements.txt
tests/app/notifications/rest/test_send_notification.py
tests/app/notifications/test_validators.py
tests/app/v2/notifications/test_post_notifications.py
2017-05-02 10:56:56 +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
Athanasios Voutsadakis
c99b65252f
Fix some typos
2017-04-28 16:11:27 +01:00
Athanasios Voutsadakis
cfed90e502
Make code a bit more defensive and add som logging
2017-04-28 16:10:41 +01:00
Athanasios Voutsadakis
336462cdb2
Fix whitespaces
2017-04-28 15:11:36 +01:00
Athanasios Voutsadakis
74433c9335
Add tests for autoconfirmation
2017-04-28 15:11:36 +01:00
Athanasios Voutsadakis
04b003c152
Add utility function for subscription autoconfirm
2017-04-28 15:11:36 +01:00
Imdad Ahad
3b350cdf30
Merge pull request #932 from alphagov/service-stats
...
treat sent as delivered in detailed service api
2017-04-28 14:15:30 +01:00
Imdad Ahad
34de722e73
Add test to check for sent notification
2017-04-28 13:32:23 +01:00
Leo Hemsted
f577e91134
treat sent as delivered in detailed service api
...
this is for when we fetch the large blue numbers for viewing
notifications for an entire service
2017-04-28 11:56:12 +01:00
kentsanggds
56e5045e9a
Merge pull request #928 from alphagov/update-billing-api-with-rate
...
Update billing api with rate
2017-04-28 11:40:05 +01:00
Leo Hemsted
ff77814e36
Merge pull request #931 from alphagov/csv-status
...
add type conversion to report downloads
2017-04-28 11:04:05 +01:00
Leo Hemsted
fd4e27bfd3
add type conversion to report downloads
...
"sent" is fine as an internal marker but not very obvious to the end
user that it specifically refers to international messages. We now
say "Sent internationally" in the CSV
2017-04-28 11:00:55 +01:00
Ken Tsang
baf84b53d3
Update test to check it doesn't get email usage
2017-04-28 10:10:49 +01:00
Rebecca Law
3b41478a0a
Updated Notification model to use Float(asdecimal=False) for rate_mutliplier.
...
Added test with multiple rows for a month.
2017-04-28 10:10:49 +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
93287719e4
Merge pull request #930 from alphagov/set-status-to-sent-on-int-numbers
...
Send to provider for international
2017-04-28 09:55:01 +01:00
Imdad Ahad
b5d4acb758
Make message more accurate
2017-04-27 16:58:00 +01:00
Imdad Ahad
e450f15b2b
Fix typo and update test now that we expect sent for international
2017-04-27 16:57:04 +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
Imdad Ahad
1b483f5f1e
Merge pull request #929 from alphagov/remove-references-to-old-utils
...
Remove references to old utils code
2017-04-27 16:22:55 +01:00
Chris Hill-Scott
698b20596f
Remove references to old utils code
...
These methods don’t exist any more.
Not doing this reformatting in the tests probably makes the tests more
robust too 😬
2017-04-27 16:03:27 +01:00
Imdad Ahad
162fc8de04
Merge pull request #925 from alphagov/feat-use-intl-provider-send-sms
...
Feat use intl provider send sms
2017-04-27 15:33:45 +01:00
Imdad Ahad
c1651013af
Merge pull request #927 from alphagov/persist-notification-intl
...
Persist international notification fields
2017-04-27 14:06:41 +01:00
Imdad Ahad
164ba0c6b3
as_decimal defaults to False
2017-04-27 13:50:51 +01:00
