Added cascadeCreate parameter to merge users request

Author: OndraFiedler

recombee_api_client/api_requests/merge_users.py

@@ -9,7 +9,7 @@ class MergeUsers(Request):
 
     """
 
-    def __init__(self,target_user_id, source_user_id, keep_source_user=None):
+    def __init__(self,target_user_id, source_user_id, keep_source_user=None, cascade_create=None):
         """
         Required parameters:
         @param target_user_id: ID of the source user.
@@ -18,12 +18,15 @@ def __init__(self,target_user_id, source_user_id, keep_source_user=None):
         
         
         Optional parameters:
-        @param keep_source_user: If true, the source user will not be deleted, but also kept in the database..
+        @param keep_source_user: If true, the source user will not be deleted, but also kept in the database.
+        
+        @param cascade_create: Sets whether the user *targetUserId* should be created if not present in the database.
         
         """
         self.target_user_id = target_user_id
         self.source_user_id = source_user_id
         self.keep_source_user = keep_source_user
+        self.cascade_create = cascade_create
         self.timeout = 1000
         self.ensure_https = False
         self.method = 'put'
@@ -43,4 +46,6 @@ def get_query_parameters(self):
         params = dict()
         if self.keep_source_user is not None:
             params['keepSourceUser'] = self.keep_source_user
+        if self.cascade_create is not None:
+            params['cascadeCreate'] = self.cascade_create
         return params

setup.py

@@ -11,7 +11,7 @@
 setup(
     name='recombee-api-client',
 
-    version='1.2.2',
+    version='1.2.3',
 
     description='Client for Recombee recommendation API',
     long_description=long_description,
@@ -60,4 +60,4 @@
     data_files=[],
 
     entry_points={},
-)
+)

tests/test_cases/merge_users.py

@@ -8,7 +8,7 @@
 
 class MergeUsersTest (RecombeeTest ):
 
-    def create_request(self,target_user_id,source_user_id,keep_source_user=None):
+    def create_request(self,target_user_id,source_user_id,keep_source_user=None,cascade_create=None):
         pass
 
     def test_merge_users(self):

tests/test_cases/set_values.py

@@ -16,6 +16,9 @@ def test_set_values(self):
         # it 'does not fail with existing entity and property'
         req = self.create_request('entity_id',{'int_property': 5})
         resp = self.client.send(req)
+        # it 'does not fail with non-ASCII string'
+        req = self.create_request('entity_id',{'str_property': 'šřžذ的‎'})
+        resp = self.client.send(req)
         # it 'sets multiple properties'
         req = self.create_request('entity_id',{'int_property': 5,'str_property': 'test'})
         resp = self.client.send(req)

tests/test_cases/test_merge_users.py

@@ -7,5 +7,5 @@
 
 class MergeUsersTestCase (MergeUsersTest):
 
-    def create_request(self, target_user_id, source_user_id, keep_source_user=None):
-        return MergeUsers(target_user_id, source_user_id, keep_source_user=keep_source_user)
+    def create_request(self, target_user_id, source_user_id, keep_source_user=None, cascade_create=None):
+        return MergeUsers(target_user_id, source_user_id, keep_source_user=keep_source_user, cascade_create=cascade_create)