Rebecca Law
f1f2e5cd90
Fix the results to be returned in the same format that the admin app expects.
2017-10-23 15:06:11 +01:00
Rebecca Law
bfb8528ea9
The /platform-admin takes a long time, probably because the marshmallow schema used joins to the service table to return all the service data and is inefficient.
...
The query itself has not been improved much at all but by not using a marshmallow schema I hope to get the performance gain I am looking for.
2017-10-23 10:58:06 +01:00
Rebecca Law
d1c9335307
If the add sms sender is for an inbound number use the number from the inbound number object, rather than the value passed in.
2017-10-19 16:29:54 +01:00
Rebecca Law
2193afe9a3
Remove 'data' from the json being returned.
2017-10-19 13:59:22 +01:00
Rebecca Law
709e24e267
Added endpoints to get sms senders for a service
2017-10-19 10:43:49 +01:00
Rebecca Law
6dc41c3b47
New endpoints to add and update multiple SMS sender for a service.
2017-10-19 09:58:23 +01:00
Chris Hill-Scott
2a5e6c2d0c
Store organisation type against each service
...
> So that we can default services to their appropriate text allowance,
> we need to find out what sector they're in. So let's start collecting
> that from teams as they create new services.
In order to work out what a team’s allowance should be, we need to know
what part of government they’re from. We’re going to do this logic in
the admin app and then `POST` the allowance to the API.
So all we need to do with the information that the users give us is
store it against the service, so we have a record. Doesn’t need any
logic doing as a result of it, doesn’t need foreign keying to the
organisations table, etc.
2017-10-18 10:49:31 +01:00
Venus Bailey
9b60d69931
Revert "Revert "[ #151837054 ] Add new column free_sms_fragment_limit in the Services table""
2017-10-16 16:24:34 +01:00
Venus Bailey
616a6f8ef8
Revert "[ #151837054 ] Add new column free_sms_fragment_limit in the Services table"
2017-10-16 12:43:05 +01:00
Katie Smith
2001bfca36
Set free_sms_fragment_limit when creating a service
...
The free_sms_fragment_limit of a service is set when the service is
created. If a value for the free_sms_fragment_limit is not given, the
default value is used.
2017-10-12 13:54:43 +01:00
Rebecca Law
e23638ed78
Added a test for when the reply to email id does not exist
2017-10-12 09:34:37 +01:00
Rebecca Law
769a7a275b
Insert a row for the mapping of notification to email_reply_to for one off notifications.
2017-10-11 16:23:31 +01:00
venusbb
5e2bf4cd32
Add new POST /<uuid:service_id>/letter-contact/<uuid:letter_contact_id> end point
2017-10-04 15:35:41 +01:00
Katie Smith
158e2ea181
Add endpoint to add new letter contact block
...
Added the '/<uuid:service_id>/letter-contact' service endpoint.
2017-10-04 15:31:45 +01:00
venusbb
212ce302c8
Add get letter contact by id endpoint
...
Added the GET /<uuid:service_id>/letter-contact/<uuid:letter_contact_id>
endpoint for returning a letter contact for a service with the letter contact id
Added the DAO for returning a letter contact by id
2017-10-04 12:26:38 +01:00
Katie Smith
1fa1ebb96f
Add endpoint to return all letter contact blocks
...
Added the GET '/<uuid:service_id>/letter-contact' endpoint for returning
all letter contact blocks for a service.
Updated the DAO for service letter contacts to return the default letter
contact first.
2017-10-04 11:26:27 +01:00
venusbb
9a5addb896
Reverse codes that uses filtering of trial mode services
2017-10-02 12:00:52 +01:00
Katie Smith
f90a10ab38
Merge pull request #1277 from alphagov/imdad-katie-store-multiple-letter-contacts
...
[2/4] Upsert into ServiceLetterContact table when updating a service
2017-10-02 10:23:20 +01:00
Imdad Ahad
f0784109a1
Upsert into letter contact table when updating a service's letter contact block
2017-09-25 16:01:24 +01:00
venusbb
4e991c26a2
Progress: Filtered day completed
2017-09-22 15:39:53 +01:00
Rebecca Law
795bd4271c
New endpoint to fetch a single reply-to email address by id
2017-09-21 17:02:58 +01:00
Rebecca Law
0c9f16a8d1
Add id and service_id to the serialize method on ServiceEmailReplyTo
2017-09-21 10:21:32 +01:00
Rebecca Law
06ffac9a0f
Merge branch 'master' into use-reply-to-from-new-table
2017-09-20 14:00:04 +01:00
Rebecca Law
c6bf38e869
- is_default is required on the add_service_email_reply_to_request schema
...
- Added check that the service exists for the POST reply-to methods.
- Added tests
2017-09-20 11:58:18 +01:00
Rebecca Law
a53a0da414
[WIP] need to fix the tests
2017-09-20 10:45:35 +01:00
Rebecca Law
6b2c2962c9
New endpoint to insert new service reply to email address and update existing one.
2017-09-14 17:54:38 +01:00
Katie Smith
72760550bd
Add endpoint to get the email reply to addresses for a service
...
- Changed the dao_get_reply_to_by_service_id method to return a list of
results.
- Added a GET /service/<service_id>/email-reply-to endpoint
2017-09-13 16:58:36 +01:00
Rebecca Law
3779f9d1df
Merge branch 'master' into updating-service_sms_senders
2017-09-12 12:11:38 +01:00
Rebecca Law
d356957974
Change the ServiceEmailReplyTo model to uselist for the backref to services (allow 0 to many reply to emails)
...
Add another assert in the test
2017-09-12 10:14:58 +01:00
Katie Smith
269e88f7de
Update reply to email test
...
- Updated reply to email test so that the request to create or update
email is not mocked.
- Excluded reply_to_email_addresses from the Service schema
2017-09-12 09:07:34 +01:00
Rebecca Law
f624f4f033
Insert and update methods for service_sms_sender
2017-09-11 17:40:37 +01:00
Imdad Ahad
6d0ad75a60
Upsert to new email reply to table when updating a service
2017-09-08 14:56:05 +01:00
Rebecca Law
e32abb0ada
Merge pull request #1221 from alphagov/ken-no-letters-when-trial
...
Stop letters when service is in trial
2017-09-05 15:33:50 +01:00
Rebecca Law
19f964a90b
Added a check that the call is not using a test api key.
...
Removed the tests for trial mode service for the scheduled tasks and the process job.
Having the validation in the POST notification and create job endpoint is enough.
Updated the test_service_whitelist test because the order of the array is not gaurenteed.
2017-09-04 17:24:41 +01:00
Imdad Ahad
e39c202a01
Merge pull request #1195 from alphagov/imdad-refactor-remove-unused-billing-code
...
Remove unused billing usage code
2017-08-31 10:39:12 +01:00
Imdad Ahad
e1ef0e85c6
Remove monthly usage dao methods
2017-08-30 14:40:54 +01:00
Imdad Ahad
9478af0941
Remove get yearly usage endpoint
2017-08-30 14:37:27 +01:00
Chris Hill-Scott
26f50af6e9
Let whitelist and user have int. phone numbers
...
On the frontend, we’re letting users register with international phone
numbers. So we shouldn’t block users from doing this on the API side.
Same thing for the whitelist, where we’re also allowing international
phone numbers now.
2017-08-30 10:55:18 +01:00
Rebecca Law
17f62723fa
Removed unused endpoint and dao methods.
2017-08-24 16:09:48 +01:00
Leo Hemsted
c2152f9cb8
remove billable-units endpoint
...
it wasn't used anywhere, and the return value changed when flask was upgraded
2017-08-21 10:57:15 +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
Imdad Ahad
ae76fd0f30
Small refactor to a test
2017-08-11 16:57:18 +01:00
Rebecca Law
1ec6a3b73d
Created a new service endpoint that checks if the service name or email_from is unique.
...
Why is this needed?
When a user updates a service name they enter the new name in a form, are then asked to confirm the change by entering their password. Then the API call to update_service is called. If we let the update serivce API call fail with the integrity constraint it will be ackward for the user.
2017-08-09 15:12:52 +01:00
Leo Hemsted
372b10f19c
fix up tests to be internally consistent
...
notifications should always have at least one of job and api key, and
the key type should match the api key's key type (or be 'normal')
2017-08-02 15:35:56 +01:00
Leo Hemsted
6c61a3fc2a
Revert celery4
...
Revert the following three pull requests:
https://github.com/alphagov/notifications-api/pull/1085
https://github.com/alphagov/notifications-api/pull/1086
https://github.com/alphagov/notifications-api/pull/1088
celery 4.0.2 looked promising, however, on staging under mild load
(5/sec api calls) the performance was actually worse than 3.1.25
2017-07-19 15:17:19 +01:00
Leo Hemsted
1a03248317
temp fix to sort out circular imports
2017-07-12 13:02:19 +01:00
Ken Tsang
542bbb2f34
Refactor code
2017-07-06 12:27:56 +01:00
Ken Tsang
c1caa4a5da
Add tests for when email / sms disabled
2017-07-06 12:27:56 +01:00
Ken Tsang
98cd838510
ken-use-only-new-service-permissions
2017-07-06 12:27:55 +01:00
Imdad Ahad
42a061cb7b
Add test to check personalisation and refactor existing test
2017-07-06 12:27:55 +01:00
