watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-12 16:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feat/um 62 prisma property names (#1562)

Browse source 
* checkpoint

* fix pg schema

* fix mysql schema

* change property names
This commit is contained in:
Brian Cao 2022-10-10 13:42:18 -07:00 • committed by GitHub
parent 36edbe2f4c
commit 78338205a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 431 additions and 433 deletions
Download patch file Download diff file Expand all files Collapse all files

8
queries/analytics/stats/getActiveVisitors.js
View file

@ -10,9 +10,9 @@ export async function getActiveVisitors(...args) {
});
}
async function relationalQuery(website_id) {
async function relationalQuery(websiteId) {
const date = subMinutes(new Date(), 5);
const params = [website_id, date];
const params = [websiteId, date];
return prisma.rawQuery(
`select count(distinct session_id) x
@ -23,9 +23,9 @@ async function relationalQuery(website_id) {
);
}
async function clickhouseQuery(website_id) {
async function clickhouseQuery(websiteId) {
const { rawQuery, getDateFormat } = clickhouse;
const params = [website_id];
const params = [websiteId];
return rawQuery(
`select count(distinct session_uuid) x

18
queries/analytics/stats/getRealtimeData.js
View file

@ -10,19 +10,19 @@ export async function getRealtimeData(websites, time) {
]);
return {
pageviews: pageviews.map(({ view_id, ...props }) => ({
__id: `p${view_id}`,
view_id,
pageviews: pageviews.map(({ pageviewId, ...props }) => ({
__id: `p${pageviewId}`,
pageviewId,
...props,
})),
sessions: sessions.map(({ session_id, ...props }) => ({
__id: `s${session_id}`,
session_id,
sessions: sessions.map(({ sessionId, ...props }) => ({
__id: `s${sessionId}`,
sessionId,
...props,
})),
events: events.map(({ event_id, ...props }) => ({
__id: `e${event_id}`,
event_id,
events: events.map(({ eventId, ...props }) => ({
__id: `e${eventId}`,
eventId,
...props,
})),
timestamp: Date.now(),

8
queries/analytics/stats/getWebsiteStats.js
View file

@ -9,9 +9,9 @@ export async function getWebsiteStats(...args) {
});
}
async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
const params = [website_id, start_at, end_at];
const params = [websiteId, start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@ -41,9 +41,9 @@ async function relationalQuery(website_id, { start_at, end_at, filters = {} }) {
);
}
async function clickhouseQuery(website_id, { start_at, end_at, filters = {} }) {
async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {
const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
const params = [website_id];
const params = [websiteId];
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
return rawQuery(