Skip to content

Commit d0a8c6d

Browse files
authored
Add UPLOAD_DOCUMENT to default service perms (#2956)
* Add `UPLOAD_DOCUMENT` to default service perms * Fix tests
1 parent bca08a9 commit d0a8c6d

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

app/dao/services_dao.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
NHS_ORGANISATION_TYPES,
3030
NON_CROWN_ORGANISATION_TYPES,
3131
SMS_TYPE,
32+
UPLOAD_DOCUMENT,
3233
AnnualBilling,
3334
ApiKey,
3435
FactBilling,
@@ -61,6 +62,7 @@
6162
SMS_TYPE,
6263
EMAIL_TYPE,
6364
INTERNATIONAL_SMS_TYPE,
65+
UPLOAD_DOCUMENT,
6466
]
6567

6668

tests/app/dao/test_services_dao.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
KEY_TYPE_TEST,
5555
LETTER_TYPE,
5656
SMS_TYPE,
57+
UPLOAD_DOCUMENT,
5758
ApiKey,
5859
InvitedUser,
5960
Job,
@@ -646,6 +647,7 @@ def test_create_service_returns_service_with_default_permissions(notify_db_sessi
646647
SMS_TYPE,
647648
EMAIL_TYPE,
648649
INTERNATIONAL_SMS_TYPE,
650+
UPLOAD_DOCUMENT,
649651
),
650652
)
651653

@@ -658,14 +660,12 @@ def test_create_service_returns_service_with_default_permissions(notify_db_sessi
658660
(
659661
EMAIL_TYPE,
660662
INTERNATIONAL_SMS_TYPE,
663+
UPLOAD_DOCUMENT,
661664
),
662665
),
663666
(
664667
EMAIL_TYPE,
665-
(
666-
SMS_TYPE,
667-
INTERNATIONAL_SMS_TYPE,
668-
),
668+
(SMS_TYPE, INTERNATIONAL_SMS_TYPE, UPLOAD_DOCUMENT),
669669
),
670670
],
671671
)
@@ -699,7 +699,7 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
699699
dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE)
700700

701701
service = dao_fetch_service_by_id(service.id)
702-
_assert_service_permissions(service.permissions, (SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE))
702+
_assert_service_permissions(service.permissions, (SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE, UPLOAD_DOCUMENT))
703703

704704
dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE)
705705
service = dao_fetch_service_by_id(service.id)
@@ -710,6 +710,7 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
710710
SMS_TYPE,
711711
EMAIL_TYPE,
712712
INTERNATIONAL_SMS_TYPE,
713+
UPLOAD_DOCUMENT,
713714
),
714715
)
715716

@@ -862,6 +863,7 @@ def test_delete_service_and_associated_objects(notify_db_session):
862863
SMS_TYPE,
863864
EMAIL_TYPE,
864865
INTERNATIONAL_SMS_TYPE,
866+
UPLOAD_DOCUMENT,
865867
)
866868
)
867869

tests/app/service/test_rest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
KEY_TYPE_TEST,
3434
LETTER_TYPE,
3535
SMS_TYPE,
36+
UPLOAD_DOCUMENT,
3637
EmailBranding,
3738
InboundNumber,
3839
Notification,
@@ -295,6 +296,7 @@ def test_get_service_list_has_default_permissions(admin_request, service_factory
295296
EMAIL_TYPE,
296297
SMS_TYPE,
297298
INTERNATIONAL_SMS_TYPE,
299+
UPLOAD_DOCUMENT,
298300
]
299301
)
300302
for json in json_resp["data"]
@@ -309,6 +311,7 @@ def test_get_service_by_id_has_default_service_permissions(admin_request, sample
309311
EMAIL_TYPE,
310312
SMS_TYPE,
311313
INTERNATIONAL_SMS_TYPE,
314+
UPLOAD_DOCUMENT,
312315
]
313316
)
314317

0 commit comments

Comments
 (0)