fix: addressed minor feedback.

Author: mjamal@folio3.com

optimizely/event/payload.py

@@ -18,15 +18,15 @@ class EventBatch(object):
   """ Class respresenting Event Batch. """
 
   def __init__(self, account_id, project_id, revision, client_name, client_version,
-               anonymize_ip, enrich_decisions, visitors=None):
+               anonymize_ip, enrich_decisions=True, visitors=None):
     self.account_id = account_id
     self.project_id = project_id
     self.revision = revision
     self.client_name = client_name
     self.client_version = client_version
     self.anonymize_ip = anonymize_ip
     self.enrich_decisions = enrich_decisions
-    self.visitors = visitors
+    self.visitors = visitors or []
 
   def __eq__(self, other):
     batch_obj = json.loads(json.dumps(self.__dict__, default=lambda o: o.__dict__),

optimizely/event/user_event.py

@@ -22,8 +22,11 @@
 class UserEvent(object):
   """ Class respresenting User Event. """
 
-  def __init__(self, event_context):
+  def __init__(self, event_context, user_id, visitor_attributes, bot_filtering=None):
     self.event_context = event_context
+    self.user_id = user_id
+    self.visitor_attributes = visitor_attributes
+    self.bot_filtering = bot_filtering
     self.uuid = self._get_uuid()
     self.timestamp = self._get_time()
 
@@ -38,26 +41,18 @@ class ImpressionEvent(UserEvent):
   """ Class representing Impression Event. """
 
   def __init__(self, event_context, user_id, experiment, visitor_attributes, variation, bot_filtering=None):
-    super(ImpressionEvent, self).__init__(event_context)
-    self.event_context = event_context
-    self.user_id = user_id
+    super(ImpressionEvent, self).__init__(event_context, user_id, visitor_attributes, bot_filtering)
     self.experiment = experiment
-    self.visitor_attributes = visitor_attributes
     self.variation = variation
-    self.bot_filtering = bot_filtering
 
 
 class ConversionEvent(UserEvent):
   """ Class representing Conversion Event. """
 
   def __init__(self, event_context, event, user_id, visitor_attributes, event_tags, bot_filtering=None):
-    super(ConversionEvent, self).__init__(event_context)
-    self.event_context = event_context
+    super(ConversionEvent, self).__init__(event_context, user_id, visitor_attributes, bot_filtering)
     self.event = event
-    self.user_id = user_id
-    self.visitor_attributes = visitor_attributes
     self.event_tags = event_tags
-    self.bot_filtering = bot_filtering
 
 
 class EventContext(object):

tests/test_event_payload.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 from optimizely import version
-from optimizely.event.payload import Decision, EventBatch, Snapshot, SnapshotEvent, Visitor, VisitorAttribute
+from optimizely.event import payload
 from . import base
 
 
@@ -51,15 +51,15 @@ def test_impression_event_equals_serialized_payload(self):
       'revision': '42'
     }
 
-    batch = EventBatch('12001', '111001', '42', 'python-sdk', version.__version__,
+    batch = payload.EventBatch('12001', '111001', '42', 'python-sdk', version.__version__,
                                    False, True)
-    visitor_attr = VisitorAttribute('111094', 'test_attribute', 'custom', 'test_value')
-    event = SnapshotEvent('111182', 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c', 'campaign_activated',
+    visitor_attr = payload.VisitorAttribute('111094', 'test_attribute', 'custom', 'test_value')
+    event = payload.SnapshotEvent('111182', 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c', 'campaign_activated',
                                          42123)
-    event_decision = Decision('111182', '111127', '111129')
+    event_decision = payload.Decision('111182', '111127', '111129')
 
-    snapshots = Snapshot([event], [event_decision])
-    user = Visitor([snapshots], [visitor_attr], 'test_user')
+    snapshots = payload.Snapshot([event], [event_decision])
+    user = payload.Visitor([snapshots], [visitor_attr], 'test_user')
 
     batch.visitors = [user]
 
@@ -105,15 +105,15 @@ def test_conversion_event_equals_serialized_payload(self):
       'revision': '42'
     }
 
-    batch = EventBatch('12001', '111001', '42', 'python-sdk', version.__version__,
+    batch = payload.EventBatch('12001', '111001', '42', 'python-sdk', version.__version__,
                                    False, True)
-    visitor_attr_1 = VisitorAttribute('111094', 'test_attribute', 'custom', 'test_value')
-    visitor_attr_2 = VisitorAttribute('111095', 'test_attribute2', 'custom', 'test_value2')
-    event = SnapshotEvent('111182', 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c', 'campaign_activated',
+    visitor_attr_1 = payload.VisitorAttribute('111094', 'test_attribute', 'custom', 'test_value')
+    visitor_attr_2 = payload.VisitorAttribute('111095', 'test_attribute2', 'custom', 'test_value2')
+    event = payload.SnapshotEvent('111182', 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c', 'campaign_activated',
                                           42123, 4200, 1.234, {'revenue': 4200, 'value': 1.234, 'non-revenue': 'abc'})
 
-    snapshots = Snapshot([event])
-    user = Visitor([snapshots], [visitor_attr_1, visitor_attr_2], 'test_user')
+    snapshots = payload.Snapshot([event])
+    user = payload.Visitor([snapshots], [visitor_attr_1, visitor_attr_2], 'test_user')
 
     batch.visitors = [user]