watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor 6 month retention. use auth instead of cache:website

Browse source
This commit is contained in:
Francis Cao 2025-12-18 10:35:52 -08:00
parent 37b6194c5f
commit 741c6039e6
29 changed files with 43 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/api/reports/attribution/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const data = await getAttribution(websiteId, parameters as AttributionParameters, filters); const data = await getAttribution(websiteId, parameters as AttributionParameters, filters);

4
src/app/api/reports/breakdown/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters); const data = await getBreakdown(websiteId, parameters as BreakdownParameters, filters);

4
src/app/api/reports/funnel/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const data = await getFunnel(websiteId, parameters as FunnelParameters, filters); const data = await getFunnel(websiteId, parameters as FunnelParameters, filters);

4
src/app/api/reports/goal/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const data = await getGoal(websiteId, parameters as GoalParameters, filters); const data = await getGoal(websiteId, parameters as GoalParameters, filters);

4
src/app/api/reports/retention/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const data = await getRetention(websiteId, parameters as RetentionParameters, filters); const data = await getRetention(websiteId, parameters as RetentionParameters, filters);

4
src/app/api/reports/revenue/route.ts
View file

@ -17,8 +17,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const data = await getRevenue(websiteId, parameters as RevenuParameters, filters); const data = await getRevenue(websiteId, parameters as RevenuParameters, filters);

4
src/app/api/reports/utm/route.ts
View file

