Move 'if (eventTags)' to top level functions

Author: yavorona

packages/optimizely-sdk/lib/core/event_builder/event_helpers.js

@@ -106,6 +106,14 @@ export var buildConversionEvent = function(config) {
   var eventTags = config.eventTags;
   var eventId = projectConfig.getEventId(configObj, eventKey);
 
+  let revenue = null;
+  let eventValue = null;
+
+  if (eventTags) {
+    revenue = eventTagUtils.getRevenueValue(eventTags, logger);
+    eventValue = eventTagUtils.getEventValue(eventTags, logger);
+  }
+
   return {
     type: 'conversion',
     timestamp: fns.currentTimestamp(),
@@ -131,8 +139,8 @@ export var buildConversionEvent = function(config) {
       key: eventKey,
     },
 
-    revenue: eventTagUtils.getRevenueValue(eventTags, logger),
-    value: eventTagUtils.getEventValue(eventTags, logger),
+    revenue: revenue,
+    value: eventValue,
     tags: eventTags,
   };
 };

packages/optimizely-sdk/lib/utils/event_tag_utils/index.ts

@@ -41,7 +41,7 @@ let parsedEventValue;
  * @return {number|null}
  */
 export function getRevenueValue(eventTags: EventTags, logger: LoggerFacade): number | null {
-  if (eventTags && eventTags.hasOwnProperty(REVENUE_EVENT_METRIC_NAME)) {
+  if (eventTags.hasOwnProperty(REVENUE_EVENT_METRIC_NAME)) {
     const rawValue = eventTags[REVENUE_EVENT_METRIC_NAME];
     if (typeof rawValue === 'string') {
       parsedRevenueValue = parseInt(rawValue);
@@ -69,7 +69,7 @@ export function getRevenueValue(eventTags: EventTags, logger: LoggerFacade): num
  * @return {number|null}
  */
 export function getEventValue(eventTags: EventTags, logger: LoggerFacade): number | null {
-  if (eventTags && eventTags.hasOwnProperty(VALUE_EVENT_METRIC_NAME)) {
+  if (eventTags.hasOwnProperty(VALUE_EVENT_METRIC_NAME)) {
     const rawValue = eventTags[VALUE_EVENT_METRIC_NAME];
     if (typeof rawValue === 'string') {
       parsedEventValue = parseFloat(rawValue);