refactor: include device_id in events

Author: SikoraKam

src/DetourContext.tsx

@@ -11,7 +11,7 @@ import { resolveStorage } from './links/utils/storage';
 import { useDetour } from './links/hooks/useDetour';
 import { prepareDeviceIdForApi } from './analytics/utils/devicePersistence';
 import { sendRetentionEvent } from './analytics/api/retention';
-import type { DetourEventNames } from './analytics/types';
+import type { DetourEvent, DetourEventNames } from './analytics/types';
 import { useAppOpenRetention } from './analytics/hooks/useAppOpenRetention';
 
 type Props = PropsWithChildren & { config: Config };
@@ -46,13 +46,20 @@ export const DetourProvider = ({ config, children }: Props) => {
           return;
         }
 
+        const deviceId = await prepareDeviceIdForApi(storage);
+
         if (isRetention) {
-          const deviceId = await prepareDeviceIdForApi(storage);
           sendRetentionEvent({ API_KEY, appID, eventName, deviceId });
         } else {
-          sendEvent(API_KEY, appID, {
+          const event: DetourEvent = {
             eventName: eventName as DetourEventNames,
             data,
+          };
+          sendEvent({
+            API_KEY,
+            appID,
+            event,
+            deviceId,
           });
         }
       }

src/analytics/api/events.ts

@@ -3,11 +3,17 @@ import type { DetourEvent } from '../types';
 
 const EVENT_API_URL = 'https://godetour.dev/api/analytics/event';
 
-export const sendEvent = async (
-  API_KEY: string,
-  appID: string,
-  event: DetourEvent
-) => {
+export const sendEvent = async ({
+  API_KEY,
+  appID,
+  deviceId,
+  event,
+}: {
+  API_KEY: string;
+  appID: string;
+  event: DetourEvent;
+  deviceId: string;
+}) => {
   try {
     const response = await fetch(EVENT_API_URL, {
       method: 'POST',
@@ -21,6 +27,7 @@ export const sendEvent = async (
         data: event.data,
         timestamp: new Date().toISOString(),
         platform: Platform.OS,
+        device_id: deviceId,
       }),
     });