mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-15 17:55:08 +01:00
commit
226a7013e1
@ -98,14 +98,18 @@ export function getDateArray(data, startDate, endDate, unit) {
|
|||||||
|
|
||||||
function findData(t) {
|
function findData(t) {
|
||||||
const x = data.find(e => {
|
const x = data.find(e => {
|
||||||
return getLocalTime(new Date(e.t)).getTime() === normalize(new Date(t)).getTime();
|
if (unit === 'day') {
|
||||||
|
const [year, month, day] = e.t.split('-');
|
||||||
|
return normalize(new Date(year, month - 1, day)).getTime() === t.getTime();
|
||||||
|
}
|
||||||
|
return normalize(new Date(e.t)).getTime() === t.getTime();
|
||||||
});
|
});
|
||||||
|
|
||||||
return x?.y || 0;
|
return x?.y || 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let i = 0; i < n; i++) {
|
for (let i = 0; i < n; i++) {
|
||||||
const t = add(startDate, i);
|
const t = normalize(add(startDate, i));
|
||||||
const y = findData(t);
|
const y = findData(t);
|
||||||
|
|
||||||
arr.push({ ...data[i], t, y });
|
arr.push({ ...data[i], t, y });
|
||||||
|
@ -5,7 +5,7 @@ import { subMinutes } from 'date-fns';
|
|||||||
const POSTGRESQL = 'postgresql';
|
const POSTGRESQL = 'postgresql';
|
||||||
const MYSQL = 'mysql';
|
const MYSQL = 'mysql';
|
||||||
|
|
||||||
const DATE_FORMATS = {
|
const MYSQL_DATE_FORMATS = {
|
||||||
minute: '%Y-%m-%d %H:%i:00',
|
minute: '%Y-%m-%d %H:%i:00',
|
||||||
hour: '%Y-%m-%d %H:00:00',
|
hour: '%Y-%m-%d %H:00:00',
|
||||||
day: '%Y-%m-%d',
|
day: '%Y-%m-%d',
|
||||||
@ -13,18 +13,38 @@ const DATE_FORMATS = {
|
|||||||
year: '%Y-01-01',
|
year: '%Y-01-01',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const POSTGRESQL_DATE_FORMATS = {
|
||||||
|
minute: 'YYYY-MM-DD HH24:MI:00',
|
||||||
|
hour: 'YYYY-MM-DD HH24:00:00',
|
||||||
|
day: 'YYYY-MM-DD',
|
||||||
|
month: 'YYYY-MM-01',
|
||||||
|
year: 'YYYY-01-01',
|
||||||
|
};
|
||||||
|
|
||||||
export function getDatabase() {
|
export function getDatabase() {
|
||||||
return process.env.DATABASE_TYPE || process.env.DATABASE_URL.split(':')[0];
|
return (
|
||||||
|
process.env.DATABASE_TYPE ||
|
||||||
|
(process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0])
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getDateQuery(field, unit, timezone) {
|
export function getDateQuery(db, field, unit, timezone) {
|
||||||
|
if (db === POSTGRESQL) {
|
||||||
|
if (timezone) {
|
||||||
|
return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
|
||||||
|
}
|
||||||
|
return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (db === MYSQL) {
|
||||||
if (timezone) {
|
if (timezone) {
|
||||||
const tz = moment.tz(timezone).format('Z');
|
const tz = moment.tz(timezone).format('Z');
|
||||||
|
|
||||||
return `DATE_FORMAT(convert_tz(${field},'+00:00','${tz}'), '${DATE_FORMATS[unit]}')`;
|
return `DATE_FORMAT(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `DATE_FORMAT(${field}, '${DATE_FORMATS[unit]}')`;
|
return `DATE_FORMAT(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getWebsiteById(website_id) {
|
export async function getWebsiteById(website_id) {
|
||||||
@ -258,7 +278,7 @@ export function getMetrics(website_id, start_at, end_at) {
|
|||||||
sum(t.time) as "totaltime"
|
sum(t.time) as "totaltime"
|
||||||
from (
|
from (
|
||||||
select session_id,
|
select session_id,
|
||||||
date_trunc('hour', created_at),
|
${getDateQuery(db, 'created_at', 'hour')},
|
||||||
count(*) c,
|
count(*) c,
|
||||||
floor(extract(epoch from max(created_at) - min(created_at))) as "time"
|
floor(extract(epoch from max(created_at) - min(created_at))) as "time"
|
||||||
from pageview
|
from pageview
|
||||||
@ -282,7 +302,7 @@ export function getMetrics(website_id, start_at, end_at) {
|
|||||||
sum(t.time) as "totaltime"
|
sum(t.time) as "totaltime"
|
||||||
from (
|
from (
|
||||||
select session_id,
|
select session_id,
|
||||||
${getDateQuery('created_at', 'hour')},
|
${getDateQuery(db, 'created_at', 'hour')},
|
||||||
count(*) c,
|
count(*) c,
|
||||||
floor(unix_timestamp(max(created_at)) - unix_timestamp(min(created_at))) as "time"
|
floor(unix_timestamp(max(created_at)) - unix_timestamp(min(created_at))) as "time"
|
||||||
from pageview
|
from pageview
|
||||||
@ -313,7 +333,7 @@ export function getPageviews(
|
|||||||
if (db === POSTGRESQL) {
|
if (db === POSTGRESQL) {
|
||||||
return prisma.$queryRaw(
|
return prisma.$queryRaw(
|
||||||
`
|
`
|
||||||
select date_trunc('${unit}', created_at at time zone '${timezone}') t,
|
select ${getDateQuery(db, 'created_at', unit, timezone)} t,
|
||||||
count(${count}) y
|
count(${count}) y
|
||||||
from pageview
|
from pageview
|
||||||
where website_id=$1
|
where website_id=$1
|
||||||
@ -330,7 +350,7 @@ export function getPageviews(
|
|||||||
if (db === MYSQL) {
|
if (db === MYSQL) {
|
||||||
return prisma.$queryRaw(
|
return prisma.$queryRaw(
|
||||||
`
|
`
|
||||||
select ${getDateQuery('created_at', unit, timezone)} t,
|
select ${getDateQuery(db, 'created_at', unit, timezone)} t,
|
||||||
count(${count}) y
|
count(${count}) y
|
||||||
from pageview
|
from pageview
|
||||||
where website_id=?
|
where website_id=?
|
||||||
@ -430,7 +450,7 @@ export function getEvents(website_id, start_at, end_at, timezone = 'utc', unit =
|
|||||||
`
|
`
|
||||||
select
|
select
|
||||||
event_value x,
|
event_value x,
|
||||||
date_trunc('${unit}', created_at at time zone '${timezone}') t,
|
${getDateQuery(db, 'created_at', unit, timezone)} t,
|
||||||
count(*) y
|
count(*) y
|
||||||
from event
|
from event
|
||||||
where website_id=$1
|
where website_id=$1
|
||||||
@ -449,7 +469,7 @@ export function getEvents(website_id, start_at, end_at, timezone = 'utc', unit =
|
|||||||
`
|
`
|
||||||
select
|
select
|
||||||
event_value x,
|
event_value x,
|
||||||
${getDateQuery('created_at', unit, timezone)} t,
|
${getDateQuery(db, 'created_at', unit, timezone)} t,
|
||||||
count(*) y
|
count(*) y
|
||||||
from event
|
from event
|
||||||
where website_id=?
|
where website_id=?
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "umami",
|
"name": "umami",
|
||||||
"version": "0.18.0",
|
"version": "0.19.0",
|
||||||
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
|
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
|
||||||
"author": "Mike Cao <mike@mikecao.com>",
|
"author": "Mike Cao <mike@mikecao.com>",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -2,7 +2,8 @@ require('dotenv').config();
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
const databaseType = process.env.DATABASE_TYPE || process.env.DATABASE_URL.split(':')[0];
|
const databaseType =
|
||||||
|
process.env.DATABASE_TYPE || (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);
|
||||||
|
|
||||||
if (!databaseType) {
|
if (!databaseType) {
|
||||||
throw new Error('Database schema not specified');
|
throw new Error('Database schema not specified');
|
||||||
|
Loading…
Reference in New Issue
Block a user