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

Fix type issues in getEventStats.ts and send/route.ts

Browse source
This commit is contained in:
Ayush3603 2025-11-10 19:13:36 +05:30
parent c38ed8a9a6
commit 5c965e8a32
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/api/send/route.ts
View file

@ -12,8 +12,6 @@ import { COLLECTION_TYPE, EVENT_TYPE } from '@/lib/constants';
import { anyObjectParam, urlOrPathParam } from '@/lib/schema'; import { anyObjectParam, urlOrPathParam } from '@/lib/schema';
import { safeDecodeURI, safeDecodeURIComponent } from '@/lib/url'; import { safeDecodeURI, safeDecodeURIComponent } from '@/lib/url';
import { createSession, saveEvent, saveSessionData } from '@/queries/sql'; import { createSession, saveEvent, saveSessionData } from '@/queries/sql';
import { serializeError } from 'serialize-error';
import { TAG_COLORS } from '@/lib/constants';
import { clickhouse as prismaClickhouse, prisma } from '@/lib/prisma'; import { clickhouse as prismaClickhouse, prisma } from '@/lib/prisma';
import { getIpAddress } from '@/lib/ip'; import { getIpAddress } from '@/lib/ip';
import { getWebsite } from '@/queries/prisma/websites'; import { getWebsite } from '@/queries/prisma/websites';

9
src/queries/sql/events/getEventStats.ts
View file

@ -1,6 +1,5 @@
import { EVENT_TYPE } from '@/lib/constants'; import { EVENT_TYPE } from '@/lib/constants';
import { FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants'; import { FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
// Fix import errors by using correct paths
import { getFilterQuery } from '@/queries/sql/common'; import { getFilterQuery } from '@/queries/sql/common';
import { clickhouse as prismaClickhouse, prisma } from '@/lib/prisma'; import { clickhouse as prismaClickhouse, prisma } from '@/lib/prisma';
import { FilterQuery, QueryFilters } from '@/lib/types'; import { FilterQuery, QueryFilters } from '@/lib/types';
@ -25,7 +24,7 @@ export async function getEventStats(
filters: QueryFilters = {}, filters: QueryFilters = {},
eventType = EVENT_TYPE.customEvent, eventType = EVENT_TYPE.customEvent,
) { ) {
const { filterQuery, params } = getEventFilterQuery(filters, eventType); const { filterQuery, params } = getEventFilterQuery(filters, eventType.toString());
if (prismaClickhouse.enabled) { if (prismaClickhouse.enabled) {
const { rawQuery, findUnique } = prismaClickhouse; const { rawQuery, findUnique } = prismaClickhouse;
@ -41,7 +40,7 @@ export async function getEventStats(
${filterQuery}`, ${filterQuery}`,
{ {
websiteId, websiteId,
eventType, eventType: eventType.toString(),
...params, ...params,
}, },
); );
@ -66,7 +65,7 @@ export async function getEventTimeSeries(
filters: QueryFilters = {}, filters: QueryFilters = {},
eventType = EVENT_TYPE.customEvent, eventType = EVENT_TYPE.customEvent,
) { ) {
const { filterQuery, params } = getEventFilterQuery(filters, eventType); const { filterQuery, params } = getEventFilterQuery(filters, eventType.toString());
const { startDate, endDate, unit, timezone } = getDateRange(filters); const { startDate, endDate, unit, timezone } = getDateRange(filters);
if (prismaClickhouse.enabled) { if (prismaClickhouse.enabled) {
@ -88,7 +87,7 @@ export async function getEventTimeSeries(
`, `,
{ {
websiteId, websiteId,
eventType, eventType: eventType.toString(),
startDate, startDate,
endDate, endDate,
timezone, timezone,