m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-376-retention-report

Browse Source
This commit is contained in:
Francis Cao 2023-08-04 13:34:10 -07:00
commit 9deda2b4f2
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/api/websites/[id]/pageviews.ts
View File

@ -4,9 +4,8 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types'; import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
import { canViewWebsite } from 'lib/auth'; import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware'; import { useAuth, useCors } from 'lib/middleware';
import { getPageviewStats } from 'queries'; import { getPageviewStats, getSessionStats } from 'queries';
import { parseDateRangeQuery } from 'lib/query'; import { parseDateRangeQuery } from 'lib/query';
import { getSessionStats } from '../../../../queries/analytics/sessions/getSessionStats';
export interface WebsitePageviewRequestQuery { export interface WebsitePageviewRequestQuery {
id: string; id: string;

5
queries/analytics/sessions/getSessionMetrics.ts
View File

@ -15,7 +15,7 @@ export async function getSessionMetrics(
async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) { async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
const { parseFilters, rawQuery } = prisma; const { parseFilters, rawQuery } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
}); });
@ -23,7 +23,8 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
return rawQuery( return rawQuery(
`select ${column} x, count(*) y `select ${column} x, count(*) y
from website_event from website_event
${joinSession} inner join session
on session.session_id = website_event.session_id
where website_event.website_id = {{websiteId::uuid}} where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}} and website_event.created_at between {{startDate}} and {{endDate}}
and website_event.event_type = {{eventType}} and website_event.event_type = {{eventType}}

5
queries/analytics/sessions/getSessionStats.ts
View File

@ -14,7 +14,7 @@ export async function getSessionStats(...args: [websiteId: string, filters: Quer
async function relationalQuery(websiteId: string, filters: QueryFilters) { async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { timezone = 'utc', unit = 'day' } = filters; const { timezone = 'utc', unit = 'day' } = filters;
const { getDateQuery, parseFilters, rawQuery } = prisma; const { getDateQuery, parseFilters, rawQuery } = prisma;
const { filterQuery, joinSession, params } = await parseFilters(websiteId, { const { filterQuery, params } = await parseFilters(websiteId, {
...filters, ...filters,
eventType: EVENT_TYPE.pageView, eventType: EVENT_TYPE.pageView,
}); });
@ -25,7 +25,8 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
${getDateQuery('website_event.created_at', unit, timezone)} x, ${getDateQuery('website_event.created_at', unit, timezone)} x,
count(distinct website_event.session_id) y count(distinct website_event.session_id) y
from website_event from website_event
${joinSession} inner join session
on session.session_id = website_event.session_id
where website_event.website_id = {{websiteId::uuid}} where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}} and website_event.created_at between {{startDate}} and {{endDate}}
and event_type = {{eventType}} and event_type = {{eventType}}

1
queries/index.js
View File

@ -20,6 +20,7 @@ export * from './analytics/sessions/createSession';
export * from './analytics/sessions/getSession'; export * from './analytics/sessions/getSession';
export * from './analytics/sessions/getSessionMetrics'; export * from './analytics/sessions/getSessionMetrics';
export * from './analytics/sessions/getSessions'; export * from './analytics/sessions/getSessions';
export * from './analytics/sessions/getSessionStats';
export * from './analytics/sessions/saveSessionData'; export * from './analytics/sessions/saveSessionData';
export * from './analytics/stats/getActiveVisitors'; export * from './analytics/stats/getActiveVisitors';
export * from './analytics/stats/getRealtimeData'; export * from './analytics/stats/getRealtimeData';