[FSSDK-11197] EventTags type fix for v5

lib/core/event_builder/build_event_v1.ts

@@ -13,13 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  EventTags,
-  ConversionEvent,
-  ImpressionEvent,
-} from '../../modules/event_processor';
+import { ConversionEvent, ImpressionEvent } from '../../modules/event_processor';
 
-import { Event } from '../../shared_types';
+import { Event, EventTags } from '../../shared_types';
 
 type ProcessableEvent = ConversionEvent | ImpressionEvent
 

lib/modules/event_processor/events.ts

@@ -1,3 +1,5 @@
+import { EventTags } from "../../shared_types"
+
 /**
  * Copyright 2022, Optimizely
  *
@@ -82,10 +84,6 @@ export interface ConversionEvent extends BaseEvent {
   tags: EventTags | undefined
 }
 
-export type EventTags = {
-  [key: string]: string | number | null
-}
-
 export function areEventContextsEqual(eventA: BaseEvent, eventB: BaseEvent): boolean {
   const contextA = eventA.context
   const contextB = eventB.context

lib/modules/event_processor/v1/buildEventV1.ts

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventTags, ConversionEvent, ImpressionEvent, VisitorAttribute } from '../events'
+import { ConversionEvent, ImpressionEvent, VisitorAttribute } from '../events'
 import { ProcessableEvent } from '../eventProcessor'
 import { EventV1Request } from '../eventDispatcher'
+import { EventTags } from '../../../shared_types'
 
 const ACTIVATE_EVENT_KEY = 'campaign_activated'
 const CUSTOM_ATTRIBUTE_FEATURE_TYPE = 'custom'

lib/shared_types.ts

@@ -74,7 +74,10 @@ export interface UserProfile {
 }
 
 export type EventTags = {
-  [key: string]: string | number | null;
+  revenue?: string | number | null;
+  value?: string | number | null;
+  $opt_event_properties?: Record<string, unknown>;
+  [key: string]: unknown;
 };
 
 export interface UserProfileService {

lib/utils/event_tag_utils/index.ts

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventTags } from '../../modules/event_processor';
+import { EventTags } from '../../shared_types';
 import { LoggerFacade } from '../../modules/logging';
-
 import {
   LOG_LEVEL,
   LOG_MESSAGES,
@@ -42,7 +41,8 @@ export function getRevenueValue(eventTags: EventTags, logger: LoggerFacade): num
     return null;
   }
 
-  const parsedRevenueValue = typeof rawValue === 'string' ? parseInt(rawValue) : rawValue;
+  const parsedRevenueValue =
+    typeof rawValue === 'number' ? rawValue : typeof rawValue === 'string' ? parseInt(rawValue) : NaN;
 
   if (isFinite(parsedRevenueValue)) {
     logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_REVENUE_VALUE, MODULE_NAME, parsedRevenueValue);
@@ -66,7 +66,8 @@ export function getEventValue(eventTags: EventTags, logger: LoggerFacade): numbe
     return null;
   }
 
-  const parsedEventValue = typeof rawValue === 'string' ? parseFloat(rawValue) : rawValue;
+  const parsedEventValue =
+    typeof rawValue === 'number' ? rawValue : typeof rawValue === 'string' ? parseFloat(rawValue) : NaN;
 
   if (isFinite(parsedEventValue)) {
     logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.PARSED_NUMERIC_VALUE, MODULE_NAME, parsedEventValue);
@@ -75,4 +76,4 @@ export function getEventValue(eventTags: EventTags, logger: LoggerFacade): numbe
     logger.log(LOG_LEVEL.INFO, LOG_MESSAGES.FAILED_TO_PARSE_VALUE, MODULE_NAME, rawValue);
     return null;
   }
-}
+}