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

func(session): add Ip address to session,for analyze

Browse source
This commit is contained in:
eagleon 2024-09-12 18:17:07 +08:00
parent e881735a23
commit 3feacde18d
7 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/session.ts
View file

@ -58,6 +58,7 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
subdivision1,
subdivision2,
city,
ip,
};
}
@ -80,6 +81,7 @@ export async function getSession(req: NextApiRequestCollect): Promise<SessionDat
subdivision1,
subdivision2,
city,
ip,
});
} catch (e: any) {
if (!e.message.toLowerCase().includes('unique constraint')) {

1
src/lib/types.ts
View file

@ -221,4 +221,5 @@ export interface SessionData {
subdivision1: string;
subdivision2: string;
city: string;
ip: string;
}

2
src/queries/analytics/sessions/createSession.ts
View file

@ -15,6 +15,7 @@ export async function createSession(data: Prisma.SessionCreateInput) {
subdivision1,
subdivision2,
city,
ip,
} = data;
return prisma.client.session.create({
@ -31,6 +32,7 @@ export async function createSession(data: Prisma.SessionCreateInput) {
subdivision1,
subdivision2,
city,
ip,
},
});
}

4
src/queries/analytics/sessions/getWebsiteSession.ts
View file

@ -25,6 +25,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
country,
subdivision1,
city,
ip,
min(min_time) as "firstAt",
max(max_time) as "lastAt",
count(distinct visit_id) as visits,
@ -44,6 +45,7 @@ async function relationalQuery(websiteId: string, sessionId: string) {
session.country,
session.subdivision1,
session.city,
session.ip,
min(website_event.created_at) as min_time,
max(website_event.created_at) as max_time,
sum(case when website_event.event_type = 1 then 1 else 0 end) as views,
@ -75,6 +77,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
country,
subdivision1,
city,
ip,
${getDateStringSQL('min(min_time)')} as firstAt,
${getDateStringSQL('max(max_time)')} as lastAt,
uniq(visit_id) visits,
@ -94,6 +97,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
country,
subdivision1,
city,
ip,
min(min_time) as min_time,
max(max_time) as max_time,
sum(views) as views,