Commit Graph

333 Commits

Author SHA1 Message Date
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
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
782f3ea693 Rename method to get start and end date of a month for clarity 2017-08-11 16:56:47 +01:00
Ken Tsang
2b92c95c22 Update migration script 2017-08-11 13:25:09 +01:00
Ken Tsang
cfabab0785 Refactor code to add updated_at 2017-08-11 12:56:59 +01:00
Ken Tsang
d101e262b5 Renamed migration scripts 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
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
Leo Hemsted
2ab105aaf4 add tests for letter api notifications 2017-07-27 16:43:55 +01:00
Leo Hemsted
f528236eda make job.created_by nullable
Since letter jobs from the API aren't created by any single individual,
lets make created_by nullable. Note: We'll have to make sure that we
update the admin app to handle these jobs nicely
2017-07-27 12:58:13 +01:00
Rebecca Law
8b6be67bbd make columns nullable 2017-07-26 15:06:09 +01:00
Rebecca Law
5669d0475f Don't drop the columns yet 2017-07-26 14:46:40 +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
Ken Tsang
4989493bdf Renamed migration script 2017-07-25 17:23:30 +01:00
Ken Tsang
277f5b9053 Renamed script 2017-07-25 17:20:35 +01:00
Ken Tsang
beca03a39c Add migration script to drop service flags 2017-07-25 17:20:35 +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
793248a74f Fix data migration merge conflict 2017-07-19 15:47:12 +01:00
Rebecca Law
bc4afb25ae Merge branch 'master' into month-billing-table 2017-07-19 14:33:19 +01:00
Rebecca Law
4b05c32b62 Create a new table to warehouse the monthly billing numbers 2017-07-13 17:22:11 +01:00
Imdad Ahad
555dac76a8 Remove old notification status column 2017-07-12 16:24:18 +01:00
Ken Tsang
f53c0cfb8a Rename migration script 2017-07-12 12:05:03 +01:00
Ken Tsang
1ca59c4b44 Renamed migration script 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
a6df96213b Update model and migration script 2017-07-12 12:01:50 +01:00
Rebecca Law
9bf1efd16a Fix merge conflict with db migration script 2017-07-10 15:44:01 +01:00
Rebecca Law
53507314ea Merge branch 'master' into drop-template_stats-table 2017-07-10 15:35:49 +01:00
Rebecca Law
8a01a76e33 Remove the archived table template_statistics. The last time the table we updated was August 30 2016, it's safe to say we are done with it.
I updated the InboundSms and TemplateRedacted model to include an index in the db.
Dropped service_permissions.updated_at column since we are not auditting the table
2017-07-10 14:43:46 +01:00
Imdad Ahad
ae388a3cfc Make Noti and NotiHis status column nullable:
This is in preparation for deprecating this old column
2017-07-10 12:09:02 +01:00
Chris Hill-Scott
ce96d59cf4 Add OPG to letter organisations
Logo was added here:
https://github.com/alphagov/notifications-template-preview/pull/19
2017-07-06 12:31:02 +01:00
Chris Hill-Scott
1bd5e88979 Add more organisations for letter branding
> The logos are now ready to go on DVLA side- so far we've got:
> 001 = HM Government
> 002 = OPG
> 003 = DWP
> 004 = GEO
2017-07-06 12:27:55 +01:00
Leo Hemsted
c24edcf388 add historical redaction data
every current template gets a row in the template_redacted table -
this inserts one for any template that doesn't already have a row,
with redact set to false, the user set to NOTIFY_USER since it was
just a script, and the updated_at set to the time the script is run
2017-06-29 12:54:48 +01:00
Leo Hemsted
29fc81090e add template personalisation redaction
If passing in `redact_personalisation` to the template update endpoint,
we should mark that template permanently as redacted - this means that
we won't ever return the personalisation for any notifications for it.

This is to be used with templates containing one time passwords, 2FA
codes or other sensitive information that you may not want service
workers to be able to see.

This is implemented via a separate table, `template_redacted`, which
just contains when the template was redacted.
2017-06-28 15:53:08 +01:00
Rebecca Law
096b1f8b04 Remove name from organisation 2017-06-26 14:03:02 +01:00
Rebecca Law
49dc93d0fd Revert "Remove name from organisation" 2017-06-26 13:52:01 +01:00
Rebecca Law
9f2b806b18 Remove name from organisation 2017-06-26 13:10:36 +01:00
Rebecca Law
4fe62ac121 Add organisation values for the Enterprise Europe Network. 2017-06-26 11:48:04 +01:00
Leo Hemsted
9f307fd1c5 add created_by to notifications
this is so one-off notifications can be tied to a user
(jobs have a created_by, and api notifications don't make sense
 to have one)
2017-06-20 11:51:17 +01:00
Chris Hill-Scott
24b9e7b059 Unpick migration conflict
Inbound provider and Dial-a-Ride migrations happened at the same time
and got the same revision numbers.

This commit puts DAR after inbound provider.
2017-06-20 10:56:50 +01:00
Chris Hill-Scott
92c92ba368 Merge pull request #1035 from alphagov/tfl-dar
Add organisation for TFL Dial a Ride
2017-06-20 10:47:26 +01:00
Rebecca Law
6202da7dea Update model to remove the string length restriction.
Moved logic to the dao from the endpoint.
2017-06-19 12:25:05 +01:00
Rebecca Law
effb99dca8 Add fetch request for service inbound api.
Add unique constraint on service_id for service_inbound_api.
2017-06-15 16:19:12 +01:00
Chris Hill-Scott
87565c1e60 Add organisation for TFL Dial a Ride
References image added in:
- [ ] https://github.com/alphagov/notifications-admin/pull/1321
2017-06-15 14:59:36 +01:00
Rebecca Law
828d5cd493 New table to store the inbound api information for a service. The table is versioned.
There is a new endpoint to create the inbound api and one to update it.
2017-06-15 11:32:51 +01:00
Rebecca Law
b186cad046 Add a new table to store the api information for a service inbound sms message.
Including:
 - url to push the inbound sms to
 - bearer_token to be added to the header of the request.

The services will be expected to manage these properties.
2017-06-13 15:27:13 +01:00
Martyn Inglis
9bbb3c6a56 Merge branch 'master' into firetext-inbound-sms-not-null-provider
Conflicts:
	tests/app/db.py
2017-06-09 11:56:32 +01:00
Rebecca Law
7b58886d04 Update the new job_statistics columns with the right values. 2017-06-08 16:24:16 +01:00
Rebecca Law
0cee176d8b Fix merge conflicts 2017-06-08 15:24:18 +01:00