Leo Hemsted
2aae0f9300
Merge pull request #1085 from alphagov/celery4
...
Celery 4 (attempt 2)
2017-07-13 11:54:32 +01:00
Leo Hemsted
1a03248317
temp fix to sort out circular imports
2017-07-12 13:02:19 +01:00
Martyn Inglis
0e9e8955f7
Finished celery refactor - set up config for queue prefix
...
LEO notes: Also made sure the Test BROKER_URL is preserved so that
tests warn you when celery isn't mocked out
2017-07-12 12:37:18 +01:00
Ken Tsang
0c77f2d010
Refactored dao_update_organisation
2017-07-12 12:01:50 +01:00
Ken Tsang
106d59006b
Removed dao_update_organisation
2017-07-12 12:01:50 +01:00
Ken Tsang
af9091f207
Refactor tests to use admin_request
2017-07-12 12:01:50 +01:00
Ken Tsang
3b1f229384
Renamed migration script and refactor code
2017-07-12 12:01:50 +01:00
Ken Tsang
b814c5ff26
Refactor organisation rest to remove marshmallow
2017-07-12 12:01:50 +01:00
Ken Tsang
12e6cd0a8f
Add test for missing data
2017-07-12 12:01:50 +01:00
Ken Tsang
2f8bc0feae
Add create and update fns for organisation dao
2017-07-12 12:01:50 +01:00
Ken Tsang
f76962ad4d
Add versioning to Organisations
2017-07-12 12:01:50 +01:00
Ken Tsang
37df051c32
Updated Organisations DAO
2017-07-12 12:01:50 +01:00
Ken Tsang
c743e52fe8
Add organisations model and create dao
2017-07-12 12:01:50 +01:00
Rebecca Law
a01163d719
Merge pull request #1077 from alphagov/drop-template_stats-table
...
Remove the archived table template_statistics.
2017-07-12 10:41:32 +01:00
Leo Hemsted
7f883f1355
don't store non-strings to os.environ
...
in tests, we were replacing os.environ with a basic dict so that
we didn't overwrite the contents of the real environment during tests.
However, os.environ doesn't accept non-str values, so this commit
changes the fixture so that it asserts all values set are strings.
We needed to change how we store ip whitelist stuff in the env because
of this.
2017-07-11 15:41:44 +01:00
venusbb
5d57189187
changed name of test fixture
2017-07-11 09:50:09 +01:00
venusbb
6b650c6d96
changed name of test fixture
2017-07-11 09:33:56 +01:00
venusbb
5089a4d53b
retrieve sms ip whitelist from credentials on paas
2017-07-10 17:03:43 +01:00
Imdad Ahad
44c5831f3d
Remove old status schema references
2017-07-10 15:50:57 +01:00
Rebecca Law
8a01a76e33
Remove the archived table template_statistics. The last time the table we updated was August 30 2016, it's safe to say we are done with it.
...
I updated the InboundSms and TemplateRedacted model to include an index in the db.
Dropped service_permissions.updated_at column since we are not auditting the table
2017-07-10 14:43:46 +01:00
Imdad Ahad
a9c1338873
Remove Notification, NotificationHistory status labels:
...
Replace labels by adding a key kwarg in the model for status.
We still need this as sqlalchemy attmempts to look for `notification_status`
on the model (Notification/NotificationHistory). To achieve true ORM mapping
(map status -> notification_status) we need the key kwarg.
More here:
http://docs.sqlalchemy.org/en/latest/core/metadata.html#sqlalchemy.schema.Column#key
2017-07-10 14:09:30 +01:00
Imdad Ahad
c8c47f44a9
Don't update older status in timeout notifications task
2017-07-10 14:09:30 +01:00
Imdad Ahad
ac9eb29707
Revert "Revert "1/4 Stop updating old Notification status column""
2017-07-10 14:09:30 +01:00
Ken Tsang
8b04039a5a
Refactor to abstract inbound_sms perms check
2017-07-06 12:31:02 +01:00
Ken Tsang
3372fe6b18
Refactored test
2017-07-06 12:31:01 +01:00
Ken Tsang
5efe4d59ec
Improved test to include check on log
2017-07-06 12:31:01 +01:00
Ken Tsang
f028dab252
Removed firetext params
2017-07-06 12:31:01 +01:00
Ken Tsang
e96a67c59b
Firetext tests
2017-07-06 12:31:01 +01:00
Ken Tsang
5a82fe0a70
Add inbound sms permission check
2017-07-06 12:31:01 +01:00
venusbb
1d8d6b1ef1
Add list of IP address that X-Forwarded-For return to add more visibility to the traffic
2017-07-06 12:31:00 +01:00
venusbb
a307fa6dcd
Check ip unit test and modify ways to parse IP address
2017-07-06 12:30:09 +01:00
venusbb
c182ceca90
Check ip unit test and modify ways to parse IP address
2017-07-06 12:30:08 +01:00
Imdad Ahad
f0ffbad77d
Fix syncing issue with Notification statuses:
...
The timeout_notifications job runs daily and does not correctly
update both the status fields to keep them in sync.
2017-07-06 12:30:08 +01:00
Imdad Ahad
b94a463911
Revert "1/4 Stop updating old Notification status column"
2017-07-06 12:30:08 +01:00
Imdad Ahad
c7ea6ba116
Update tests to use set() otherwise is possible to fail
2017-07-06 12:30:07 +01:00
Imdad Ahad
28b17b7716
Cleanup/remove unncessary tests
2017-07-06 12:30:07 +01:00
Leo Hemsted
38bb4ad6c2
notification.personalisation now always returns an empty dict
...
There are a variety of ways a notification can be created - via the
API, via CSV, via one-off messages, via the same but sent as a test -
the point is, there are lots of entry points, and lots of inconsistency
about how personalisation may be sent in. If there are no
personalisation options in the template, we may get either `None` or
`{}` - if the value is None, to avoid an error in our encryption lib,
we just store None in the database.
THIS ENDS NOW!
We've had some problems on the front-end that is caused by
notifications having the `None` value. This commit changes the
personalisation property getter and setter to store/return `{}`
rather than None.
2017-07-06 12:30:07 +01:00
Ken Tsang
23618a186c
Further refactoring
2017-07-06 12:27:57 +01:00
Ken Tsang
0b3277b8a4
Refactored to make code clearer
2017-07-06 12:27:57 +01:00
Ken Tsang
e0fbcb0dc6
Add permission check in for v2 post notification
2017-07-06 12:27:57 +01:00
Ken Tsang
46a55c1cdb
Refactor code
2017-07-06 12:27:57 +01:00
Ken Tsang
e927723726
Update sms/email permission tests error msg
2017-07-06 12:27:57 +01:00
Ken Tsang
50066c6753
Prevent template creation or update w/o permission
2017-07-06 12:27:56 +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
b04d01ba27
Refactored code to use new service permissions only
2017-07-06 12:27:55 +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
Rebecca Law
3e45f7d71f
Refactor test so that it does not have to change every time we add a new organisation.
2017-07-06 12:27:55 +01:00
Rebecca Law
49917ccafd
Add redact_personalisation to TemplateSchema
2017-06-29 18:16:03 +01:00
