Attribute and Identity objects fixes

chillaq · chillaq · commit e28c5b61d7e8 · 2021-11-02T20:16:38.000-07:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/splitapiclient/.DS_Store b/splitapiclient/.DS_Store
diff --git a/splitapiclient/microclients/attribute_microclient.py b/splitapiclient/microclients/attribute_microclient.py
@@ -32,7 +32,7 @@ class AttributeMicroClient:
         },
         'delete': {
             'method': 'DELETE',
-            'url_template': 'schema/ws/{workspaceId}/trafficTypes/{trafficTypeId}/schema/{attributeId}',
+            'url_template': 'schema/ws/{workspaceId}/trafficTypes/{trafficTypeId}/{attributeId}',
             'headers': [{
                 'name': 'Authorization',
                 'template': 'Bearer {value}',
@@ -48,20 +48,43 @@ def __init__(self, http_client):
         '''
         self._http_client = http_client
 
-    def list(self, workspace_id, traffic_type_id):
+    def list(self, traffic_type_id, workspace_id):
         '''
-        Returns a list of TrafficType objects.
+        Returns a list of Attribute objects.
 
         :param traffic_type_id: Id of the TrafficType whose attributes will be
             returned
-        :rtype: list(TrafficType)
+        :rtype: list(Attribute)
         '''
         response = self._http_client.make_request(
             self._endpoint['all_items'],
-            trafficTypeId=traffic_type_id,
-            workspaceId=workspace_id
+            trafficTypeId = traffic_type_id,
+            workspaceId = workspace_id
+        )
+        final_array=[]
+        for item in response:
+            item['workspaceId'] = workspace_id
+            final_array.append(Attribute(item))
+        return final_array
+
+    def find(self, attribute_id, traffic_type_name, workspace_id):
+        '''
+        Find Attribute in a TrafficType for a workspace
+
+        :returns: Attribute object
+        :rtype: Attribute
+        '''
+        response = self._http_client.make_request(
+            self._endpoint['all_items'],
+            trafficTypeId = traffic_type_name,
+            workspaceId = workspace_id
         )
-        return [Attribute(item, self._http_client) for item in response]
+        for item in response:
+            if item['id']==attribute_id:
+                item['workspaceId'] = workspace_id
+                return Attribute(item, self._http_client)
+        LOGGER.error("Attribute Id does not exist")
+        return None
 
     def save(self, attribute):
         '''
@@ -73,15 +96,15 @@ def save(self, attribute):
         :returns: newly created attribute
         :rtype: Attribute
         '''
+        wsId = attribute._workspace_id
         data = as_dict(attribute)
-        wsId=data.get('workspaceId')
         del data['workspaceId']
         del data['isSearchable']
         response = self._http_client.make_request(
             self._endpoint['create'],
             data,
-            trafficTypeId=data.get('trafficTypeId'),
-            workspaceId=wsId
+            trafficTypeId = data.get('trafficTypeId'),
+            workspaceId = wsId
         )
         return Attribute(response, self._http_client)
 
@@ -108,6 +131,6 @@ def delete_by_instance(self, attribute):
         data = as_dict(attribute)
         return self.delete(
             data.get('id'),
-            data.get('workspaceId'),
+            attribute._workspace_id,
             data.get('trafficTypeId')
         )
diff --git a/splitapiclient/microclients/group_microclient.py b/splitapiclient/microclients/group_microclient.py
@@ -111,7 +111,7 @@ def create_group(self, data):
             self._endpoint['create_group'],
             body = data
         )
-        return response
+        return Group(response)
 
     def delete_group(self, group_id):
         '''
diff --git a/splitapiclient/microclients/segment_definition_microclient.py b/splitapiclient/microclients/segment_definition_microclient.py
@@ -10,7 +10,7 @@ class SegmentDefinitionMicroClient:
     _endpoint = {
         'all_items': {
             'method': 'GET',
-            'url_template': 'segments/ws/{workspaceId}/environments/{environmentId}?limit=20&offset={offset}',
+            'url_template': 'segments/ws/{workspaceId}/environments/{environmentId}?limit=50&offset={offset}',
             'headers': [{
                 'name': 'Authorization',
                 'template': 'Bearer {value}',
diff --git a/splitapiclient/microclients/segment_microclient.py b/splitapiclient/microclients/segment_microclient.py
@@ -55,7 +55,7 @@ class SegmentMicroClient:
         },
         'all_items': {
             'method': 'GET',
-            'url_template': 'segments/ws/{workspaceId}?limit=20&offset={offset}',
+            'url_template': 'segments/ws/{workspaceId}?limit=50&offset={offset}',
             'headers': [{
                 'name': 'Authorization',
                 'template': 'Bearer {value}',
diff --git a/splitapiclient/microclients/traffic_type_microclient.py b/splitapiclient/microclients/traffic_type_microclient.py
@@ -39,3 +39,20 @@ def list(self, workspace_id):
             workspaceId = workspace_id
         )
         return [TrafficType(item, self._http_client) for item in response]
+
+    def find(self, traffic_type_name, workspace_id):
+        '''
+        Find TrafficType in workspace
+
+        :returns: TrafficType object
+        :rtype: TrafficType
+        '''
+        response = self._http_client.make_request(
+            self._endpoint['all_items'],
+            workspaceId = workspace_id
+        )
+        for item in response:
+            if item['name']==traffic_type_name:
+                return TrafficType(item, workspace_id, self._http_client)
+        LOGGER.error("TrafficType Name does not exist")
+        return None
diff --git a/splitapiclient/microclients/user_microclient.py b/splitapiclient/microclients/user_microclient.py
@@ -122,7 +122,7 @@ def find(self, user_email):
         for item in self.list('ACTIVE'):
             if item._email == user_email:
                 return item
-        for item in self.list('DEACTIVED'):
+        for item in self.list('DEACTIVATED'):
             if item._email == user_email:
                 return item
         for item in self.list('PENDING'):
diff --git a/splitapiclient/microclients/workspace_microclient.py b/splitapiclient/microclients/workspace_microclient.py
@@ -51,7 +51,6 @@ def list(self):
                 self._endpoint['all_items'],
                 offset = offset_val
             )
-            print(response)
             for item in response['objects']:
                 final_list.append(item)
             offset = int(response['offset'])
diff --git a/splitapiclient/resources/attribute.py b/splitapiclient/resources/attribute.py
@@ -72,7 +72,7 @@ def is_searchable(self, new):
 
     def save(self, apiclient=None):
         '''
-        Delete this attribute
+        Save this attribute
 
         :param apiclient: If this instance wasn't returned by the client,
             the IdentifyClient instance should be passed in order to perform the
diff --git a/splitapiclient/resources/identity.py b/splitapiclient/resources/identity.py
@@ -12,7 +12,6 @@ class Identity(BaseResource):
         'trafficTypeId': 'string',
         'environmentId': 'string',
         'values': 'object',
-        'organizationId': 'string',
     }
 
     def __init__(self, data=None, client=None):
@@ -25,7 +24,6 @@ def __init__(self, data=None, client=None):
         self._key = data.get('key')
         self._environment_id = data.get('environmentId')
         self._values = data.get('values')
-        self._organization_id = data.get('organizationId')
 
     @property
     def key(self):
@@ -43,10 +41,6 @@ def environment_id(self):
     def values(self):
         return self._values
 
-    @property
-    def organization_id(self):
-        return self._organization_id
-
     @key.setter
     def key(self, new):
         self._key = new
@@ -63,10 +57,6 @@ def environment_id(self, new):
     def values(self, new):
         self._values = new
 
-    @organization_id.setter
-    def organization_id(self, new):
-        self._organization_id = new
-
     def save(self, apiclient=None):
         '''
         Save this Identity
diff --git a/splitapiclient/resources/segment.py b/splitapiclient/resources/segment.py
@@ -60,8 +60,8 @@ def remove_from_environment(self, environment_id, apiclient=None):
             the IdentifyClient instance should be passed in order to perform the
             http call
 
-        :returns: SegmentDefinition instance
-        :rtype: SegmentDefinition
+        :returns: True if successful
+        :rtype: Boolean
         '''
         imc = require_client('Segment', self._client, apiclient)
         return imc.remove_from_environment(self._name, environment_id)
diff --git a/splitapiclient/resources/segment_definition.py b/splitapiclient/resources/segment_definition.py
@@ -70,7 +70,6 @@ def export_keys_to_csv(self, csv_file_name, apiclient=None):
             keysWriter = csv.writer(keysFile,  delimiter=',',
                             quotechar='|', quoting=csv.QUOTE_MINIMAL)
             for key in imc.get_keys(self._name, self._environment['id']):
-                print(key)
                 keysWriter.writerow([key])
         return True
 
diff --git a/splitapiclient/resources/split_definition.py b/splitapiclient/resources/split_definition.py
@@ -156,8 +156,9 @@ def submit_change_request(self, definition, operation_type, title, comment, appr
             'title': title,
             'comment': comment,
             'approvers': approvers,
-            'rolloutStatus': {'id': rollout_status_id}
         }
+        if rollout_status_id is not None:
+            data['rolloutStatus'] = {'id': rollout_status_id}
         imc = require_client('ChangeRequest', self._client, apiclient)
         return imc.submit_change_request(self._name, self._environment_id, self._workspace_id, data)
 
diff --git a/splitapiclient/resources/traffic_type.py b/splitapiclient/resources/traffic_type.py
@@ -2,6 +2,7 @@
     unicode_literals
 from splitapiclient.resources.base_resource import BaseResource
 from splitapiclient.util.helpers import as_dict, require_client
+from splitapiclient.resources.attribute import Attribute
 
 class TrafficType(BaseResource):
     '''
@@ -51,7 +52,7 @@ def fetch_attributes(self, apiclient=None):
         :rtype: list(Attribute)
         '''
         amc = require_client('Attribute', self._client, apiclient)
-        return amc.list(self._workspace_id, self.id)
+        return amc.list(self.id, self._workspace_id)
 
     def add_attribute(self, data, apiclient=None):
         '''
@@ -68,7 +69,7 @@ def add_attribute(self, data, apiclient=None):
         amc = require_client('Attribute', self._client, apiclient)
         attribute = as_dict(data)
         attribute['trafficTypeId'] = self.id
-        return amc.save(attribute)
+        return amc.save(Attribute(attribute))
 
     def add_identity(self, data, apiclient=None):
         '''
diff --git a/splitapiclient/tests/microclients/attribute_microclient_test.py b/splitapiclient/tests/microclients/attribute_microclient_test.py
@@ -31,12 +31,29 @@ def test_list(self, mocker):
             'workspaceId': None
         }]
         SyncHttpClient.make_request.return_value = data
-        result = amc.list('ws_id', '456')
+        result = amc.list('456', 'ws_id')
         SyncHttpClient.make_request.assert_called_once_with(
             AttributeMicroClient._endpoint['all_items'],
             trafficTypeId='456',
             workspaceId='ws_id'
         )
+        data = [{
+            'id': '123',
+            'trafficTypeId': '456',
+            'displayName': 'name',
+            'description': 'desc',
+            'dataType': 'dt',
+            'isSearchable': False,
+            'workspaceId': None
+        }, {
+            'id': '124',
+            'trafficTypeId': '456',
+            'displayName': 'name',
+            'description': 'desc',
+            'dataType': 'dt',
+            'isSearchable': False,
+            'workspaceId': None
+        }]
         assert result[0].to_dict() == data[0]
         assert result[1].to_dict() == data[1]
 
@@ -53,14 +70,21 @@ def test_save(self, mocker):
             'description': 'desc',
             'dataType': 'dt',
             'isSearchable': False,
-            'workspaceId': None
+            'workspaceId': 'ws_id'
+        }
+        amc.save(Attribute(data))
+        data = {
+            'id': '123',
+            'trafficTypeId': '456',
+            'displayName': 'name',
+            'description': 'desc',
+            'dataType': 'dt',
         }
-        amc.save(data)
         SyncHttpClient.make_request.assert_called_once_with(
             AttributeMicroClient._endpoint['create'],
             data,
-            trafficTypeId='456',
-            workspaceId=None
+            trafficTypeId = '456',
+            workspaceId = 'ws_id'
         )
 
     def test_delete(self, mocker):
diff --git a/splitapiclient/tests/microclients/group_microclient_test.py b/splitapiclient/tests/microclients/group_microclient_test.py
@@ -62,8 +62,8 @@ def test_create_group(self, mocker):
         response = {
             'id': 'group_id',
             'name': 'gr1',
-            'description': 'desc',
-            'type': 'group'
+            'description': None,
+            'type': None
         }
         SyncHttpClient.make_request.return_value = response
         
@@ -72,7 +72,7 @@ def test_create_group(self, mocker):
             GroupMicroClient._endpoint['create_group'],
             body = data
         )
-        assert result == response
+        assert result.to_dict() == response
 
     def test_delete_group(self, mocker):
         '''
diff --git a/splitapiclient/tests/microclients/identity_microclient_test.py b/splitapiclient/tests/microclients/identity_microclient_test.py
@@ -20,7 +20,6 @@ def test_create(self, mocker):
             'trafficTypeId': '123',
             'environmentId': '456',
             'values': {'asd': 1},
-            'organizationId': 'oo1',
         }
 
         sc = SyncHttpClient('abc', 'abc')
@@ -49,13 +48,11 @@ def test_create_many(self, mocker):
             'trafficTypeId': '123',
             'environmentId': '456',
             'values': {'asd': 1},
-            'organizationId': 'oo1',
         }, {
             'key': 'key2',
             'trafficTypeId': '123',
             'environmentId': '456',
             'values': {'asd': 2},
-            'organizationId': 'oo1',
         }]
 
         SyncHttpClient.make_request.return_value = {
@@ -87,7 +84,6 @@ def test_update(self, mocker):
             'trafficTypeId': '123',
             'environmentId': '456',
             'values': {'asd': 1},
-            'organizationId': 'oo1',
         }
 
         sc = SyncHttpClient('abc', 'abc')
@@ -114,7 +110,6 @@ def test_patch(self, mocker):
             'trafficTypeId': '123',
             'environmentId': '456',
             'values': {'asd': 1},
-            'organizationId': 'oo1',
         }
 
         sc = SyncHttpClient('abc', 'abc')
diff --git a/splitapiclient/tests/resources/test_environment.py b/splitapiclient/tests/resources/test_environment.py
@@ -53,7 +53,6 @@ def test_add_identity(self, mocker):
             'trafficTypeId': '1',
             'environmentId': '1',
             'values': {'a1': 'v1'},
-            'organizationId': 'o1',
         }
         http_client_mock = mocker.Mock(spec=BaseHttpClient)
         http_client_mock.make_request.return_value = data
@@ -119,13 +118,11 @@ def test_add_identities(self, mocker):
             'trafficTypeId': '1',
             'environmentId': '1',
             'values': {'a1': 'v1'},
-            'organizationId': 'o1',
         }, {
             'key': 'key2',
             'trafficTypeId': '1',
             'environmentId': '1',
             'values': {'a2': 'v2'},
-            'organizationId': 'o1',
         }]
 
         http_client_mock = mocker.Mock(spec=BaseHttpClient)
diff --git a/splitapiclient/tests/resources/test_identity.py b/splitapiclient/tests/resources/test_identity.py
diff --git a/splitapiclient/tests/resources/test_split_definition.py b/splitapiclient/tests/resources/test_split_definition.py
diff --git a/splitapiclient/tests/resources/test_traffic_type.py b/splitapiclient/tests/resources/test_traffic_type.py

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ def create_group(self, data):`
`111`	`111`	`self._endpoint['create_group'],`
`112`	`112`	`body = data`
`113`	`113`	`)`
`114`		`- return response`
	`114`	`+ return Group(response)`
`115`	`115`
`116`	`116`	`def delete_group(self, group_id):`
`117`	`117`	`'''`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ def list(self):`
`51`	`51`	`self._endpoint['all_items'],`
`52`	`52`	`offset = offset_val`
`53`	`53`	`)`
`54`		`- print(response)`
`55`	`54`	`for item in response['objects']:`
`56`	`55`	`final_list.append(item)`
`57`	`56`	`offset = int(response['offset'])`