Elizhium/litlyx
1
0
Fork 0
mirror of https://github.com/Litlyx/litlyx synced 2025-12-10 07:48:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix dates

Browse Source
This commit is contained in:
Emily
2024-12-03 17:40:37 +01:00
parent 30e428a8dc
commit b630bddef0
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dashboard/server/api/data/websites_pages.ts
View File

@@ -18,7 +18,12 @@ export default defineEventHandler(async event => {
return await Redis.useCacheV2(cacheKey, cacheExp, async () => { return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
const result = await VisitModel.aggregate([ const result = await VisitModel.aggregate([
{ $match: { project_id }, }, {
$match: {
project_id,
created_at: { $gte: new Date(from), $lte: new Date(to) }
},
},
{ $match: { website: websiteName, }, }, { $match: { website: websiteName, }, },
{ $group: { _id: "$page", count: { $sum: 1, } } }, { $group: { _id: "$page", count: { $sum: 1, } } },
{ $sort: { count: -1 } }, { $sort: { count: -1 } },

3
dashboard/server/api/metrics/[project_id]/timeline/events_stacked.post.ts
View File

@@ -30,9 +30,6 @@ export default defineEventHandler(async event => {
customIdGroup: { name: '$name' }, customIdGroup: { name: '$name' },
}) })
// const filledDates = DateService.createBetweenDates(from, to, slice);
// const merged = DateService.mergeFilledDates(filledDates.dates, timelineStackedEvents, '_id', slice, { count: 0, name: '' });
return timelineStackedEvents; return timelineStackedEvents;
}); });

3
dashboard/server/api/timeline/events_stacked.ts
View File

@@ -19,9 +19,6 @@ export default defineEventHandler(async event => {
customIdGroup: { name: '$name' }, customIdGroup: { name: '$name' },
}) })
// const filledDates = DateService.createBetweenDates(from, to, slice);
// const merged = DateService.mergeFilledDates(filledDates.dates, timelineStackedEvents, '_id', slice, { count: 0, name: '' });
return timelineStackedEvents; return timelineStackedEvents;
}); });

4
dashboard/server/services/TimelineService.ts
View File

@@ -79,7 +79,9 @@ export async function executeTimelineAggregation(options: TimelineAggregationOpt
return executeAdvancedTimelineAggregation(options); return executeAdvancedTimelineAggregation(options);
} }
/**
* @deprecated use fillAndMergeTimelineAggregationV2
*/
export function fillAndMergeTimelineAggregation(timeline: { _id: string, count: number }[], slice: Slice) { export function fillAndMergeTimelineAggregation(timeline: { _id: string, count: number }[], slice: Slice) {
const filledDates = DateService.fillDates(timeline.map(e => e._id), slice); const filledDates = DateService.fillDates(timeline.map(e => e._id), slice);
const merged = DateService.mergeFilledDates(filledDates, timeline, '_id', slice, { count: 0 }); const merged = DateService.mergeFilledDates(filledDates, timeline, '_id', slice, { count: 0 });