3535from geonode .layers .models import Dataset
3636from geonode .people import profileextractors
3737
38- from geonode .base .populate_test_data import all_public , create_models , remove_models
38+ from geonode .base .populate_test_data import all_public , create_models , create_single_dataset , remove_models
3939from django .db .models import Q
4040from geonode .security .registry import permissions_registry
4141
@@ -1150,7 +1150,8 @@ def test_transfer_resources_all(self):
11501150 self .assertTrue (bobby_resources .exists ())
11511151 # call api
11521152 response = self .client .post (
1153- path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" , data = {"owner" : norman .id }
1153+ path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" ,
1154+ data = {"currentOwner" : bobby .id , "newOwner" : norman .id },
11541155 )
11551156 # check that bobby owns the resources no more
11561157 self .assertFalse (bobby_resources .exists ())
@@ -1174,7 +1175,8 @@ def test_transfer_resources_invalid_user(self):
11741175 self .assertTrue (bobby_resources .exists ())
11751176 # call api
11761177 response = self .client .post (
1177- path = f"{ reverse ('users-list' )} /{ bobby } /transfer_resources" , data = {"owner" : invalid_user_id }
1178+ path = f"{ reverse ('users-list' )} /{ bobby } /transfer_resources" ,
1179+ data = {"currentOwner" : bobby .id , "newOwner" : invalid_user_id },
11781180 )
11791181 # response should be 404
11801182 self .assertEqual (response .status_code , 404 )
@@ -1200,7 +1202,8 @@ def test_transfer_resources_default(self):
12001202 self .assertTrue (bobby_resources .exists ())
12011203 # call api
12021204 response = self .client .post (
1203- path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" , data = {"owner" : "DEFAULT" }
1205+ path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" ,
1206+ data = {"currentOwner" : bobby .id , "newOwner" : "DEFAULT" },
12041207 )
12051208 self .assertTrue (response .status_code == 200 )
12061209 # check that bobby owns the resources no more
@@ -1232,7 +1235,8 @@ def test_transfer_resources_to_missing_default(self):
12321235 self .assertTrue (bobby_resources .exists ())
12331236 # call api
12341237 response = self .client .post (
1235- path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" , data = {"owner" : "DEFAULT" }
1238+ path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" ,
1239+ data = {"newOwner" : "DEFAULT" , "previousOwner" : bobby .pk },
12361240 )
12371241 self .assertTrue (response .status_code == 500 )
12381242 self .assertEqual (response .data , "Principal User not found" )
@@ -1257,7 +1261,8 @@ def test_transfer_resources_to_self(self):
12571261
12581262 # call api
12591263 response = self .client .post (
1260- path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" , data = {"owner" : bobby .pk }
1264+ path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" ,
1265+ data = {"previousOwner" : bobby .pk , "newOwner" : bobby .pk },
12611266 )
12621267 self .assertTrue (response .status_code == 400 )
12631268 self .assertEqual (response .data , "Cannot reassign to self" )
@@ -1277,7 +1282,6 @@ def test_transfer_resources_nopayload(self):
12771282 bobby_resources = ResourceBase .objects .filter (owner = bobby )
12781283 prior_bobby_resources = bobby_resources .all ()
12791284 self .assertTrue (bobby_resources .exists ())
1280-
12811285 # call api
12821286 response = self .client .post (path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" , data = {})
12831287 # response should be 404
@@ -1296,13 +1300,17 @@ def test_transfer_resource_subset(self):
12961300 self .assertTrue (bobby .is_authenticated )
12971301 # check bobbys resources
12981302 resource_to_transfer = ResourceBase .objects .filter (owner = bobby ).first ()
1299- second_resource = ResourceBase . objects . filter ( owner = bobby ). last ( )
1303+ second_resource = create_single_dataset ( "test for api" , owner = bobby )
13001304 new_owner = get_user_model ().objects .exclude (username__in = ["bobby" , "AnonymousUser" ]).first ()
13011305
13021306 # call api to transfer bobby resource to the other user
13031307 response = self .client .post (
13041308 path = f"{ reverse ('users-list' )} /{ bobby .pk } /transfer_resources" ,
1305- data = {"owner" : new_owner .pk , "resources" : [resource_to_transfer .pk , second_resource .pk ]},
1309+ data = {
1310+ "newOwner" : new_owner .pk ,
1311+ "currentOwner" : bobby .pk ,
1312+ "resources" : [resource_to_transfer .pk , second_resource .pk ],
1313+ },
13061314 )
13071315 # response should be 200
13081316 self .assertEqual (response .status_code , 200 )
0 commit comments