From b630bddef070598a33e37a205c51104d998c8809 Mon Sep 17 00:00:00 2001
From: Emily <adharaultimasheireen@gmail.com>
Date: Tue, 3 Dec 2024 17:40:37 +0100
Subject: [PATCH] fix dates

---
 dashboard/server/api/data/websites_pages.ts                | 7 ++++++-
 .../metrics/[project_id]/timeline/events_stacked.post.ts   | 3 ---
 dashboard/server/api/timeline/events_stacked.ts            | 3 ---
 dashboard/server/services/TimelineService.ts               | 4 +++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dashboard/server/api/data/websites_pages.ts b/dashboard/server/api/data/websites_pages.ts
index 96aacba..4b7ed3a 100644
--- a/dashboard/server/api/data/websites_pages.ts
+++ b/dashboard/server/api/data/websites_pages.ts
@@ -18,7 +18,12 @@ export default defineEventHandler(async event => {
     return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
 
         const result = await VisitModel.aggregate([
-            { $match: { project_id }, },
+            {
+                $match: {
+                    project_id,
+                    created_at: { $gte: new Date(from), $lte: new Date(to) }
+                },
+            },
             { $match: { website: websiteName, }, },
             { $group: { _id: "$page", count: { $sum: 1, } } },
             { $sort: { count: -1 } },
diff --git a/dashboard/server/api/metrics/[project_id]/timeline/events_stacked.post.ts b/dashboard/server/api/metrics/[project_id]/timeline/events_stacked.post.ts
index d099fa9..720d209 100644
--- a/dashboard/server/api/metrics/[project_id]/timeline/events_stacked.post.ts
+++ b/dashboard/server/api/metrics/[project_id]/timeline/events_stacked.post.ts
@@ -30,9 +30,6 @@ export default defineEventHandler(async event => {
             customIdGroup: { name: '$name' },
         })
 
-        // const filledDates = DateService.createBetweenDates(from, to, slice);
-        // const merged = DateService.mergeFilledDates(filledDates.dates, timelineStackedEvents, '_id', slice, { count: 0, name: '' });
-
         return timelineStackedEvents;
     });
 
diff --git a/dashboard/server/api/timeline/events_stacked.ts b/dashboard/server/api/timeline/events_stacked.ts
index 71b26b0..a9e4597 100644
--- a/dashboard/server/api/timeline/events_stacked.ts
+++ b/dashboard/server/api/timeline/events_stacked.ts
@@ -19,9 +19,6 @@ export default defineEventHandler(async event => {
             customIdGroup: { name: '$name' },
         })
 
-        // const filledDates = DateService.createBetweenDates(from, to, slice);
-        // const merged = DateService.mergeFilledDates(filledDates.dates, timelineStackedEvents, '_id', slice, { count: 0, name: '' });
-
         return timelineStackedEvents;
     });
 
diff --git a/dashboard/server/services/TimelineService.ts b/dashboard/server/services/TimelineService.ts
index fd2b2af..38a84ee 100644
--- a/dashboard/server/services/TimelineService.ts
+++ b/dashboard/server/services/TimelineService.ts
@@ -79,7 +79,9 @@ export async function executeTimelineAggregation(options: TimelineAggregationOpt
     return executeAdvancedTimelineAggregation(options);
 }
 
-
+/**
+ * @deprecated use fillAndMergeTimelineAggregationV2
+ */
 export function fillAndMergeTimelineAggregation(timeline: { _id: string, count: number }[], slice: Slice) {
     const filledDates = DateService.fillDates(timeline.map(e => e._id), slice);
     const merged = DateService.mergeFilledDates(filledDates, timeline, '_id', slice, { count: 0 });