.

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

@@ -2,7 +2,7 @@ import { getTimeline } from "./generic";
 import { Redis, TIMELINE_EXPIRE_TIME } from "~/server/services/CacheService";
 import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
 import { SessionModel } from "@schema/metrics/SessionSchema";
-
+import DateService from "@services/DateService";
 
 export default defineEventHandler(async event => {
     const project_id = getRequestProjectId(event);
@@ -12,11 +12,37 @@ export default defineEventHandler(async event => {
     const project = await getUserProjectFromId(project_id, user);
     if (!project) return;
 
-    const { slice, duration } = await readBody(event);
 
-    return await Redis.useCache({ key: `timeline:sessions:${project_id}:${slice}`, exp: TIMELINE_EXPIRE_TIME }, async () => {
-        const timelineSessions = await getTimeline(SessionModel, project_id, slice, duration);
-        return timelineSessions;
+    const { slice, from, to } = await readBody(event);
+
+    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');
+
+     return await Redis.useCache({
+         key: `timeline:sessions:${project_id}:${slice}:${from || 'none'}:${to || 'none'}`,
+         exp: TIMELINE_EXPIRE_TIME
+     }, async () => {
+
+    const { group, sort, fromParts } = DateService.getQueryDateRange(slice);
+
+    const aggregation = [
+        {
+            $match: {
+                project_id: project._id,
+                created_at: { $gte: new Date(from), $lte: new Date(to) },
+            }
+        },
+        { $group: { _id: group, count: { $sum: 1 } } },
+        { $sort: sort },
+        { $project: { _id: { $dateFromParts: fromParts }, count: "$count" } }
+    ]
+
+    const timelineVisits: { _id: string, count: number }[] = await SessionModel.aggregate(aggregation);
+    const filledDates = DateService.fillDates(timelineVisits.map(e => e._id), slice);
+    const merged = DateService.mergeFilledDates(filledDates, timelineVisits, '_id', slice, { count: 0 });
+    return merged;
+
     });
 
 

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

@@ -1,7 +1,7 @@
-import { getTimeline } from "./generic";
 import { VisitModel } from "@schema/metrics/VisitSchema";
 import { Redis, TIMELINE_EXPIRE_TIME } from "~/server/services/CacheService";
 import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
+import DateService from "@services/DateService";
 
 
 export default defineEventHandler(async event => {
@@ -12,11 +12,37 @@ export default defineEventHandler(async event => {
     const project = await getUserProjectFromId(project_id, user);
     if (!project) return;
 
-    const { slice, duration } = await readBody(event);
 
-    return await Redis.useCache({ key: `timeline:visits:${project_id}:${slice}`, exp: TIMELINE_EXPIRE_TIME }, async () => {
-        const timelineVisits = await getTimeline(VisitModel, project_id, slice, duration);
-        return timelineVisits;
+    const { slice, from, to } = await readBody(event);
+
+    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');
+
+    return await Redis.useCache({
+        key: `timeline:visits:${project_id}:${slice}:${from || 'none'}:${to || 'none'}`,
+        exp: TIMELINE_EXPIRE_TIME
+    }, async () => {
+
+        const { group, sort, fromParts } = DateService.getQueryDateRange(slice);
+
+        const aggregation = [
+            {
+                $match: {
+                    project_id: project._id,
+                    created_at: { $gte: new Date(from), $lte: new Date(to) },
+                }
+            },
+            { $group: { _id: group, count: { $sum: 1 } } },
+            { $sort: sort },
+            { $project: { _id: { $dateFromParts: fromParts }, count: "$count" } }
+        ]
+
+        const timelineVisits: { _id: string, count: number }[] = await VisitModel.aggregate(aggregation);
+        const filledDates = DateService.fillDates(timelineVisits.map(e => e._id), slice);
+        const merged = DateService.mergeFilledDates(filledDates, timelineVisits, '_id', slice, { count: 0 });
+        return merged;
+
     });
 
 

dashboard/server/services/CacheService.ts

@@ -21,6 +21,7 @@ export class Redis {
         url: runtimeConfig.REDIS_URL,
         username: runtimeConfig.REDIS_USERNAME,
         password: runtimeConfig.REDIS_PASSWORD,
+        database: process.dev ? 1 : 0
     });
 
     static async init() {