[FSSDK-11197] EventTags type fix

Author: junaed-optimizely

lib/event_processor/event_builder/log_event.ts

@@ -13,14 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  EventTags,
-  ConversionEvent,
-  ImpressionEvent,
-  UserEvent,
-} from './user_event';
+import { ConversionEvent, ImpressionEvent, UserEvent } from './user_event';
 
 import { LogEvent } from '../event_dispatcher/event_dispatcher';
+import { EventTags } from '../../shared_types';
 
 const ACTIVATE_EVENT_KEY = 'campaign_activated'
 const CUSTOM_ATTRIBUTE_FEATURE_TYPE = 'custom'

lib/event_processor/event_builder/user_event.ts

@@ -25,7 +25,7 @@ import {
   ProjectConfig,
 } from '../../project_config/project_config';
 
-import { UserAttributes } from '../../shared_types';
+import { EventTags, UserAttributes } from '../../shared_types';
 import { LoggerFacade } from '../../logging/logger';
 
 export type VisitorAttribute = {
@@ -79,10 +79,6 @@ export type ImpressionEvent = BaseUserEvent & {
   cmabUuid?: string;
 };
 
-export type EventTags = {
-  [key: string]: string | number | null;
-};
-
 export type ConversionEvent = BaseUserEvent & {
   type: 'conversion';
 

lib/shared_types.ts

@@ -88,9 +88,7 @@ export interface UserProfile {
   experiment_bucket_map: ExperimentBucketMap;
 }
 
-export type EventTags = {
-  [key: string]: string | number | null;
-};
+export type EventTags = Record<string, unknown>;
 
 export interface UserProfileService {
   lookup(userId: string): UserProfile;

lib/utils/event_tag_utils/index.ts

@@ -19,12 +19,10 @@ import {
   PARSED_NUMERIC_VALUE,
   PARSED_REVENUE_VALUE,
 } from 'log_message';
-import { EventTags } from '../../event_processor/event_builder/user_event';
 import { LoggerFacade } from '../../logging/logger';
 
-import {
-  RESERVED_EVENT_KEYWORDS,
-} from '../enums';
+import { RESERVED_EVENT_KEYWORDS } from '../enums';
+import { EventTags } from '../../shared_types';
 
 /**
  * Provides utility method for parsing event tag values
@@ -41,16 +39,18 @@ const VALUE_EVENT_METRIC_NAME = RESERVED_EVENT_KEYWORDS.VALUE;
 export function getRevenueValue(eventTags: EventTags, logger?: LoggerFacade): number | null {
   const rawValue = eventTags[REVENUE_EVENT_METRIC_NAME];
 
-  if (rawValue == null) { // null or undefined event values
+  if (rawValue == null) {
+    // null or undefined event values
     return null;
   }
 
-  const parsedRevenueValue = typeof rawValue === 'string' ? parseInt(rawValue) : rawValue;
+  const amount = typeof rawValue === 'number' ? rawValue : typeof rawValue === 'string' ? parseInt(rawValue) : NaN;
 
-  if (isFinite(parsedRevenueValue)) {
-    logger?.info(PARSED_REVENUE_VALUE, parsedRevenueValue);
-    return parsedRevenueValue;
-  } else { // NaN, +/- infinity values
+  if (isFinite(amount)) {
+    logger?.info(PARSED_REVENUE_VALUE, amount);
+    return amount;
+  } else {
+    // NaN, +/- infinity values
     logger?.info(FAILED_TO_PARSE_REVENUE, rawValue);
     return null;
   }
@@ -65,16 +65,18 @@ export function getRevenueValue(eventTags: EventTags, logger?: LoggerFacade): nu
 export function getEventValue(eventTags: EventTags, logger?: LoggerFacade): number | null {
   const rawValue = eventTags[VALUE_EVENT_METRIC_NAME];
 
-  if (rawValue == null) { // null or undefined event values
+  if (rawValue == null) {
+    // null or undefined event values
     return null;
   }
 
-  const parsedEventValue = typeof rawValue === 'string' ? parseFloat(rawValue) : rawValue;
+  const amount = typeof rawValue === 'number' ? rawValue : typeof rawValue === 'string' ? parseFloat(rawValue) : NaN;
 
-  if (isFinite(parsedEventValue)) {
-    logger?.info(PARSED_NUMERIC_VALUE, parsedEventValue);
-    return parsedEventValue;
-  } else { // NaN, +/- infinity values
+  if (isFinite(amount)) {
+    logger?.info(PARSED_NUMERIC_VALUE, amount);
+    return amount;
+  } else {
+    // NaN, +/- infinity values
     logger?.info(FAILED_TO_PARSE_VALUE, rawValue);
     return null;
   }