ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix folders

pull/1471/head
Brian Cao 2022-08-25 22:20:30 -07:00
parent f69bd36223
commit c811577460
30 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/clickhouse.js
View File

@ -171,3 +171,7 @@ export async function findUnique(data) {
return data[0] ?? null; return data[0] ?? null;
} }
export async function findFirst(data) {
return data[0] ?? null;
}

2
queries/admin/account/createAccount.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function createAccount(data) { export async function createAccount(data) {
return runQuery( return runQuery(

2
queries/admin/account/deleteAccount.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function deleteAccount(user_id) { export async function deleteAccount(user_id) {
return runQuery( return runQuery(

2
queries/admin/account/getAccountById.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getAccountById(user_id) { export async function getAccountById(user_id) {
return runQuery( return runQuery(

2
queries/admin/account/getAccountByUsername.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getAccountByUsername(username) { export async function getAccountByUsername(username) {
return runQuery( return runQuery(

2
queries/admin/account/getAccounts.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getAccounts() { export async function getAccounts() {
return runQuery( return runQuery(

2
queries/admin/account/updateAccount.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function updateAccount(user_id, data) { export async function updateAccount(user_id, data) {
return runQuery( return runQuery(

2
queries/admin/website/createWebsite.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function createWebsite(user_id, data) { export async function createWebsite(user_id, data) {
return runQuery( return runQuery(

2
queries/admin/website/deleteWebsite.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function deleteWebsite(website_id) { export async function deleteWebsite(website_id) {
return runQuery( return runQuery(

2
queries/admin/website/getAllWebsites.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getAllWebsites() { export async function getAllWebsites() {
let data = await runQuery( let data = await runQuery(

2
queries/admin/website/getUserWebsites.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getUserWebsites(user_id) { export async function getUserWebsites(user_id) {
return runQuery( return runQuery(

2
queries/admin/website/getWebsiteById.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getWebsiteById(website_id) { export async function getWebsiteById(website_id) {
return runQuery( return runQuery(

2
queries/admin/website/getWebsiteByShareId.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getWebsiteByShareId(share_id) { export async function getWebsiteByShareId(share_id) {
return runQuery( return runQuery(

2
queries/admin/website/getWebsiteByUuid.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getWebsiteByUuid(website_uuid) { export async function getWebsiteByUuid(website_uuid) {
return runQuery( return runQuery(

2
queries/admin/website/resetWebsite.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function resetWebsite(website_id) { export async function resetWebsite(website_id) {
return runQuery(prisma.$queryRaw`delete from session where website_id=${website_id}`); return runQuery(prisma.$queryRaw`delete from session where website_id=${website_id}`);

2
queries/admin/website/updateWebsite.js
View File

@ -1,4 +1,4 @@
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function updateWebsite(website_id, data) { export async function updateWebsite(website_id, data) {
return runQuery( return runQuery(

2
queries/analytics/event/getEventMetrics.js
View File

@ -1,6 +1,6 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { getDateQuery, getFilterQuery, rawQuery } from 'lib/db/relational'; import { getDateQuery, getFilterQuery, rawQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
export async function getEventMetrics(...args) { export async function getEventMetrics(...args) {

2
queries/analytics/event/getEvents.js
View File

@ -1,5 +1,5 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';

4
queries/analytics/event/saveEvent.js
View File

@ -1,8 +1,8 @@
import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants'; import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import kafka from 'lib/db/kafka'; import kafka from 'lib/db/kafka';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db';
export async function saveEvent(...args) { export async function saveEvent(...args) {
return runAnalyticsQuery({ return runAnalyticsQuery({

2
queries/analytics/pageview/getPageviewMetrics.js
View File

@ -1,6 +1,6 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { parseFilters, rawQuery } from 'lib/db/relational'; import { parseFilters, rawQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
export async function getPageviewMetrics(...args) { export async function getPageviewMetrics(...args) {

2
queries/analytics/pageview/getPageviewParams.js
View File

@ -1,4 +1,4 @@
import { parseFilters, rawQuery, runAnalyticsQuery } from 'lib/db/relational'; import { parseFilters, rawQuery, runAnalyticsQuery } from 'lib/relational';
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
export async function getPageviewParams(...args) { export async function getPageviewParams(...args) {

2
queries/analytics/pageview/getPageviewStats.js
View File

@ -1,5 +1,5 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { getDateQuery, parseFilters, rawQuery } from 'lib/db/relational'; import { getDateQuery, parseFilters, rawQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';

2
queries/analytics/pageview/getPageviews.js
View File

@ -1,5 +1,5 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';

2
queries/analytics/pageview/savePageView.js
View File

@ -2,7 +2,7 @@ import { CLICKHOUSE, KAFKA, RELATIONAL, URL_LENGTH } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import kafka from 'lib/db/kafka'; import kafka from 'lib/db/kafka';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function savePageView(...args) { export async function savePageView(...args) {
return runAnalyticsQuery({ return runAnalyticsQuery({

2
queries/analytics/session/createSession.js
View File

@ -1,5 +1,5 @@
import { CLICKHOUSE, KAFKA, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, KAFKA, RELATIONAL } from 'lib/constants';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import kafka from 'lib/db/kafka'; import kafka from 'lib/db/kafka';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';

14
queries/analytics/session/getSessionByUuid.js
View File

@ -1,7 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db';
export async function getSessionByUuid(...args) { export async function getSessionByUuid(...args) {
return runAnalyticsQuery({ return runAnalyticsQuery({
@ -23,8 +23,9 @@ async function relationalQuery(session_uuid) {
async function clickhouseQuery(session_uuid) { async function clickhouseQuery(session_uuid) {
const params = [session_uuid]; const params = [session_uuid];
return clickhouse.rawQuery( return clickhouse
` .rawQuery(
`
select select
session_uuid, session_uuid,
website_id, website_id,
@ -39,6 +40,7 @@ async function clickhouseQuery(session_uuid) {
from session from session
where session_uuid = $1 where session_uuid = $1
`, `,
params, params,
); )
.then(result => clickhouse.findFirst(result));
} }

2
queries/analytics/session/getSessionMetrics.js
View File

@ -1,7 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import { parseFilters, rawQuery } from 'lib/db/relational'; import { parseFilters, rawQuery } from 'lib/relational';
export async function getSessionMetrics(...args) { export async function getSessionMetrics(...args) {
return runAnalyticsQuery({ return runAnalyticsQuery({

4
queries/analytics/session/getSessions.js
View File

@ -1,7 +1,7 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db';
import { prisma, runQuery } from 'lib/db/relational'; import { prisma, runQuery } from 'lib/relational';
export async function getSessions(...args) { export async function getSessions(...args) {
return runAnalyticsQuery({ return runAnalyticsQuery({

2
queries/analytics/stats/getActiveVisitors.js
View File

@ -1,6 +1,6 @@
import { subMinutes } from 'date-fns'; import { subMinutes } from 'date-fns';
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { rawQuery } from 'lib/db/relational'; import { rawQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';

2
queries/analytics/stats/getWebsiteStats.js
View File

@ -1,5 +1,5 @@
import { CLICKHOUSE, RELATIONAL } from 'lib/constants'; import { CLICKHOUSE, RELATIONAL } from 'lib/constants';
import { getDateQuery, getTimestampInterval, parseFilters, rawQuery } from 'lib/db/relational'; import { getDateQuery, getTimestampInterval, parseFilters, rawQuery } from 'lib/relational';
import { runAnalyticsQuery } from 'lib/db/db'; import { runAnalyticsQuery } from 'lib/db/db';
import clickhouse from 'lib/clickhouse'; import clickhouse from 'lib/clickhouse';