refactoring

This commit is contained in:
Emily
2025-03-03 19:31:35 +01:00
parent 76e5e07f79
commit 63fa3995c5
70 changed files with 2928 additions and 418 deletions

View File

@@ -9,16 +9,16 @@ import { checkSliceValidity } from "~/server/services/TimelineService";
export default defineEventHandler(async event => {
const data = await getRequestDataOld(event, { requireSchema: false, requireSlice: true });
const data = await getRequestData(event, ['SLICE', 'RANGE', 'DOMAIN'], ['WEB']);
if (!data) return;
const { pid, from, to, slice, project_id } = data;
const { pid, from, to, slice, project_id, domain } = data;
const cacheKey = `timeline:bouncing_rate:${pid}:${slice}:${from}:${to}`;
const cacheExp = 60 * 60; //1 hour
return await Redis.useCacheV2(cacheKey, cacheExp, async (noStore, updateExp) => {
return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
const [sliceValid, errorOrDays] = checkSliceValidity(from, to, slice);
if (!sliceValid) throw Error(errorOrDays);
@@ -36,7 +36,8 @@ export default defineEventHandler(async event => {
created_at: {
$gte: DateService.startOfSlice(date, slice),
$lte: DateService.endOfSlice(date, slice)
}
},
website: domain
},
},
{ $group: { _id: "$session", count: { $sum: 1, } } },

View File

@@ -4,7 +4,7 @@ import { executeTimelineAggregation } from "~/server/services/TimelineService";
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['SLICE', 'GUEST', 'DOMAIN', 'RANGE', 'OFFSET']);
const data = await getRequestData(event, ['SLICE', 'DOMAIN', 'RANGE', 'OFFSET'], ['EVENTS']);
if (!data) return;
const { pid, from, to, slice, project_id, timeOffset, domain } = data;

View File

@@ -4,7 +4,7 @@ import { executeAdvancedTimelineAggregation } from "~/server/services/TimelineSe
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['GUEST', 'RANGE', 'SLICE', 'DOMAIN']);
const data = await getRequestData(event, ['RANGE', 'SLICE', 'DOMAIN'], ['EVENTS']);
if (!data) return;
const { from, to, slice, project_id, timeOffset, domain } = data;

View File

@@ -4,7 +4,7 @@ import { executeTimelineAggregation } from "~/server/services/TimelineService";
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['SLICE', 'GUEST', 'DOMAIN', 'RANGE', 'OFFSET']);
const data = await getRequestData(event, ['SLICE', 'DOMAIN', 'RANGE', 'OFFSET'], ['WEB']);
if (!data) return;
const { pid, from, to, slice, project_id, timeOffset, domain } = data;

View File

@@ -4,10 +4,10 @@ import { executeAdvancedTimelineAggregation, fillAndMergeTimelineAggregationV2 }
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['SLICE', 'GUEST', 'DOMAIN', 'RANGE']);
const data = await getRequestData(event, ['SLICE', 'DOMAIN', 'RANGE'], ['WEB']);
if (!data) return;
const { pid, from, to, slice, project_id, timeOffset, domain } = data;
const { pid, from, to, slice, project_id, domain } = data;
const cacheKey = `timeline:sessions_duration:${pid}:${slice}:${from}:${to}:${domain}`;
const cacheExp = 60;

View File

@@ -4,7 +4,7 @@ import { executeAdvancedTimelineAggregation } from "~/server/services/TimelineSe
export default defineEventHandler(async event => {
const data = await getRequestData(event, ['SLICE', 'GUEST', 'DOMAIN', 'RANGE', 'OFFSET']);
const data = await getRequestData(event, ['SLICE', 'DOMAIN', 'RANGE', 'OFFSET'], ['WEB']);
if (!data) return;
const { pid, from, to, slice, project_id, timeOffset, domain } = data;