zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

minor fixes in event.controller

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2024-02-28 11:10:38 +01:00
parent 43b2fbe7e4
commit fb5a0624a0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/sdk-api/src/controllers/event.controller.ts
View File

@@ -72,7 +72,14 @@ export async function postEvent(
const { projectId, body } = request; const { projectId, body } = request;
const properties = body.properties ?? {}; const properties = body.properties ?? {};
const getProperty = (name: string): string | undefined => { const getProperty = (name: string): string | undefined => {
return (properties[name] as string | null | undefined) ?? undefined; // replace thing is just for older sdks when we didn't have `__`
// remove when kiddokitchen app (24.09.02) is not used anymore
return (
((properties[name] || properties[name.replace('__', '')]) as
| string
| null
| undefined) ?? undefined
);
}; };
const profileId = body.profileId ?? ''; const profileId = body.profileId ?? '';
const createdAt = new Date(body.timestamp); const createdAt = new Date(body.timestamp);
@@ -93,7 +100,7 @@ export async function postEvent(
ip, ip,
ua, ua,
}); });
const previousProfileId = generateDeviceId({ const previousDeviceId = generateDeviceId({
salt: salts.previous, salt: salts.previous,
origin, origin,
ip, ip,
@@ -174,7 +181,7 @@ export async function postEvent(
); );
const sessionEndJobPreviousDeviceId = findJobByPrefix( const sessionEndJobPreviousDeviceId = findJobByPrefix(
eventsJobs, eventsJobs,
`sessionEnd:${projectId}:${previousProfileId}:` `sessionEnd:${projectId}:${previousDeviceId}:`
); );
const createSessionStart = const createSessionStart =
@@ -187,7 +194,7 @@ export async function postEvent(
sessionEndJobCurrentDeviceId.changeDelay(diff + SESSION_END_TIMEOUT); sessionEndJobCurrentDeviceId.changeDelay(diff + SESSION_END_TIMEOUT);
} else if (!sessionEndJobCurrentDeviceId && sessionEndJobPreviousDeviceId) { } else if (!sessionEndJobCurrentDeviceId && sessionEndJobPreviousDeviceId) {
console.log('found session previous'); console.log('found session previous');
deviceId = previousProfileId; deviceId = previousDeviceId;
const diff = Date.now() - sessionEndJobPreviousDeviceId.timestamp; const diff = Date.now() - sessionEndJobPreviousDeviceId.timestamp;
sessionEndJobPreviousDeviceId.changeDelay(diff + SESSION_END_TIMEOUT); sessionEndJobPreviousDeviceId.changeDelay(diff + SESSION_END_TIMEOUT);
} else { } else {