File tree 3 files changed +17
-14
lines changed
3 files changed +17
-14
lines changed Original file line number Diff line number Diff line change 1
- from django_filters import CharFilter
2
1
from django_filters .rest_framework import FilterSet
3
2
4
- from mysagw .filters import CharMultiValueFilter , UUIDMultiValueFilter
3
+ from mysagw .filters import UUIDMultiValueFilter
5
4
6
5
from . import models
7
6
8
7
9
8
class CaseAccessFilterSet (FilterSet ):
10
- idp_id = CharFilter (field_name = "identity__idp_id" )
11
9
case_ids = UUIDMultiValueFilter (field_name = "case_id" )
12
- idp_ids = CharMultiValueFilter (field_name = "identity__idp_id " )
10
+ identity_ids = UUIDMultiValueFilter (field_name = "identity_id " )
13
11
14
12
class Meta :
15
13
model = models .CaseAccess
16
- fields = ["idp_id" , " case_ids" , "idp_ids " ]
14
+ fields = ["case_ids" , "identity_ids " ]
Original file line number Diff line number Diff line change @@ -34,15 +34,22 @@ def test_case_list(
34
34
identity_factory ,
35
35
case_access_factory ,
36
36
):
37
- identity_0 = identity_factory (idp_id = "00000000-0000-0000-0000-000000000000" )
38
- identity_1 = identity_factory (idp_id = "11111111-1111-1111-1111-111111111111" )
39
- case_access_factory .create_batch (2 , identity = identity_0 , email = None )
40
- case_access_factory (identity = identity_1 , email = None )
37
+ identity_0 = identity_factory ()
38
+ identity_1 = identity_factory ()
39
+ case_access_factory (
40
+ identity = identity_0 , email = None , case_id = "00000000-0000-0000-0000-000000000000"
41
+ )
42
+ case_access_factory (
43
+ identity = identity_0 , email = None , case_id = "11111111-1111-1111-1111-111111111111"
44
+ )
45
+ case_access_factory (
46
+ identity = identity_1 , email = None , case_id = "00000000-0000-0000-0000-000000000000"
47
+ )
41
48
case_access_factory ()
42
49
43
50
url = reverse ("caseaccess-list" )
44
51
45
- response = client .get (url , {"filter[idpId ]" : filter_id } if filter_id else None )
52
+ response = client .get (url , {"filter[caseIds ]" : filter_id } if filter_id else None )
46
53
47
54
assert response .status_code == expected_status
48
55
Original file line number Diff line number Diff line change @@ -41,12 +41,10 @@ class CaseAccessViewSet(
41
41
permission_classes = (IsAuthenticated & (IsAdmin | IsStaff | HasCaseAccess ),)
42
42
43
43
def list (self , request , * args , ** kwargs ):
44
- expected_keys = ["filter[idpId]" , "filter[ caseIds]" , "filter[idpIds ]" ]
44
+ expected_keys = ["filter[caseIds]" , "filter[identityIds ]" ]
45
45
if not request .GET or set (expected_keys ).isdisjoint (request .GET .keys ()):
46
46
msg = f"At least one of following filters must be used: { ', ' .join (expected_keys )} "
47
- raise ValidationError (
48
- msg ,
49
- )
47
+ raise ValidationError (msg )
50
48
return super ().list (request , * args , ** kwargs )
51
49
52
50
def destroy (self , request , * args , ** kwargs ):
You can’t perform that action at this time.
0 commit comments