Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

add timestamp column to prisma realtime queries

Francis Cao29694352e7fb
diff --git a/src/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.ts
index b727540d6..c333242e3 100644
--- a/src/queries/analytics/events/getEvents.ts
+++ b/src/queries/analytics/events/getEvents.ts
@@ -13,17 +13,26 @@ export function getEvents(...args: [websiteId: string, filters: QueryFilters]) {
function relationalQuery(websiteId: string, filters: QueryFilters) {
const { startDate } = filters;
- return prisma.client.websiteEvent.findMany({
- where: {
- websiteId,
- createdAt: {
- gte: startDate,
+ return prisma.client.websiteEvent
+ .findMany({
+ where: {
+ websiteId,
+ createdAt: {
+ gte: startDate,
+ },
},
- },
- orderBy: {
- createdAt: 'desc',
- },
- });
+ orderBy: {
+ createdAt: 'desc',
+ },
+ })
+ .then(a => {
+ return Object.values(a).map(a => {
+ return {
+ ...a,
+ timestamp: new Date(a.createdAt).getTime() / 1000,
+ };
+ });
+ });
}
function clickhouseQuery(websiteId: string, filters: QueryFilters) {
diff --git a/src/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.ts
index 71a5bee61..a11edd39b 100644
--- a/src/queries/analytics/sessions/getSessions.ts
+++ b/src/queries/analytics/sessions/getSessions.ts
@@ -13,17 +13,26 @@ export async function getSessions(...args: [websiteId: string, filters: QueryFil
async function relationalQuery(websiteId: string, filters: QueryFilters) {
const { startDate } = filters;
- return prisma.client.session.findMany({
- where: {
- websiteId,
- createdAt: {
- gte: startDate,
+ return prisma.client.session
+ .findMany({
+ where: {
+ websiteId,
+ createdAt: {
+ gte: startDate,
+ },
},
- },
- orderBy: {
- createdAt: 'desc',
- },
- });
+ orderBy: {
+ createdAt: 'desc',
+ },
+ })
+ .then(a => {
+ return Object.values(a).map(a => {
+ return {
+ ...a,
+ timestamp: new Date(a.createdAt).getTime() / 1000,
+ };
+ });
+ });
}
async function clickhouseQuery(websiteId: string, filters: QueryFilters) {