Leo Hemsted
57b7cb8d24
Merge pull request #986 from alphagov/create-service-bug
...
separate service deserialization from validation
2017-05-25 10:52:38 +01:00
Leo Hemsted
4b8b6ca91e
add test to ensure that updating other things doesnt affect sms sender
2017-05-25 10:37:17 +01:00
Leo Hemsted
554a193cff
separate service deserialization from validation
...
Marshmallow validates and deserialises - BUT, when it deserialises,
it explicitly sets `sms_sender=None`, even when you haven't passed
sms_sender in. This is problematic, because we wanted to take advantage
of sqlalchemy's default value to set sms_sender to `GOVUK` when the
actual DB commit happens.
Instead, still use marshmallow for validating, but manually carry out
the json deserialisation in the model class.
This fixes a bug that only manifested when the database was upgraded,
but the code hadn't updated. 🎉
2017-05-24 16:27:12 +01:00
Imdad Ahad
c986b88e21
Merge pull request #979 from alphagov/imdad-migration-add-normalised-to-notification
...
Add normalised_to field to notification
2017-05-24 16:21:15 +01:00
minglis
8a2715e3e1
Merge pull request #980 from alphagov/change-delete-jobs-to-delete-by-type
...
Change delete jobs to delete by type
2017-05-24 12:35:04 +01:00
Rebecca Law
180a212853
Merge pull request #970 from alphagov/server-command-for-db-update
...
Create a server command to run custom db scripts.
2017-05-24 09:16:44 +01:00
Leo Hemsted
c5816ee412
Merge pull request #982 from alphagov/revert-977-non-null-sender
...
Revert "Non null sender"
2017-05-23 16:33:18 +01:00
Leo Hemsted
e9b1fd4dde
Revert "Non null sender"
2017-05-23 16:32:03 +01:00
Leo Hemsted
1cd94e3d3d
Merge pull request #977 from alphagov/non-null-sender
...
Non null sender
2017-05-23 16:08:56 +01:00
Rebecca Law
54f7e732d9
Fix typo
2017-05-23 15:36:33 +01:00
Martyn Inglis
a751637eaa
Added the schedule into celery beat.
...
run the delete jobs 20 mins apart,
00:00 -> sms
00:20 -> email
00:40 -> letters
2017-05-23 13:41:22 +01:00
Martyn Inglis
a5c71ea907
New task to use the new DAO method to delete the data by type
2017-05-23 13:40:36 +01:00
Martyn Inglis
aaa0f763a1
Updated delete notifications over a week old query
...
- PREVIOUS
based on status. so as we add new status we have some orphaned rows, as these delete queries would miss them
- NOW
based on type. In effect they do the same thing, deleting emails, sms or letters older than a week old irrespective of status. Can see is iterating on this to have more granularity say for letters, so split up. Also means that the delete action isn't so big, as we half the affected rows, by doing it by type.
2017-05-23 13:40:15 +01:00
Rebecca Law
6536177ac2
Added the delete query for notifications
2017-05-23 13:35:15 +01:00
Rebecca Law
8a08773cae
Merge branch 'master' into server-command-for-db-update
2017-05-23 13:25:47 +01:00
Imdad Ahad
c9045b9494
Merge pull request #972 from alphagov/imdad-fix-test-can-cause-error
...
Fix test that doesn't account for notifications being created in a di…
2017-05-23 13:13:59 +01:00
Imdad Ahad
d745df3f44
Fix test that doesn't account for notifications being created in a different order
2017-05-23 12:50:26 +01:00
Leo Hemsted
afd748bab2
test no longer applicable as null sms_sender is an error now
2017-05-23 11:43:23 +01:00
Leo Hemsted
47560515dc
add upgrade script to remove non-null values from the sender column
2017-05-23 11:33:43 +01:00
Leo Hemsted
147c50f87b
set sms_sender to be 'GOVUK' if not otherwise specified
...
this is a precursor to making the column non-nullable
2017-05-23 11:33:31 +01:00
Leo Hemsted
f899d74325
Merge pull request #973 from alphagov/40604-or-govuk
...
treat 40604 and GOVUK as not having a sender ID
2017-05-23 11:29:33 +01:00
Leo Hemsted
86c9600b04
use config to get default sender rather than hardcoding
...
this means that on non-prod envs, it reflects that environment.
it needs to be a lamdba, because the column object is created at import
time, when current_app.config won't have been loaded - this means that
when you create a Service object, that lambda executes and grabs the
correct default value
2017-05-23 11:12:37 +01:00
Imdad Ahad
24dfcd2128
Add normalised_to field to notification
2017-05-23 10:44:39 +01:00
kentsanggds
82c0d6a98e
Merge pull request #978 from alphagov/ken-refactor-service_permissions-data_model-inc-updated_at
...
Ken refactor service permissions data model inc updated at
2017-05-22 18:08:42 +01:00
Ken Tsang
3d2c12128b
Update services test
2017-05-22 17:27:26 +01:00
Ken Tsang
112071a31e
Merge branch 'ken-refactor-service_permissions-data_model-inc-updated_at' of https://github.com/alphagov/notifications-api into ken-refactor-service_permissions-data_model-inc-updated_at
2017-05-22 17:26:04 +01:00
Ken Tsang
de7ad6fb95
Refactored service_permissions data model
2017-05-22 17:25:58 +01:00
Ken Tsang
88215f4062
Removed drop columns from service_permissions table
2017-05-22 17:13:50 +01:00
Leo Hemsted
2535a7fe98
set sms_sender to be 'GOVUK' if not otherwise specified
...
this is a precursor to making the column non-nullable
2017-05-22 17:13:35 +01:00
Leo Hemsted
3744463296
treat 40604 and GOVUK as not having a sender ID
...
in prep for removing the 40604-as-default, first we need to make sure
that if you either have GOVUK or None as your sms sender, then we send
GOVUK through to the provider
2017-05-22 17:10:07 +01:00
Ken Tsang
111e9df000
Removed drop columns from service_permissions table
2017-05-22 16:56:43 +01:00
kentsanggds
566166fcbf
Merge pull request #974 from alphagov/revert-969-ken-refactor-service_permissions-data_model
...
Revert "Refactored service permissisons data model"
2017-05-22 16:40:14 +01:00
kentsanggds
f5d3eed7e0
Revert "Refactored service permissisons data model"
2017-05-22 16:05:31 +01:00
kentsanggds
39f23c6189
Merge pull request #969 from alphagov/ken-refactor-service_permissions-data_model
...
Refactored service permissisons data model
2017-05-22 14:08:15 +01:00
Ken Tsang
052004bef0
Refactored data model to remove cascade
2017-05-22 13:33:43 +01:00
Imdad Ahad
47f361037e
Merge pull request #968 from alphagov/imdad-fix-parse-json-properly-sns-callback
...
Fix issue with parsing JSON in SNS callback
2017-05-22 11:18:35 +01:00
Ken Tsang
28ef9a1853
Refactored service permissisons data model
2017-05-22 10:58:41 +01:00
Imdad Ahad
02db3be37c
General refactor
2017-05-22 10:12:18 +01:00
Rebecca Law
2e864411af
Create a server command to run custom db scripts.
2017-05-19 17:04:39 +01:00
Rebecca Law
35e9abe8b5
Merge pull request #965 from alphagov/revert-964-update-international
...
Revert "Script to update the international flag from null to false"
2017-05-19 12:22:35 +01:00
Rebecca Law
315e776ebb
Revert "Script to update the international flag from null to false"
2017-05-19 12:22:05 +01:00
Rebecca Law
f00dbfa34f
Merge pull request #964 from alphagov/update-international
...
Script to update the international flag from null to false
2017-05-19 10:54:48 +01:00
Rebecca Law
069cf35878
Script to update the international flag from null to false
2017-05-19 10:31:36 +01:00
Imdad Ahad
0e0c18583f
Fix test data and how we parse the JSON
2017-05-19 10:16:48 +01:00
Rebecca Law
e2b5bb613b
Merge pull request #963 from alphagov/revert-949-update-international
...
Revert "Script to update international flag 10,000 rows at a time."
2017-05-18 15:46:22 +01:00
Rebecca Law
9b79ac2189
Revert "Script to update international flag 10,000 rows at a time."
2017-05-18 15:45:50 +01:00
Rebecca Law
6d9a32bda1
Merge pull request #949 from alphagov/update-international
...
Script to update international flag 10,000 rows at a time.
2017-05-18 14:47:18 +01:00
Rebecca Law
097510b029
Testing the update script
2017-05-18 14:28:49 +01:00
Rebecca Law
a75db81334
Fix name condflicts with migration script
2017-05-18 13:12:05 +01:00
minglis
da6a6f6641
Merge pull request #959 from alphagov/comma-format-message-limit
...
Comma-format number when emailing live services
2017-05-18 11:06:24 +01:00
