Commit Graph

3677 Commits

Author SHA1 Message Date
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
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
fb85f22c2a Merge pull request #1322 from alphagov/set-accurate-created_at
Set accurate Notification.created_at
2017-10-18 13:10:46 +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
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
Chris Hill-Scott
15e7fff9ad Add to list of bad cffi versions
We blacklisted version 1.11.1 in 80c2d85508
because it caused the build to break. The bug hasn’t been fixed in the
next version, so we should ignore it too.
2017-10-16 13:40:58 +01:00
Leo Hemsted
d33c25bdac update research mode notifications after callback has been made
if the callback fails, they should still tech fail
2017-10-16 13:30:16 +01:00
Leo Hemsted
63d9fb46e7 remove ip restrictions from sms delivery receipts for now
our research mode tasks were hitting these endpoints, and getting 403s,
causing lots of unexpected exceptions.
2017-10-16 13:30:13 +01:00
Venus Bailey
87b819dd53 Merge pull request #1314 from alphagov/revert-1305-vk-free-sms-limit
Revert "[#151837054] Add new column free_sms_fragment_limit in the Services table" because of a temporary failure on PaaS
2017-10-16 13:03:54 +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
Richard Chapman
0ff80bcb76 Process Incomplete Jobs Refactor
- Moved the process_incomplete_jobs to tasks.py
- Moved the process_incomplete_jobs test to test_tasks.py
- Cleaned up imports and other code style issues.

As the new tasks is not a scheduled one, moved the the tasks.py file.
This makes it more consisted with other tasks. Updated a few code style
issues to make it more consistent with other coe and hence more
maintainable in future.
2017-10-16 12:33:39 +01:00
Richard Chapman
9e6deddbd4 Merge branch 'master' of https://github.com/alphagov/notifications-api 2017-10-16 12:33:03 +01:00
Venus Bailey
e32350967e Merge pull request #1305 from alphagov/vk-free-sms-limit
[#151837054] Add new column free_sms_fragment_limit in the Services table
2017-10-16 11:51:35 +01:00
pyup-bot
9767633bc0 Update cffi from 1.11.0 to 1.11.2 2017-10-13 19:09:14 +01:00
Richard Chapman
22b933b8f1 Merge branch 'master' of https://github.com/alphagov/notifications-api 2017-10-13 16:47:05 +01:00
Richard Chapman
0509669969 Process Incomplete Jobs
- Added a new task to process incomplete jobs
- Added tests to test the new method
- Updated the check for incomplete jobs method to start the new task

This will effectively resume tasks which for some reason were interrupted
whilst they were being processed. In some cases only some of the csv
was processed, this will find the place in the csv and continue processing
from that point.
2017-10-13 16:46:17 +01:00
kentsanggds
c110ca3f57 Merge pull request #1303 from alphagov/ken-purge-noti-to-email_reply_to
Purge notifications to email reply to rows older than 7 days
2017-10-13 15:23:58 +01:00
Richard Chapman
83585a4fdb Merge pull request #1304 from alphagov/ken-alert-missing-notis
Added alert when job.notification_count doesn't match total notification for job
2017-10-13 11:12:23 +01:00
Richard Chapman
b32b9bc344 Merge pull request #1308 from alphagov/pyup-update-flask-sqlalchemy-2.2-to-2.3.2
Update flask-sqlalchemy to 2.3.2
2017-10-13 09:27:33 +01:00
Richard Chapman
a3c8b5bbed Merge pull request #1310 from alphagov/rc_adding_logging_to_celery_tasks
Adding extra logging to celery tasks and gunicorn
2017-10-13 09:15:27 +01:00
Venus Bailey
2d5c87a185 Merge pull request #1300 from alphagov/pyup-update-sqlalchemy-utils-0.32.16-to-0.32.18
Update sqlalchemy-utils to 0.32.18
2017-10-12 17:32:22 +01:00
Rebecca Law
401e209856 Removed the new queue name as it is not needed. 2017-10-12 16:57:04 +01:00
Rebecca Law
fd2a7d3341 fix comment 2017-10-12 16:23:28 +01:00
Rebecca Law
e08690cad2 Added a new scheduled task that runs every minute, may want to run it every 3 minutes.
The tasks checks that a job is not still in progress 30 minutes after the job started processing.
2017-10-12 16:21:08 +01:00
Athanasios Voutsadakis
0b3136397b Drop api-paas.* route
This was introduced during the migration and is no longer needed nor
should it be used.
2017-10-12 14:51:04 +01:00
Katie Smith
9322ed0ca3 Add command to populate the free_sms_fragment_limit
Added a one-off command to set values of the free_sms_fragment_limit in
the services table and the services_history table to the default of
250000.
2017-10-12 13:54:43 +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
Richard Chapman
83a8277b16 Fixed Typo in Log Message
After review, fixed a typo in the log message to make it consistent
 with other messages so it can be search for in logs and used in alerts.
2017-10-12 12:31:51 +01:00
venusbb
f95282a84d Add column, free_sms_fragment_limit, to services & services_history
- Created new column in both tables
- Modified model and Service schema
- Modifed existing test
2017-10-12 12:16:13 +01:00