watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 07:07:17 +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

10
src/lib/load.ts
View file

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

11
src/lib/request.ts
View file

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