@ -18,8 +18,8 @@ export async function POST(request: Request) {
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(body.filters, websiteId); const filters = await getQueryFilters(body.filters, websiteId, auth.user.id);
const parameters = await setWebsiteDate(websiteId, body.parameters); const parameters = await setWebsiteDate(websiteId, auth.user.id, body.parameters);
const data = { const data = {
utm_source: [], utm_source: [],

2
src/app/api/websites/[websiteId]/event-data/events/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventDataEvents(websiteId, { const data = await getEventDataEvents(websiteId, {
...filters, ...filters,

2
src/app/api/websites/[websiteId]/event-data/fields/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventDataFields(websiteId, filters); const data = await getEventDataFields(websiteId, filters);

2
src/app/api/websites/[websiteId]/event-data/properties/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventDataProperties(websiteId, filters); const data = await getEventDataProperties(websiteId, filters);

2
src/app/api/websites/[websiteId]/event-data/stats/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventDataStats(websiteId, filters); const data = await getEventDataStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/event-data/values/route.ts
View file

@ -30,7 +30,7 @@ export async function GET(
} }
const { propertyName } = query; const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventDataValues(websiteId, { const data = await getEventDataValues(websiteId, {
...filters, ...filters,

2
src/app/api/websites/[websiteId]/events/route.ts
View file

@ -29,7 +29,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getWebsiteEvents(websiteId, filters); const data = await getWebsiteEvents(websiteId, filters);

2
src/app/api/websites/[websiteId]/events/series/route.ts
View file

@ -29,7 +29,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getEventStats(websiteId, filters); const data = await getEventStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/export/route.ts
View file

@ -28,7 +28,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([ const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([
getEventMetrics(websiteId, { type: 'event' }, filters), getEventMetrics(websiteId, { type: 'event' }, filters),

2
src/app/api/websites/[websiteId]/metrics/expanded/route.ts
View file

@ -37,7 +37,7 @@ export async function GET(
} }
const { type, limit, offset, search } = query; const { type, limit, offset, search } = query;
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
if (search) { if (search) {
filters[type] = `c.${search}`; filters[type] = `c.${search}`;

2
src/app/api/websites/[websiteId]/metrics/route.ts
View file

@ -37,7 +37,7 @@ export async function GET(
} }
const { type, limit, offset, search } = query; const { type, limit, offset, search } = query;
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
if (search) { if (search) {
filters[type] = `c.${search}`; filters[type] = `c.${search}`;

2
src/app/api/websites/[websiteId]/pageviews/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const [pageviews, sessions] = await Promise.all([ const [pageviews, sessions] = await Promise.all([
getPageviewStats(websiteId, filters), getPageviewStats(websiteId, filters),

2
src/app/api/websites/[websiteId]/session-data/properties/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getSessionDataProperties(websiteId, filters); const data = await getSessionDataProperties(websiteId, filters);

2
src/app/api/websites/[websiteId]/session-data/values/route.ts
View file

@ -29,7 +29,7 @@ export async function GET(
} }
const { propertyName } = query; const { propertyName } = query;
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getSessionDataValues(websiteId, { const data = await getSessionDataValues(websiteId, {
...filters, ...filters,

2
src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts
View file

@ -25,7 +25,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getSessionActivity(websiteId, sessionId, filters); const data = await getSessionActivity(websiteId, sessionId, filters);

2
src/app/api/websites/[websiteId]/sessions/route.ts
View file

@ -28,7 +28,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getWebsiteSessions(websiteId, filters); const data = await getWebsiteSessions(websiteId, filters);

2
src/app/api/websites/[websiteId]/sessions/stats/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const metrics = await getWebsiteSessionStats(websiteId, filters); const metrics = await getWebsiteSessionStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/sessions/weekly/route.ts
View file

@ -28,7 +28,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getWeeklyTraffic(websiteId, filters); const data = await getWeeklyTraffic(websiteId, filters);

2
src/app/api/websites/[websiteId]/stats/route.ts
View file

@ -27,7 +27,7 @@ export async function GET(
return unauthorized(); return unauthorized();
} }
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
const data = await getWebsiteStats(websiteId, filters); const data = await getWebsiteStats(websiteId, filters);

2
src/app/api/websites/[websiteId]/values/route.ts
View file

@ -42,7 +42,7 @@ export async function GET(
value: segment.name, value: segment.name,
})); }));
} else { } else {
const filters = await getQueryFilters(query, websiteId); const filters = await getQueryFilters(query, websiteId, auth.user.id);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters); values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
} }

4
src/app/api/websites/route.ts
View file

@ -1,6 +1,6 @@
import { z } from 'zod'; import { z } from 'zod';
import { uuid } from '@/lib/crypto'; import { uuid } from '@/lib/crypto';
import redis from '@/lib/redis'; import { fetchAccount } from '@/lib/load';
import { getQueryFilters, parseRequest } from '@/lib/request'; import { getQueryFilters, parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response'; import { json, unauthorized } from '@/lib/response';
import { pagingParams, searchParams } from '@/lib/schema'; import { pagingParams, searchParams } from '@/lib/schema';
@ -52,7 +52,7 @@ export async function POST(request: Request) {
const { id, name, domain, shareId, teamId } = body; const { id, name, domain, shareId, teamId } = body;
if (process.env.CLOUD_MODE && !teamId) { if (process.env.CLOUD_MODE && !teamId) {
const account = await redis.client.get(`account:${auth.user.id}`); const account = await fetchAccount(auth.user.id);
if (!account?.hasSubscription) { if (!account?.hasSubscription) {
const count = await getWebsiteCount(auth.user.id); const count = await getWebsiteCount(auth.user.id);

10
src/lib/load.ts
View file

@ -39,14 +39,8 @@ export async function fetchSession(websiteId: string, sessionId: string): Promis
return session; return session;
} }
export async function fetchAccount(websiteId: string) { export async function fetchAccount(userId: string) {
let account = null; const account = await redis.client.get(`account:${userId}`);
const cache = await redis.client.get(`cache:website:${websiteId}`);
if (cache) {
account = await redis.client.get(`account:${cache.account_id}`);
}
return account; return account;
} }

11
src/lib/request.ts
View file

@ -17,7 +17,7 @@ export async function parseRequest(
const url = new URL(request.url); const url = new URL(request.url);
let query = Object.fromEntries(url.searchParams); let query = Object.fromEntries(url.searchParams);
let body = await getJsonBody(request); let body = await getJsonBody(request);
let error: () => undefined | undefined; let error: () => undefined | undefined | Response;
let auth = null; let auth = null;
if (schema) { if (schema) {
@ -81,12 +81,12 @@ export function getRequestFilters(query: Record<string, any>) {
return result; return result;
} }
export async function setWebsiteDate(websiteId: string, data: Record<string, any>) { export async function setWebsiteDate(websiteId: string, userId: string, data: Record<string, any>) {
const website = await fetchWebsite(websiteId); const website = await fetchWebsite(websiteId);
const cloudMode = !!process.env.CLOUD_MODE; const cloudMode = !!process.env.CLOUD_MODE;
if (cloudMode) { if (cloudMode && !website.teamId) {
const account = await fetchAccount(websiteId); const account = await fetchAccount(userId);
if (!account?.hasSubscription) { if (!account?.hasSubscription) {
data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6))); data.startDate = maxDate(data.startDate, startOfMonth(subMonths(new Date(), 6)));
@ -103,12 +103,13 @@ export async function setWebsiteDate(websiteId: string, data: Record<string, any
export async function getQueryFilters( export async function getQueryFilters(
params: Record<string, any>, params: Record<string, any>,
websiteId?: string, websiteId?: string,
userId?: string,
): Promise<QueryFilters> { ): Promise<QueryFilters> {
const dateRange = getRequestDateRange(params); const dateRange = getRequestDateRange(params);
const filters = getRequestFilters(params); const filters = getRequestFilters(params);
if (websiteId) { if (websiteId) {
await setWebsiteDate(websiteId, dateRange); await setWebsiteDate(websiteId, userId, dateRange);
if (params.segment) { if (params.segment) {
const segmentParams = (await getWebsiteSegment(websiteId, params.segment)) const segmentParams = (await getWebsiteSegment(websiteId, params.segment))