darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-24 01:11:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,366 Commits 128 Branches 60 Tags
c54e0d322be19d75be7985bbf9f11f204b0bd661
Commit Graph

4366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rebecca Law
c54e0d322b A little clean up 2017-12-28 10:58:15 +00:00
Richard Chapman
91e8a6df9a Merge pull request #1525 from alphagov/rc_add_sqlalchemy_config_staging 
Add back in SQLALCHEMY config changes on staging
 2017-12-22 09:14:54 +00:00
Richard Chapman
20d5a946f6 Add back in SQLALCHEMY config changes on staging 
SQL Alchemy config changes were made to decrease the downtime of the
application. The last test only had 1 min of downtime in the upgrade
period i.e. 40 mins. Tested without the config changes to double
check the change had the desired effect. Adding back in so we can test
the changes under load and performance test outside of upgrade.
 2017-12-22 08:21:53 +00:00
kentsanggds
4b90e57a66 Merge pull request #1521 from alphagov/ken-update-letters-pdf-bucket-name 
Change live-letters-pdf to production-letters-pdf
 2017-12-21 15:53:59 +00:00
Ken Tsang
3ca97f67c9 Change live-letters-pdf to production-letters-pdf 2017-12-21 14:57:37 +00:00
Richard Chapman
212476b6c7 Merge pull request #1520 from alphagov/rc_remaove_staging_sqlalchemy_config 
Revert the SQLALCHEMY config changes on staging
 2017-12-21 11:44:25 +00:00
Richard Chapman
66ae4ea9f2 Revert the SQLALCHEMY config changes on staging 
SQL Alchemy config changes were made to decrease the downtime of the
application. The last test only had 1 min of downtime in the upgrade
period i.e. 40 mins. Reverting the changes so that the same process
can be followed to ensure the changes had the desired effect.
 2017-12-21 11:31:38 +00:00
Richard Chapman
c9b3439923 Merge pull request #1514 from alphagov/rc_database_connection_settings 
Added SQLALCHEMY settings to staging for db connections
 2017-12-21 09:10:57 +00:00
Richard Chapman
018d342408 Merge branch 'master' into rc_database_connection_settings 2017-12-20 15:59:07 +00:00
Leo Hemsted
20cd2c5376 Merge pull request #1473 from alphagov/auth-err-logging 
log auth errors from the v2 api
 2017-12-20 15:02:54 +00:00
Leo Hemsted
e8967c5b05 tweak log output 2017-12-20 14:40:07 +00:00
Richard Chapman
145274b7ed Merge branch 'rc_database_connection_settings' of https://github.com/alphagov/notifications-api into rc_database_connection_settings 2017-12-20 14:23:16 +00:00
Richard Chapman
2bc4c8ac39 Added SQLALCHEMY settings to staging for db connections 
- Updated SQLALCHEMY_POOL_TIMEOUT timeout idle connections after  30 secs
- Updated SQLALCHEMY_POOL_RECYCLE to receyle the connection every 5 mins
 2017-12-20 14:22:23 +00:00
Leo Hemsted
a0b87396ef change token expiry err msg for clarity 2017-12-20 13:57:34 +00:00
Leo Hemsted
9297c6d430 log user agents on api call auth. 
this'll be useful for trying to figure out which services are using what
 2017-12-20 13:57:34 +00:00
Leo Hemsted
32a6f44d3a update tests to use new response messages 
while it doesn't strictly make sense for the error situations, these
are not typical end user errors - they're about malformed requests.
The typical use case is "api key was revoked" or similar - so that
should be the default error message
 2017-12-20 13:57:34 +00:00
Leo Hemsted
687cf8526b log service id and api key id during auth 
example log line:
```
API AuthError: AuthError({'token': ['Invalid token: signature, api token is not valid']}, 403, service_id=3e1ed7ea-8a05-4b4e-93ec-d7bebfea6cae, api_key_id=None)"
```
 2017-12-20 13:57:34 +00:00
Leo Hemsted
e0c73256a6 log auth errors from the v2 api 
(will help with tracking down client problems)
 2017-12-20 13:57:12 +00:00
Rebecca Law
5c1ab3f0c4 Merge pull request #1499 from alphagov/populate-monthly-letter-usages 
Populate monthly letter usages
 2017-12-20 11:46:06 +00:00
Richard Chapman
15b157c553 Added SQLALCHEMY settings to staging for db connections 
- Updated SQLALCHEMY_POOL_TIMEOUT timeout idle connections after  30 secs
- Updated SQLALCHEMY_POOL_RECYCLE to receyle the connection every 5 mins
 2017-12-20 11:38:47 +00:00
Rebecca Law
6fcfea7fce Merge branch 'master' of github.com:alphagov/notifications-api into populate-monthly-letter-usages 2017-12-20 09:59:30 +00:00
Venus Bailey
67b6ac54eb Merge pull request #1503 from alphagov/vb-remove-ip-whitelist 
remove ip whitelist inbound sms codes
 2017-12-19 17:14:02 +00:00
