include organizationId, timestamp, and failed for bulk creation

Author: mredolatti

identify/main/identify_sync_client.py

@@ -92,7 +92,8 @@ def delete_attribute_from_schema(self, traffic_type_id, attribute_id):
         '''
         return Attribute.delete(self._client, attribute_id, traffic_type_id)
 
-    def add_identities(self, traffic_type_id, environment_id, identities):
+    def add_identities(self, traffic_type_id, environment_id, identities,
+                       organization_id=None):
         '''
         Create Identities for a specific traffic type and environment.
 
@@ -115,10 +116,12 @@ def add_identities(self, traffic_type_id, environment_id, identities):
             self._client,
             traffic_type_id,
             environment_id,
-            identities
+            identities,
+            organization_id
         )
 
-    def add_identity(self, traffic_type_id, environment_id, key, values):
+    def add_identity(self, traffic_type_id, environment_id, key, values,
+                     organization_id=None):
         '''
         Create a new Identity.
 
@@ -137,10 +140,12 @@ def add_identity(self, traffic_type_id, environment_id, key, values):
             key,
             traffic_type_id,
             environment_id,
-            values
+            values,
+            organization_id
         )
 
-    def update_identity(self, traffic_type_id, environment_id, key, values):
+    def update_identity(self, traffic_type_id, environment_id, key, values,
+                        organization_id=None):
         '''
         Update an Identity.
 
@@ -159,10 +164,12 @@ def update_identity(self, traffic_type_id, environment_id, key, values):
             key,
             traffic_type_id,
             environment_id,
-            values
+            values,
+            organization_id
         )
 
-    def patch_identity(self, traffic_type_id, environment_id, key, values):
+    def patch_identity(self, traffic_type_id, environment_id, key, values,
+                       organization_id=None):
         '''
         Patch an Identity.
 
@@ -181,7 +188,8 @@ def patch_identity(self, traffic_type_id, environment_id, key, values):
             key,
             traffic_type_id,
             environment_id,
-            values
+            values,
+            organization_id
         )
 
     def delete_attributes_from_key(self, traffic_type_id, environment_id, key):

identify/resources/identity.py

@@ -77,17 +77,21 @@ class Identity(BaseResource):
         'trafficTypeId': 'string',
         'environmentId': 'string',
         'values': 'object',
+        'organizationId': 'string',
+        'timestamp': 'string',
     }
 
     def __init__(self, client, key, traffic_type_id, environment_id,
-                 values=None):
+                 values=None, organization_id=None, timestamp=None):
         '''
         '''
         BaseResource.__init__(self, client, key)
         self._traffic_type_id = traffic_type_id
         self._key = key
         self._environment_id = environment_id
         self._values = values
+        self._organization_id = organization_id
+        self._timestamp = timestamp
 
     @property
     def key(self):
@@ -105,14 +109,23 @@ def environment_id(self):
     def values(self):
         return self._values
 
+    @property
+    def organization_id(self):
+        return self._organization_id
+
+    @property
+    def timestamp(self):
+        return self._timestamp
+
     @classmethod
     def _build_single_from_collection_response(cls, client, response):
         '''
         '''
         raise MethodNotApplicable()
 
     @classmethod
-    def create(cls, client, key, traffic_type_id, environment_id, values):
+    def create(cls, client, key, traffic_type_id, environment_id, values,
+               organization_id=None):
         '''
         '''
         try:
@@ -122,6 +135,7 @@ def create(cls, client, key, traffic_type_id, environment_id, values):
                     'key': key,
                     'trafficTypeId': traffic_type_id,
                     'environmentId': environment_id,
+                    'organization_id': organization_id,
                     'values': values
                 },
                 key=key,
@@ -140,11 +154,14 @@ def create(cls, client, key, traffic_type_id, environment_id, values):
             response['key'],
             response['trafficTypeId'],
             response['environmentId'],
-            response['values']
+            response['values'],
+            response['organizationId'],
+            response['timestamp']
         )
 
     @classmethod
-    def create_many(cls, client, traffic_type_id, environment_id, identities):
+    def create_many(cls, client, traffic_type_id, environment_id, identities,
+                    organization_id=None):
         '''
         entities: { key: { attr_id: value, ...} }
         '''
@@ -157,20 +174,42 @@ def create_many(cls, client, traffic_type_id, environment_id, identities):
                         'key': key,
                         'trafficTypeId': traffic_type_id,
                         'environmentId': environment_id,
+                        'organizationId': organization_id,
                         'values': identities[key]
                     }
                     for key in identities.keys()
                 ],
                 trafficTypeId=traffic_type_id,
                 environmentId=environment_id
             )
-            return [
+
+            successful = [
                 Identity(
                     client, i['key'], i['trafficTypeId'],
-                    i['environmentId'], i['values']
+                    i['environmentId'], i['values'], i['organizationId'],
+                    i['timestamp']
                 ) for i in response['objects']
             ]
 
+            failed = [
+                {
+                    'object': Identity(
+                        client,
+                        i['object']['key'],
+                        i['object']['trafficTypeId'],
+                        i['object']['environmentId'],
+                        i['object']['values'],
+                        i['object']['organizationId'],
+                        i['object']['timestamp']
+                    ),
+                    'status': i['status'],
+                    'message': i['message']
+                }
+                for i in response['failed']
+            ]
+
+            return successful, failed
+
         except HTTPResponseError as e:
             LOGGER.error('Call to Identify API failed. Identities not created.')
             raise e
@@ -179,7 +218,8 @@ def create_many(cls, client, traffic_type_id, environment_id, identities):
             raise UnknownIdentifyClientError()
 
     @classmethod
-    def update(cls, client, key, traffic_type_id, environment_id, values):
+    def update(cls, client, key, traffic_type_id, environment_id, values,
+               organization_id):
         '''
         '''
         try:
@@ -189,6 +229,7 @@ def update(cls, client, key, traffic_type_id, environment_id, values):
                     'key': key,
                     'trafficTypeId': traffic_type_id,
                     'environmentId': environment_id,
+                    'organizationId': organization_id,
                     'values': values
                 },
                 key=key,
@@ -207,11 +248,13 @@ def update(cls, client, key, traffic_type_id, environment_id, values):
             response['key'],
             response['trafficTypeId'],
             response['environmentId'],
-            response['values']
+            response['values'],
+            response['timestamp']
         )
 
     @classmethod
-    def patch(cls, client, key, traffic_type_id, environment_id, values):
+    def patch(cls, client, key, traffic_type_id, environment_id, values,
+              organization_id):
         '''
         '''
         try:
@@ -221,6 +264,7 @@ def patch(cls, client, key, traffic_type_id, environment_id, values):
                     'key': key,
                     'trafficTypeId': traffic_type_id,
                     'environmentId': environment_id,
+                    'organizationId': organization_id,
                     'values': values
                 },
                 key=key,
@@ -239,7 +283,9 @@ def patch(cls, client, key, traffic_type_id, environment_id, values):
             response['key'],
             response['trafficTypeId'],
             response['environmentId'],
-            response['values']
+            response['values'],
+            response['organization_id'],
+            response['timestamp']
         )
 
     @classmethod