mirror of
https://github.com/Litlyx/litlyx
synced 2026-02-04 06:32:20 +01:00
actionable chart + date service
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
|
||||
|
||||
import { SessionModel } from "@schema/metrics/SessionSchema";
|
||||
import { VisitModel } from "@schema/metrics/VisitSchema";
|
||||
import { Redis } from "~/server/services/CacheService";
|
||||
import DateService from "@services/DateService";
|
||||
import mongoose from "mongoose";
|
||||
|
||||
import { checkSliceValidity, generateDateSlices } from "~/server/services/TimelineService";
|
||||
|
||||
export default defineEventHandler(async event => {
|
||||
|
||||
@@ -19,28 +20,22 @@ export default defineEventHandler(async event => {
|
||||
|
||||
return await Redis.useCacheV2(cacheKey, cacheExp, async (noStore, updateExp) => {
|
||||
|
||||
const dateDistDays = (new Date(to).getTime() - new Date(from).getTime()) / (1000 * 60 * 60 * 24)
|
||||
// 15 Days
|
||||
if (slice === 'hour' && (dateDistDays > 15)) throw Error('Date gap too big for this slice');
|
||||
// 1 Year
|
||||
if (slice === 'day' && (dateDistDays > 365)) throw Error('Date gap too big for this slice');
|
||||
// 3 Years
|
||||
if (slice === 'month' && (dateDistDays > 365 * 3)) throw Error('Date gap too big for this slice');
|
||||
const [sliceValid, errorOrDays] = checkSliceValidity(from, to, slice);
|
||||
if (!sliceValid) throw Error(errorOrDays);
|
||||
|
||||
|
||||
const allDates = DateService.createBetweenDates(from, to, slice as any);
|
||||
const allDates = generateDateSlices(slice, new Date(from), new Date(to));
|
||||
|
||||
const result: { _id: string, count: number }[] = [];
|
||||
|
||||
for (const date of allDates.dates) {
|
||||
for (const date of allDates) {
|
||||
|
||||
const visits = await VisitModel.aggregate([
|
||||
{
|
||||
$match: {
|
||||
project_id: project_id,
|
||||
created_at: {
|
||||
$gte: date.startOf(slice as any).toDate(),
|
||||
$lte: date.endOf(slice as any).toDate()
|
||||
$gte: DateService.startOfSlice(date, slice),
|
||||
$lte: DateService.endOfSlice(date, slice)
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -52,8 +47,8 @@ export default defineEventHandler(async event => {
|
||||
$match: {
|
||||
project_id: project_id,
|
||||
created_at: {
|
||||
$gte: date.startOf(slice as any).toDate(),
|
||||
$lte: date.endOf(slice as any).toDate()
|
||||
$gte: DateService.startOfSlice(date, slice),
|
||||
$lte: DateService.endOfSlice(date, slice)
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -68,10 +63,7 @@ export default defineEventHandler(async event => {
|
||||
const total = visits.length;
|
||||
const bounced = sessions.filter(e => (e.duration / e.count) < 1).length;
|
||||
const bouncing_rate = 100 / total * bounced;
|
||||
result.push({
|
||||
_id: date.toISOString(),
|
||||
count: bouncing_rate
|
||||
});
|
||||
result.push({ _id: date.toISOString(), count: bouncing_rate });
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -31,17 +31,10 @@ export async function executeAdvancedTimelineAggregation<T = {}>(options: Advanc
|
||||
|
||||
if (!sort) throw Error('Slice is probably not correct');
|
||||
|
||||
const daysDiff = fns.differenceInDays(new Date(options.to), new Date(options.from));
|
||||
|
||||
// 3 Days
|
||||
if (options.slice === 'hour' && (daysDiff > 3)) throw Error('Date gap too big for this slice');
|
||||
// 3 Weeks
|
||||
if (options.slice === 'day' && (daysDiff > 7 * 3)) throw Error('Date gap too big for this slice');
|
||||
// 3 Months
|
||||
if (options.slice === 'week' && (daysDiff > 30 * 3)) throw Error('Date gap too big for this slice');
|
||||
// 3 Years
|
||||
if (options.slice === 'month' && (daysDiff > 365 * 3)) throw Error('Date gap too big for this slice');
|
||||
const [sliceValid, errorOrDays] = checkSliceValidity(options.from, options.to, options.slice);
|
||||
|
||||
if (!sliceValid) throw Error(errorOrDays);
|
||||
|
||||
const aggregation = [
|
||||
{
|
||||
@@ -96,7 +89,11 @@ export function fillAndMergeTimelineAggregationV2(timeline: { _id: string, count
|
||||
return merged;
|
||||
}
|
||||
|
||||
function generateDateSlices(slice: Slice, fromDate: Date, toDate: Date) {
|
||||
export function checkSliceValidity(from: string | number | Date, to: string | number | Date, slice: Slice): [false, string] | [true, number] {
|
||||
return DateService.canUseSlice(from, to, slice);
|
||||
}
|
||||
|
||||
export function generateDateSlices(slice: Slice, fromDate: Date, toDate: Date) {
|
||||
const slices: Date[] = [];
|
||||
let currentDate = fromDate;
|
||||
const addFunctions: { [key in Slice]: any } = { hour: fns.addHours, day: fns.addDays, week: fns.addWeeks, month: fns.addMonths, year: fns.addYears };
|
||||
|
||||
Reference in New Issue
Block a user