.

dashboard/server/api/metrics/[project_id]/timeline/referrers.post.ts

@@ -3,6 +3,7 @@ import { VisitModel } from "@schema/metrics/VisitSchema";
 import DateService from "@services/DateService";
 import { Redis, TIMELINE_EXPIRE_TIME } from "~/server/services/CacheService";
 import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
+import { executeAdvancedTimelineAggregation, fillAndMergeTimelineAggregation } from "~/server/services/TimelineService";
 
 export default defineEventHandler(async event => {
     const project_id = getRequestProjectId(event);
@@ -12,30 +13,27 @@ export default defineEventHandler(async event => {
     const project = await getUserProjectFromId(project_id, user);
     if (!project) return;
 
-    const { slice, referrer, from, to } = await readBody(event);
+    const { slice, from, to } = await readBody(event);
 
-    const { group, sort, fromParts } = DateService.getQueryDateRange(slice);
+    if (!from) return setResponseStatus(event, 400, 'from is required');
+    if (!from) return setResponseStatus(event, 400, 'to is required');
+    if (!from) return setResponseStatus(event, 400, 'slice is required');
 
-    const aggregation = [
-        {
-            $match: {
-                project_id: project._id,
-                created_at: {
-                    $gte: new Date(from),
-                    $lte: new Date(to)
-                },
-                referrer
+    return await Redis.useCache({
+        key: `timeline:referrers:${project_id}:${slice}:${from || 'none'}:${to || 'none'}`,
+        exp: TIMELINE_EXPIRE_TIME
+    }, async () => {
+        const timelineData = await executeAdvancedTimelineAggregation({
+            projectId: project._id,
+            model: VisitModel,
+            from, to, slice,
+            customMatch: {
+                referrer: '$referrer'
             }
-        },
-        { $group: { _id: group, count: { $sum: 1 } } },
-        { $sort: sort },
-        { $project: { _id: { $dateFromParts: fromParts }, count: "$count" } }
-    ]
+        });
+        const timelineFilledMerged = fillAndMergeTimelineAggregation(timelineData, slice);
+        return timelineFilledMerged;
+    });
 
-    const timelineReferrers: { _id: string, count: number }[] = await VisitModel.aggregate(aggregation);
-
-    const filledDates = DateService.fillDates(timelineReferrers.map(e => e._id), slice);
-    const merged = DateService.mergeFilledDates(filledDates, timelineReferrers, '_id', slice, { count: 0 });
-    return merged;
 
 });