.

dashboard/components/referrer/ReferrerBarChart.vue

@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { onMounted } from 'vue';
 
+import dayjs from 'dayjs';
+
 const data = ref<number[]>([]);
 const labels = ref<string[]>([]);
 const ready = ref<boolean>(false);
@@ -13,15 +15,18 @@ async function loadData() {
     const response = await $fetch(`/api/metrics/${activeProject.value?._id.toString()}/timeline/referrers`, {
         method: 'POST',
         ...signHeaders({ 'Content-Type': 'application/json' }),
-        body: JSON.stringify({ slice: 'day', referrer: props.referrer })
+        body: JSON.stringify({
+            slice: 'hour',
+            from: Date.now() - 1000 * 60 * 60 * 12,
+            to: Date.now(),
+            referrer: props.referrer
+        })
     });
 
     if (!response) return;
 
-    const fixed = fixMetrics(response, props.slice);
+    data.value = response.map(e => e.count);
-    console.log(fixed);
+    labels.value = response.map(e => dayjs(e._id).locale(navigator.language));
-    data.value = fixed.data;
-    labels.value = fixed.labels;
     ready.value = true;
 
 }

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

@@ -1,9 +1,9 @@
 import { getTimeline } from "./generic";
 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";
 
-
 export default defineEventHandler(async event => {
     const project_id = getRequestProjectId(event);
     if (!project_id) return;
@@ -12,19 +12,30 @@ export default defineEventHandler(async event => {
     const project = await getUserProjectFromId(project_id, user);
     if (!project) return;
 
-    const { slice, duration, referrer } = await readBody(event);
+    const { slice, referrer, from, to } = await readBody(event);
 
-    // return await Redis.useCache({ key: `timeline:referrers:${project_id}:${slice}`, exp: TIMELINE_EXPIRE_TIME }, async () => {
+    const { group, sort, fromParts } = DateService.getQueryDateRange(slice);
-    const timelineReferrers = await getTimeline(VisitModel, project_id, slice, duration,
-        {},
-        {},
-        { referrer: "$_id.referrer" },
-        { referrer: "$referrer" },
-        { referrer }
-    );
-    return timelineReferrers;
-    // });
 
+    const aggregation = [
+        {
+            $match: {
+                project_id: project._id,
+                created_at: {
+                    $gte: new Date(from),
+                    $lte: new Date(to)
+                },
+                referrer
+            }
+        },
+        { $group: { _id: group, count: { $sum: 1 } } },
+        { $sort: sort },
+        { $project: { _id: { $dateFromParts: fromParts }, count: "$count" } }
+    ]
 
+    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;
 
 });

shared/package.json

@@ -1,5 +1,6 @@
 {
 	"dependencies": {
+		"dayjs": "^1.11.11",
 		"mongoose": "^8.4.0",
 		"nodemailer": "^6.9.13",
 		"redis": "^4.6.14"

shared/pnpm-lock.yaml

@@ -8,6 +8,9 @@ importers:
 
   .:
     dependencies:
+      dayjs:
+        specifier: ^1.11.11
+        version: 1.11.11
       mongoose:
         specifier: ^8.4.0
         version: 8.4.0
@@ -79,6 +82,9 @@ packages:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
 
+  dayjs@1.11.11:
+    resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==}
+
   debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -232,6 +238,8 @@ snapshots:
 
   cluster-key-slot@1.1.2: {}
 
+  dayjs@1.11.11: {}
+
   debug@4.3.4:
     dependencies:
       ms: 2.1.2

shared/services/DateService.ts

@@ -0,0 +1,80 @@
+
+import dayjs from 'dayjs';
+
+export type Slice = 'day' | 'hour' | 'month' | 'year';
+
+class DateService {
+
+    getQueryDateRange(slice: Slice) {
+
+        const group: Record<string, any> = {}
+        const sort: Record<string, any> = {}
+        const fromParts: Record<string, any> = {}
+
+        switch (slice) {
+            case 'hour':
+                group.hour = { $hour: '$created_at' }
+                sort['_id.hour'] = 1;
+                fromParts.hour = "$_id.hour";
+            case 'day':
+                group.day = { $dayOfMonth: '$created_at' }
+                sort['_id.day'] = 1;
+                fromParts.day = "$_id.day";
+            case 'month':
+                group.month = { $month: '$created_at' }
+                sort['_id.month'] = 1;
+                fromParts.month = "$_id.month";
+            case 'year':
+                group.year = { $year: '$created_at' }
+                sort['_id.year'] = 1;
+                fromParts.year = "$_id.year";
+        }
+
+        return { group, sort, fromParts }
+    }
+
+    prepareDateRange(from: string, to: string, slice: Slice) {
+
+        let fromDate = dayjs(from).minute(0).second(0).millisecond(0);
+        let toDate = dayjs(to).minute(0).second(0).millisecond(0);
+
+        switch (slice) {
+            case 'day':
+                fromDate = fromDate.hour(0);
+                toDate = toDate.hour(0);
+                break;
+            case 'hour':
+                break;
+        }
+
+        return {
+            from: fromDate.toDate(),
+            to: toDate.toDate()
+        }
+    }
+
+    fillDates(dates: string[], slice: Slice) {
+        const allDates: dayjs.Dayjs[] = [];
+        const firstDate = dayjs(dates.at(0));
+        const lastDate = dayjs(dates.at(-1));
+        let currentDate = firstDate.clone();
+        while (currentDate.isBefore(lastDate)) {
+            currentDate = currentDate.add(1, slice);
+            allDates.push(currentDate);
+        }
+        return allDates;
+    }
+
+    mergeFilledDates<T extends Record<string, any>, K extends keyof T>(dates: dayjs.Dayjs[], items: T[], dateField: K, slice: Slice, fillData: Omit<T, K>) {
+        const result = new Array<T>();
+        for (const date of dates) {
+            const item = items.find(e => dayjs(e[dateField]).isSame(date), slice);
+            result.push(item ?? { ...fillData, [dateField]: date.format() } as T);
+        }
+        return result;
+    }
+
+}
+
+const dateServiceInstance = new DateService();
+export default dateServiceInstance;