Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating event format
  • Loading branch information
aliabbasrizvi committed Aug 21, 2018
commit f432988a959518609971fc7d8479852d628b6e06
34 changes: 16 additions & 18 deletions optimizely/event_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,33 +249,32 @@ def _get_required_params_for_conversion(self, event_key, event_tags, decisions):
experiment = self.config.get_experiment_from_id(experiment_id)

if variation_id:

snapshot.setdefault(self.EventParams.DECISIONS, []).append({
self.EventParams.EXPERIMENT_ID: experiment_id,
self.EventParams.VARIATION_ID: variation_id,
self.EventParams.CAMPAIGN_ID: experiment.layerId
})

event_dict = {
self.EventParams.EVENT_ID: self.config.get_event(event_key).id,
self.EventParams.TIME: self._get_time(),
self.EventParams.KEY: event_key,
self.EventParams.UUID: str(uuid.uuid4())
}
event_dict = {
self.EventParams.EVENT_ID: self.config.get_event(event_key).id,
self.EventParams.TIME: self._get_time(),
self.EventParams.KEY: event_key,
self.EventParams.UUID: str(uuid.uuid4())
}

if event_tags:
revenue_value = event_tag_utils.get_revenue_value(event_tags)
if revenue_value is not None:
event_dict[event_tag_utils.REVENUE_METRIC_TYPE] = revenue_value
if event_tags:
revenue_value = event_tag_utils.get_revenue_value(event_tags)
if revenue_value is not None:
event_dict[event_tag_utils.REVENUE_METRIC_TYPE] = revenue_value

numeric_value = event_tag_utils.get_numeric_value(event_tags, self.config.logger)
if numeric_value is not None:
event_dict[event_tag_utils.NUMERIC_METRIC_TYPE] = numeric_value
numeric_value = event_tag_utils.get_numeric_value(event_tags, self.config.logger)
if numeric_value is not None:
event_dict[event_tag_utils.NUMERIC_METRIC_TYPE] = numeric_value

if len(event_tags) > 0:
event_dict[self.EventParams.TAGS] = event_tags
snapshot.setdefault(self.EventParams.EVENTS, []).append(event_dict)
if len(event_tags) > 0:
event_dict[self.EventParams.TAGS] = event_tags

snapshot.setdefault(self.EventParams.EVENTS, []).append(event_dict)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to setdefault as opposed to just initializing an empty array with that event_dict?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let me update that.

return snapshot

def create_impression_event(self, experiment, variation_id, user_id, attributes):
Expand Down Expand Up @@ -319,7 +318,6 @@ def create_conversion_event(self, event_key, user_id, attributes, event_tags, de
conversion_params = self._get_required_params_for_conversion(event_key, event_tags, decisions)

params[self.EventParams.USERS][0][self.EventParams.SNAPSHOTS].append(conversion_params)
print(params)
return Event(self.EVENTS_URL,
params,
http_verb=self.HTTP_VERB,
Expand Down
18 changes: 1 addition & 17 deletions tests/test_event_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,6 @@ def test_create_conversion_event__when_event_is_used_in_multiple_experiments(sel
""" Test that create_conversion_event creates Event object
with right params when event tags are provided. """

# base.BaseTest.setUp(self)
# self.event_builder = self.optimizely.event_builder

expected_params = {
'client_version': version.__version__,
'project_id': '111001',
Expand All @@ -683,8 +680,7 @@ def test_create_conversion_event__when_event_is_used_in_multiple_experiments(sel
'experiment_id': '111130',
'variation_id': '111131',
'campaign_id': '111182'
}
],
}],
'events': [{
'uuid': 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c',
'tags': {
Expand All @@ -697,18 +693,6 @@ def test_create_conversion_event__when_event_is_used_in_multiple_experiments(sel
'value': 1.234,
'key': 'test_event',
'entity_id': '111095'
}, {
'uuid': 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c',
'tags': {
'non-revenue': 'abc',
'revenue': 4200,
'value': 1.234
},
'timestamp': 42123,
'revenue': 4200,
'value': 1.234,
'key': 'test_event',
'entity_id': '111095'
}]
}]
}],
Expand Down