@@ -96,14 +96,36 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
96
96
97
97
// if timestamp is from the past we dont want to create a new session
98
98
if ( uaInfo . isServer || isTimestampFromThePast ) {
99
- const event = profileId
99
+ const screenView = profileId
100
100
? await getLastScreenViewFromProfileId ( {
101
101
profileId,
102
102
projectId,
103
103
} )
104
104
: null ;
105
105
106
- const payload = merge ( omit ( [ 'properties' ] , event ?? { } ) , baseEvent ) ;
106
+ const payload = {
107
+ ...baseEvent ,
108
+ deviceId : screenView ?. deviceId ?? '' ,
109
+ sessionId : screenView ?. sessionId ?? '' ,
110
+ referrer : screenView ?. referrer ?? undefined ,
111
+ referrerName : screenView ?. referrerName ?? undefined ,
112
+ referrerType : screenView ?. referrerType ?? undefined ,
113
+ path : screenView ?. path ?? baseEvent . path ,
114
+ os : screenView ?. os ?? baseEvent . os ,
115
+ osVersion : screenView ?. osVersion ?? baseEvent . osVersion ,
116
+ browserVersion : screenView ?. browserVersion ?? baseEvent . browserVersion ,
117
+ browser : screenView ?. browser ?? baseEvent . browser ,
118
+ device : screenView ?. device ?? baseEvent . device ,
119
+ brand : screenView ?. brand ?? baseEvent . brand ,
120
+ model : screenView ?. model ?? baseEvent . model ,
121
+ city : screenView ?. city ?? baseEvent . city ,
122
+ country : screenView ?. country ?? baseEvent . country ,
123
+ region : screenView ?. region ?? baseEvent . region ,
124
+ longitude : screenView ?. longitude ?? baseEvent . longitude ,
125
+ latitude : screenView ?. latitude ?? baseEvent . latitude ,
126
+ origin : screenView ?. origin ?? baseEvent . origin ,
127
+ } ;
128
+
107
129
return createEventAndNotify ( payload as IServiceEvent ) ;
108
130
}
109
131
@@ -121,7 +143,7 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
121
143
referrer : sessionEnd . payload ?. referrer ,
122
144
referrerName : sessionEnd . payload ?. referrerName ,
123
145
referrerType : sessionEnd . payload ?. referrerType ,
124
- } ) as IServiceCreateEventPayload
146
+ } ) as IServiceCreateEventPayload ;
125
147
126
148
if ( sessionEnd . notFound ) {
127
149
await createSessionEnd ( { payload } ) ;
0 commit comments