Skip to content

Commit cda2d3c

Browse files
committed
feature(root): add vitest and some basic tests
1 parent c126f10 commit cda2d3c

14 files changed

+1494
-1283
lines changed

apps/worker/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "@openpanel/worker",
33
"version": "0.0.1",
44
"scripts": {
5+
"test": "vitest",
56
"dev": "dotenv -e ../../.env -c -v WATCH=1 tsup",
67
"testing": "WORKER_PORT=9999 pnpm dev",
78
"start": "node dist/index.js",

apps/worker/src/jobs/events.incoming-event.ts

+25-3
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,36 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
9696

9797
// if timestamp is from the past we dont want to create a new session
9898
if (uaInfo.isServer || isTimestampFromThePast) {
99-
const event = profileId
99+
const screenView = profileId
100100
? await getLastScreenViewFromProfileId({
101101
profileId,
102102
projectId,
103103
})
104104
: null;
105105

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+
107129
return createEventAndNotify(payload as IServiceEvent);
108130
}
109131

@@ -121,7 +143,7 @@ export async function incomingEvent(job: Job<EventsQueuePayloadIncomingEvent>) {
121143
referrer: sessionEnd.payload?.referrer,
122144
referrerName: sessionEnd.payload?.referrerName,
123145
referrerType: sessionEnd.payload?.referrerType,
124-
}) as IServiceCreateEventPayload
146+
}) as IServiceCreateEventPayload;
125147

126148
if (sessionEnd.notFound) {
127149
await createSessionEnd({ payload });

0 commit comments

Comments
 (0)