Katie Smith
cc76e0ef19
Merge pull request #1183 from alphagov/pyup-update-apispec-0.14.0-to-0.25.0
...
Update apispec to 0.25.0
2017-08-16 14:09:42 +01:00
Imdad Ahad
fbe505a991
Merge pull request #1172 from alphagov/imdad-feat-get-billing-from-new-table
...
Populate and retrieve billing data from the new MonthlyBilling table
2017-08-16 12:35:12 +01:00
pyup-bot
050c94d7d4
Update apispec from 0.14.0 to 0.25.0
2017-08-16 04:45:35 +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
7879bc0e7e
Merge pull request #1177 from alphagov/fix-migration-order
...
Fix order of DB migrations
2017-08-14 14:18:15 +01:00
Chris Hill-Scott
6f18415997
Fix order of DB migrations
...
More migrations got merged in between me making 0114 and merging the PR
that contained 0114.
If we named the files as just 0114.py then this would get flagged as a
merge conflict…
2017-08-14 13:54:18 +01:00
Chris Hill-Scott
eb43629576
Merge pull request #1171 from alphagov/ch-letter-logo
...
Add letter organisation for Companies House
2017-08-14 13:48:12 +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
ae76fd0f30
Small refactor to a test
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
Rebecca Law
8658f691e7
Merge pull request #1173 from alphagov/turn-off-purge-dvla-resp-files
...
Stop purging the DVLA response files from S3
2017-08-11 13:40:20 +01:00
Ken Tsang
2b92c95c22
Update migration script
2017-08-11 13:25:09 +01:00
Ken Tsang
976be24cbc
Refactor test
2017-08-11 12:56:59 +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
2cfe85a2af
Refactored inbound_number dao tests
2017-08-11 12:56:59 +01:00
Ken Tsang
e80bc9deb2
Refactor conftest
2017-08-11 12:56:59 +01:00
Ken Tsang
d101e262b5
Renamed migration scripts
2017-08-11 12:56:59 +01:00
Ken Tsang
668811197c
Remove whitespace
2017-08-11 12:56:59 +01:00
Ken Tsang
c9f871c0c9
Refatored tests and fixtures for inbound_number
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
5e2d0bf5c6
Update test fixture to provide default provider
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
4efb3238db
Added test for allocating a service an inbound number twice
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
d3e5f3a753
Merge pull request #1150 from alphagov/imdad-migration-remove-month-year-monthly-billing
...
Drop unused month and year columns from MonthlyBilling
2017-08-11 12:31:38 +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
Imdad Ahad
dcecd21f82
Drop unused month and year columns from monthlybilling
2017-08-11 10:44:34 +01:00
Chris Hill-Scott
fdcb0da218
Add letter organisation for Companies House
...
Depends on:
- [ ] https://github.com/alphagov/notifications-template-preview/pull/37
2017-08-10 14:40:21 +01:00
Rebecca Law
1b7f3f0238
Merge pull request #1138 from alphagov/pyup-update-flask-migrate-1.3.1-to-2.1.0
...
Update flask-migrate to 2.1.0
2017-08-10 14:05:48 +01:00
Chris Hill-Scott
432a047b6c
Merge pull request #1170 from alphagov/newline-replacement-letters-bugfix
...
Bump utils to 18.0.1
2017-08-10 12:37:12 +01:00
Chris Hill-Scott
4db008d0a1
Merge pull request #1169 from alphagov/pyup-update-pytest-3.2.0-to-3.2.1
...
Update pytest to 3.2.1
2017-08-10 12:37:04 +01:00
Chris Hill-Scott
0207c186e8
Bump utils to 18.0.1
...
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/203
2017-08-10 12:04:25 +01:00
Rebecca Law
318d6aeb7b
Remove comment
2017-08-10 11:32:16 +01:00
Rebecca Law
d9d100e20b
Merge branch 'master' into pyup-update-flask-migrate-1.3.1-to-2.1.0
2017-08-10 11:22:05 +01:00
Rebecca Law
333ed8f806
Merge pull request #1115 from alphagov/pyup-pin-notifications-python-client-4.3.1
...
Pin notifications-python-client to latest version 4.3.1
2017-08-10 11:21:03 +01:00
Rebecca Law
32928db6e7
Merge branch 'master' into pyup-pin-notifications-python-client-4.3.1
2017-08-10 10:25:46 +01:00
Rebecca Law
0f26584761
Merge pull request #1164 from alphagov/check-service-name-is-unique
...
Check service name is unique
2017-08-10 10:21:58 +01:00
pyup-bot
06d4da57ae
Update pytest from 3.2.0 to 3.2.1
2017-08-09 22:10:25 +01:00
Leo Hemsted
c1d22047be
Merge pull request #1166 from alphagov/fix-logs
...
fix broken cloudfoundry logs
2017-08-09 16:09:04 +01:00
Leo Hemsted
83fc529cc5
fix broken cloudfoundry logs
...
wasn't setting log path properly
2017-08-09 16:07:35 +01:00
Leo Hemsted
210cb75706
Merge pull request #1165 from alphagov/logs-cleanup
...
don't capture logs directly from stdout
2017-08-09 15:48:29 +01:00
