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
Sakis
f6cdfdb640
Merge pull request #1330 from alphagov/temporary-syslog-drain
...
Add syslog drain service to preview and staging
2017-10-20 14:52:02 +01:00
Katie Smith
3072c66d5f
Merge pull request #1329 from alphagov/delete-unused-celery-tasks
...
Remove unused Celery tasks
2017-10-20 14:50:04 +01:00
Rebecca Law
4675b91763
Merge pull request #1325 from alphagov/add-update-multiple-sms-sender
...
Add update multiple SMS senders for a service
2017-10-20 14:06:53 +01:00
Athanasios Voutsadakis
202a0d008b
Add syslog drain service to preview and staging
...
This should and will be moved back to the approriate manifest-base-*.yml
files when it is configured for production usage.
2017-10-19 17:08:56 +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
Katie Smith
ce28e84af6
Remove unused tasks
...
Deleted three Celery tasks (send-email, send-sms and persist-letter).
These are not being used anymore - we replaced them in commit
0c9a4bce59
2017-10-19 16:17:25 +01:00
Katie Smith
4e1d87bbb4
Merge pull request #1327 from alphagov/create-new-tasks-for-saving-notifications
...
Add celery tasks- save_sms, save_email, save_letter
2017-10-19 16:08:04 +01:00
Rebecca Law
d975f30888
Fix merge conflict
2017-10-19 14:39:53 +01:00
Rebecca Law
954a80649e
Merge branch 'master' into add-update-multiple-sms-sender
2017-10-19 14:34:58 +01:00
Venus Bailey
61bda438a4
Merge pull request #1326 from alphagov/vb-free-sms-limit-history
...
[#152067121 ] Create new table annual_billing
2017-10-19 14:33:44 +01:00
venusbb
b0872d9466
add unique service_id&year constraint
2017-10-19 14:21:10 +01:00
Rebecca Law
2193afe9a3
Remove 'data' from the json being returned.
2017-10-19 13:59:22 +01:00
Rebecca Law
cee916c68a
As per review commemnts:
...
- Add the assert to a test - oops.
- Fix typo in error message.
2017-10-19 13:51:33 +01:00
venusbb
7e78e19500
Unique constrain and db.relationship
2017-10-19 12:00:01 +01:00
venusbb
b9bae4f264
Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history
2017-10-19 11:28:46 +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
Katie Smith
0c9a4bce59
Add celery tasks- save_sms, save_email, save_letter
...
Created three new celery tasks:
* save_sms (will replace send_sms)
* save_email (will replace send_email)
* save_letter (will replace persist_letter)
The difference between the new tasks and the tasks they are replacing is
that we no longer pass in the datetime as a parameter.
The code has been changed to use the new tasks, and the tests now run
against the new tasks too. The old tasks will need be removed in a separate
commit.
2017-10-18 17:00:37 +01:00
venusbb
6e22a33c42
Fix some problematic code style.
2017-10-18 15:41:00 +01:00
venusbb
b2fa7cdd83
create new table annual_billing
2017-10-18 15:35:51 +01:00
venusbb
5b2912c0f5
create new table annual_billing
2017-10-18 15:09:35 +01:00
Rebecca Law
4ac2dc3606
Fix code style
2017-10-18 13:17:52 +01:00
Rebecca Law
4ca6fbc724
Added dao methods needed to add or update multiple sms senders for a service.
...
Remove the unique constraint for service on the ServiceSmsSender model.
2017-10-18 13:13:23 +01:00
Rebecca Law
fb85f22c2a
Merge pull request #1322 from alphagov/set-accurate-created_at
...
Set accurate Notification.created_at
2017-10-18 13:10:46 +01:00
Rebecca Law
1a463cba1f
Merge branch 'master' into add-update-multiple-sms-sender
2017-10-18 11:18:44 +01:00
Chris Hill-Scott
92b50a26d3
Merge pull request #1298 from alphagov/organisation-type
...
Store organisation type against each service
2017-10-18 10:56:56 +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
Rebecca Law
f52ec2c406
Added an order by to the check_job_status query. The test was failing intermittently
2017-10-18 09:50:39 +01:00
Rebecca Law
edba490c72
Remove unique constraint for ServiceSmsSenders.
...
This will allow a service to have multiple sms senders.
2017-10-17 16:53:13 +01:00
Rebecca Law
809c5fc055
Remove unique constraint for ServiceSmsSenders.
...
This will allow a service to have multiple sms senders.
2017-10-17 16:49:50 +01:00
Rebecca Law
baab9dd86f
Merge pull request #1321 from alphagov/remove-delivery_status
...
Removed the _delivery_status endpoint
2017-10-17 16:43:55 +01:00
Rebecca Law
24a87d8260
Small change to use the current datetime stamp for the Notification.created_at timestamp rather than the job.created_at start date. This will give us better more reflective data.
2017-10-17 16:05:31 +01:00
Rebecca Law
5aa37f09b6
Removed the _delivery_status endpoint.
...
The test this status check was doing does not reflect real traffic of Notify. It is typical for messages to be in 'sending' for a while (people turn off their phone for example).
2017-10-17 15:51:42 +01:00
Leo Hemsted
b384b13213
Merge pull request #1320 from alphagov/leohemsted-patch-1
...
log json to stdout
2017-10-17 15:44:43 +01:00
Leo Hemsted
bfb54a3b98
Merge pull request #1319 from alphagov/pyup-update-sqlalchemy-utils-0.32.18-to-0.32.19
...
Update sqlalchemy-utils to 0.32.19
2017-10-17 15:42:33 +01:00
Leo Hemsted
4d7098c5fd
Merge pull request #1312 from alphagov/pyup-update-cffi-1.11.0-to-1.11.2
...
blacklist 1.11.0 and 1.11.2 of cffi
2017-10-17 15:42:16 +01:00
Leo Hemsted
7817fe1221
log json to stdout
2017-10-17 14:23:02 +01:00
Richard Chapman
5de0f46979
Merge pull request #1313 from alphagov/rc_process_missing_rows_in_csv
...
Process Incomplete Jobs, if a job have been discovered to be incomplete.
2017-10-17 12:35:34 +01:00
Leo Hemsted
6534be47dc
Merge pull request #1318 from alphagov/email-validation
...
ensure emails are formatted before sending
2017-10-17 11:46:23 +01:00
Richard Chapman
543535e2af
Process Incomplete Jobs Updates
...
Comments are PR review. Updated code style in a few places to make it
more consistent with other code, added tests for letters and emails
so they are testedt, refactored some database queries to dao file
- Fixed code style
- Refactored database queries to dao code
- Added tests for emails and sms.
2017-10-17 11:07:36 +01:00
pyup-bot
6d94e43066
Update sqlalchemy-utils from 0.32.18 to 0.32.19
2017-10-17 10:02:17 +01:00
Leo Hemsted
5ad6bc7621
ensure emails are formatted before sending
...
we allow some invalid to addresses - for example, phone numbers with
spaces or brackets - in the database. This is so that users can match
up their data in a format that they expect (since they passed it in).
When we send SMS, we strip this formatting just before sending - but we
weren't with email. This commit changes that and adds some tests.
It also adds formatting for reply_to addresses. We should never expect
invalid reply_to email addresses in our data, but just in case, lets
validate them here.
Also, bump requirements.txt to capture some more email validation
2017-10-16 17:29:45 +01:00
Venus Bailey
45ecab00e3
Merge pull request #1317 from alphagov/revert-1314-revert-1305-vk-free-sms-limit
...
Revert "Revert "[#151837054 ] Add new column free_sms_fragment_limit in the Services table""
2017-10-16 16:37:19 +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
Sakis
e9b76d7d75
Merge pull request #1311 from alphagov/remove-unnecessary-routes
...
Drop api-paas.* route
2017-10-16 16:19:56 +01:00
Leo Hemsted
75610682c3
Merge pull request #1316 from alphagov/callback-fix
...
reset notification to created if fake callback throws exception
2017-10-16 15:50:02 +01:00
Leo Hemsted
19bb0d157d
reset notification to created if fake callback throws exception
...
else we ignore it when retrying
2017-10-16 15:49:13 +01:00
Leo Hemsted
fd5aa7dd0a
Merge pull request #1315 from alphagov/callback-ip-whitelist
...
Remove ip whitelist from callbacks
2017-10-16 13:55:06 +01:00
