Martyn Inglis
a60d40bbc0
Merge branch 'master' into remove-nasty-query-from-dashboard
...
Conflicts:
tests/app/service/test_rest.py
2017-06-01 14:47:00 +01:00
Martyn Inglis
7f65aa3eef
Merge branch 'master' into remove-nasty-query-from-dashboard
...
Conflicts:
app/service/rest.py
tests/app/service/test_rest.py
2017-06-01 13:11:54 +01:00
Leo Hemsted
d33698216c
Revert "Revert "Remove nulls from sms_sender""
2017-06-01 11:00:26 +01:00
Leo Hemsted
ea0ba8d87a
Revert "Remove nulls from sms_sender"
2017-05-31 14:52:48 +01:00
Leo Hemsted
db4b3e371a
remove null sms sender test
...
it's no longer possible for an sms_sender to be null
2017-05-30 10:47:52 +01:00
Leo Hemsted
25011f09ef
test no longer applicable as null sms_sender is an error now
2017-05-30 10:47:15 +01:00
Leo Hemsted
eb6edf06a3
add upgrade script to remove non-null values from the sender column
2017-05-30 10:47:15 +01:00
Leo Hemsted
58503c855a
set sms_sender to be 'GOVUK' if not otherwise specified
...
this is a precursor to making the column non-nullable
2017-05-30 10:47:15 +01:00
Ken Tsang
18b8382d6e
Refactor schema and improve tests
2017-05-26 17:17:15 +01:00
kentsanggds
263adac805
Merge pull request #984 from alphagov/ken-update-api-service-permissions-handling
...
Ken update api service permissions handling
2017-05-26 14:39:27 +01:00
Ken Tsang
7aca3d8f43
Remove flags process in service_dao.create_service
2017-05-26 12:04:16 +01:00
Imdad Ahad
77b82305f4
Search normalised in get_notifications_for_service:
...
* Use dao method to search against normalised(recipient)
* Add filter to accept one or more statuses
2017-05-26 11:58:50 +01:00
Ken Tsang
1375bbe400
Refactor schema to improve error response
2017-05-25 17:55:24 +01:00
Ken Tsang
54d85fd8df
Add tests for services with no permissions
2017-05-25 17:48:09 +01:00
Ken Tsang
8488895612
Refactored tests
2017-05-25 17:48:09 +01:00
Ken Tsang
234312ece0
Update service permissions to ensure state in sync
2017-05-25 17:48:09 +01:00
Ken Tsang
2f626fa6fc
Add permissions validation in service schema
2017-05-25 17:47:21 +01:00
Ken Tsang
e59a1ab104
Update tests for existing flags to set service permissions
2017-05-25 17:47:21 +01:00
Ken Tsang
8e3e31faaf
Updated service DAO and API end points
2017-05-25 17:47:21 +01:00
Leo Hemsted
4b8b6ca91e
add test to ensure that updating other things doesnt affect sms sender
2017-05-25 10:37:17 +01:00
Leo Hemsted
554a193cff
separate service deserialization from validation
...
Marshmallow validates and deserialises - BUT, when it deserialises,
it explicitly sets `sms_sender=None`, even when you haven't passed
sms_sender in. This is problematic, because we wanted to take advantage
of sqlalchemy's default value to set sms_sender to `GOVUK` when the
actual DB commit happens.
Instead, still use marshmallow for validating, but manually carry out
the json deserialisation in the model class.
This fixes a bug that only manifested when the database was upgraded,
but the code hadn't updated. 🎉
2017-05-24 16:27:12 +01:00
Martyn Inglis
03346f467f
updated cache to store map not single value, to accommodate the billable units and the total cost.
2017-05-24 09:59:37 +01:00
Martyn Inglis
78a55bafe0
Added new cost field to yearly billable sms endpoint.
2017-05-24 08:57:41 +01:00
Leo Hemsted
e9b1fd4dde
Revert "Non null sender"
2017-05-23 16:32:03 +01:00
Martyn Inglis
e987668b0c
Merge branch 'master' into remove-nasty-query-from-dashboard
2017-05-23 13:55:30 +01:00
Leo Hemsted
afd748bab2
test no longer applicable as null sms_sender is an error now
2017-05-23 11:43:23 +01:00
Leo Hemsted
47560515dc
add upgrade script to remove non-null values from the sender column
2017-05-23 11:33:43 +01:00
Leo Hemsted
147c50f87b
set sms_sender to be 'GOVUK' if not otherwise specified
...
this is a precursor to making the column non-nullable
2017-05-23 11:33:31 +01:00
Leo Hemsted
86c9600b04
use config to get default sender rather than hardcoding
...
this means that on non-prod envs, it reflects that environment.
it needs to be a lamdba, because the column object is created at import
time, when current_app.config won't have been loaded - this means that
when you create a Service object, that lambda executes and grabs the
correct default value
2017-05-23 11:12:37 +01:00
Leo Hemsted
2535a7fe98
set sms_sender to be 'GOVUK' if not otherwise specified
...
this is a precursor to making the column non-nullable
2017-05-22 17:13:35 +01:00
Martyn Inglis
119f0532ab
Renamed the API method/url
2017-05-22 10:06:34 +01:00
Martyn Inglis
f0395e7496
New endpoint to get the count of billable SMS units.
2017-05-19 16:43:05 +01:00
minglis
da6a6f6641
Merge pull request #959 from alphagov/comma-format-message-limit
...
Comma-format number when emailing live services
2017-05-18 11:06:24 +01:00
kentsanggds
c4964d8cf4
Merge pull request #956 from alphagov/add-service-permissions
...
Add service permissions DAO and refactor user service permission mock
2017-05-16 14:26:15 +01:00
Ken Tsang
3602431c2a
Renamed test and refactored fixtures
2017-05-16 13:41:54 +01:00
Chris Hill-Scott
2d4f10bd22
Comma-format number when emailing live services
...
250,000 is easier to read than 250000.
2017-05-16 12:33:01 +01:00
Ken Tsang
114d4d84d4
Add service permissions DAO and refactor user service permission mock
2017-05-15 17:28:14 +01:00
Imdad Ahad
d993e1a43e
Don't send notification if other service attrs changed
2017-05-15 15:02:01 +01:00
Imdad Ahad
5eb02a45a5
Send go live email when service goes live
2017-05-12 14:07:06 +01:00
Leo Hemsted
348183d93b
Merge pull request #942 from alphagov/status-as-table
...
notification status as table
2017-05-10 13:54:49 +01:00
Rebecca Law
a564b9aeb0
Update /service/{}/notifications to look for a "to" query string, if it exists call the search notifications_by_to_field method.
2017-05-08 17:20:21 +01:00
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
Leo Hemsted
7e52fa4d13
add new notification_status column to models.py
...
We now have a new column in the database, but it isn't being
populated. The first step is to make sure we update this column,
while still keeping the old enum based column up to date as well.
A couple of changes have had to happen to support this - one irritating
thing is that if we're ever querying columns individually, including
`Notification.status`, then we'll need to give that column a label,
since under the hood it translates to `Notification._status_enum`.
Accessing status through the ORM (i.e., my_noti.status = 'sending' or
similar) will work fine.
2017-05-04 17:24:28 +01:00
Ken Tsang
03885fea2f
Update tests with new rates
2017-05-03 13:13:13 +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
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
Ken Tsang
aed9bc0fe7
Added tests for international sms flag
2017-04-24 13:01:13 +01:00
Imdad Ahad
c4fac1d937
Revert "Revert "add DVLA organisations to API""
2017-04-21 16:05:07 +01:00