Rebecca Law
9051061519 Merge branch 'master' into populate-monthly-letter-usages 2017-12-19 16:55:22 +00:00
Venus Bailey
f0ea47aa05 Merge branch 'master' into vb-remove-ip-whitelist 2017-12-19 16:47:51 +00:00
Venus Bailey
10afdde847 Merge pull request #1511 from alphagov/vb-turn-on-mmg-blocking 
Enable MMG inbound sms blocking based on bearer tokens
 2017-12-19 16:04:09 +00:00
Venus Bailey
56722c104c Merge branch 'master' into vb-remove-ip-whitelist 2017-12-19 15:33:28 +00:00
venusbb
a35b04f5e7 Enable MMG inbound blocking 2017-12-19 15:00:51 +00:00
Rebecca Law
a559338fe9 Merge branch 'master' into populate-monthly-letter-usages 2017-12-19 14:25:43 +00:00
kentsanggds
4e548b2203 Merge pull request #1507 from alphagov/ken-add-run-letter-pdfs 
Add trigger letter pdfs for day
 2017-12-19 14:20:25 +00:00
Rebecca Law
cdbf34eddb Change order of query 2017-12-19 13:50:21 +00:00
Rebecca Law
e599db2684 Update the query 2017-12-19 13:47:24 +00:00
Rebecca Law
c5c40a0866 Merge branch 'master' into populate-monthly-letter-usages 2017-12-19 13:28:00 +00:00
Ken Tsang
8103540261 Renamed run-letter-pdfs to trigger-letter-pdfs-for-day 
- also set optional date_to_process argument for dao_get_count_of_letters_to_process_for_date to None, so it's set in the code instead
 2017-12-19 13:23:55 +00:00
Ken Tsang
b70bf1b541 Add letter tasks to manifest and queue name to config test 2017-12-19 13:23:55 +00:00
Ken Tsang
3a4b8673bc Update upload_letters_pdf to use config setting for letter processing deadline 2017-12-19 13:23:55 +00:00
Ken Tsang
88f3c17463 Trigger collate-letter-pdfs-for-day task if notis to process 2017-12-19 13:23:55 +00:00
Ken Tsang
441651bbd1 Add get_count_of_letters_to_process to notifications_dao 
- will get the letter notifications from day before >= letter processing deadline (17:30)
- letters_as_pdf permission is required in the service
 2017-12-19 13:23:55 +00:00
Alexey Bezhan
4db698b175 Merge pull request #1500 from alphagov/notification-reply-to-text-from-template 
Notification reply to text from template
 2017-12-19 11:06:42 +00:00
Venus Bailey
6fb1e3ce96 Merge branch 'master' into vb-remove-ip-whitelist 2017-12-19 10:24:46 +00:00
Alexey Bezhan
87b56567b2 Set job notifications reply_to_text from the template.reply_to 
When creating notification objects from the job sets the reply_to_text
from template's reply_to if it's present. Otherwise uses the service
default.
 2017-12-19 10:23:24 +00:00
Alexey Bezhan
a98e5247b8 Update notificaiton API endpoints to use template's reply_to 
Sets the reply_to_text on notification from the template value if
it's set.
 2017-12-19 10:23:24 +00:00
Alexey Bezhan
3b0790f950 Add Template.get_reply_to_text helper method 
Returns either template's reply_to text if set or the related field
from the default service record.

Return value can be used as default for `Notification.reply_to_text`
when per-notification value is not provided.
 2017-12-19 10:23:24 +00:00
Alexey Bezhan
8afe9aced7 Allow setting reply_to when creating a test template 2017-12-19 10:23:24 +00:00
Alexey Bezhan
da247680a4 Validate that template reply_to belongs to template's service 
Checks that email/sms/letter reply to object has the same service_id
as the template it's being attached to, to make sure it's not possible
to retrieve data about return addresses for other services.
 2017-12-19 10:23:24 +00:00
Alexey Bezhan
509441f1d9 Add validators for service_letter_contact_id and reply_to 
Validators check that service_letter_contact_id belongs to the
same service as the notification/template.

Generic reply_to validator calls the correct function for the given
type (for either notification or template). It can be used by the
template API endpoints to verify that given reply_to ID has the same
service_id as the template itself.

The original approach was to create a DB foreign key constraint,
but this caused issues with the `version_class` decorator saving
related Service objects without creating a history record.
 2017-12-19 10:23:24 +00:00
Alexey Bezhan
17c239bf3d Remove accidentally committed app/__ file 2017-12-19 10:23:24 +00:00
kentsanggds
18c4e7df43 Merge pull request #1495 from alphagov/ken-test-manifest-delivery-base 
Add test for manifest-delivery-base.yml
 2017-12-18 16:58:07 +00:00
kentsanggds
b0d0b694e4 Merge branch 'master' into ken-test-manifest-delivery-base 2017-12-18 16:51:00 +00:00
Rebecca Law
c4d869175a Add join to LetterRates for the billing query. 
Fix the yearly totals to work for letters.
 2017-12-18 16:46:59 +00:00
Alexey Bezhan
8e2f2818d7 Merge pull request #1504 from alphagov/change-reply-to-address-for-invites 
Change reply to address for invitation emails to be invitation sender
 2017-12-18 16:11:35 +00:00