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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Refactored queries.
Mike Cao8904b7b4ed33
diff --git a/lib/auth.ts b/lib/auth.tsindex 045859433..60592bf34 100644--- a/lib/auth.ts+++ b/lib/auth.ts@@ -10,8 +10,7 @@ import {parseSecureToken,parseToken,} from 'next-basics';-import { getTeamUser } from 'queries';-import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/teamWebsite';+import { getTeamUser, getTeamWebsite, findTeamWebsiteByUserId } from 'queries';import { loadWebsite } from './load';import { Auth } from './types';@@ -79,19 +78,13 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: strireturn true;}- const teamWebsite = await getTeamWebsiteByTeamMemberId(websiteId, user.id);-- if (teamWebsite) {- return true;- }-const website = await loadWebsite(websiteId);if (website.userId) {return user.id === website.userId;}- return false;+ return !!(await findTeamWebsiteByUserId(websiteId, user.id));}export async function canCreateWebsite({ user }: Auth) {@@ -139,15 +132,11 @@ export async function canViewReport(auth: Auth, report: Report) {return true;}- if ((auth.user.id = report.userId)) {+ if (auth.user.id == report.userId) {return true;}- if (await canViewWebsite(auth, report.websiteId)) {- return true;- }-- return false;+ return !!(await canViewWebsite(auth, report.websiteId));}export async function canUpdateReport(auth: Auth, report: Report) {@@ -155,11 +144,7 @@ export async function canUpdateReport(auth: Auth, report: Report) {return true;}- if ((auth.user.id = report.userId)) {- return true;- }-- return false;+ return auth.user.id == report.userId;}export async function canCreateTeam({ user }: Auth) {diff --git a/lib/cache.ts b/lib/cache.tsindex 7ee7bf287..bc46c23d1 100644--- a/lib/cache.ts+++ b/lib/cache.ts@@ -1,11 +1,11 @@import { User, Website } from '@prisma/client';import redis from '@umami/redis-client';-import { getSession, getUser, getWebsite } from '../queries';+import { getSession, getUserById, getWebsiteById } from '../queries';const { fetchObject, storeObject, deleteObject } = redis;async function fetchWebsite(id): Promise<Website> {- return fetchObject(`website:${id}`, () => getWebsite({ id }));+ return fetchObject(`website:${id}`, () => getWebsiteById(id));}async function storeWebsite(data) {@@ -20,7 +20,7 @@ async function deleteWebsite(id) {}async function fetchUser(id): Promise<User> {- return fetchObject(`user:${id}`, () => getUser({ id }, { includePassword: true }));+ return fetchObject(`user:${id}`, () => getUserById(id, { includePassword: true }));}async function storeUser(data) {@@ -35,7 +35,7 @@ async function deleteUser(id) {}async function fetchSession(id) {- return fetchObject(`session:${id}`, () => getSession({ id }));+ return fetchObject(`session:${id}`, () => getSession(id));}async function storeSession(data) {diff --git a/lib/dynamicData.ts b/lib/data.tssimilarity index 100%rename from lib/dynamicData.tsrename to lib/data.tsdiff --git a/lib/load.ts b/lib/load.tsindex 4ce18b091..d980f8e96 100644--- a/lib/load.ts+++ b/lib/load.ts@@ -1,5 +1,5 @@import cache from 'lib/cache';-import { getWebsite, getSession, getUser } from 'queries';+import { getSession, getUserById, getWebsiteById } from 'queries';import { User, Website, Session } from '@prisma/client';export async function loadWebsite(websiteId: string): Promise<Website> {@@ -8,7 +8,7 @@ export async function loadWebsite(websiteId: string): Promise<Website> {if (cache.enabled) {website = await cache.fetchWebsite(websiteId);} else {- website = await getWebsite({ id: websiteId });+ website = await getWebsiteById(websiteId);}if (!website || website.deletedAt) {@@ -24,7 +24,7 @@ export async function loadSession(sessionId: string): Promise<Session> {if (cache.enabled) {session = await cache.fetchSession(sessionId);} else {- session = await getSession({ id: sessionId });+ session = await getSession(sessionId);}if (!session) {@@ -40,7 +40,7 @@ export async function loadUser(userId: string): Promise<User> {if (cache.enabled) {user = await cache.fetchUser(userId);} else {- user = await getUser({ id: userId });+ user = await getUserById(userId);}if (!user || user.deletedAt) {diff --git a/lib/middleware.ts b/lib/middleware.tsindex bcab71ef3..414cab239 100644--- a/lib/middleware.ts+++ b/lib/middleware.ts@@ -12,7 +12,7 @@ import { findSession } from 'lib/session';import { getAuthToken, parseShareToken } from 'lib/auth';import { secret, isUuid } from 'lib/crypto';import { ROLES } from 'lib/constants';-import { getUser } from '../queries';+import { getUserById } from '../queries';import { NextApiRequestCollect } from 'pages/api/send';const log = debug('umami:middleware');@@ -53,7 +53,7 @@ export const useAuth = createMiddleware(async (req, res, next) => {const { userId, authKey } = payload || {};if (isUuid(userId)) {- user = await getUser({ id: userId });+ user = await getUserById(userId);} else if (redis.enabled && authKey) {user = await redis.get(authKey);}diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.tsindex 64c2c26d8..af2069387 100644--- a/pages/api/auth/login.ts+++ b/pages/api/auth/login.ts@@ -9,7 +9,7 @@ import {methodNotAllowed,} from 'next-basics';import redis from '@umami/redis-client';-import { getUser } from 'queries';+import { getUserByUsername } from 'queries';import { secret } from 'lib/crypto';import { NextApiRequestQueryBody, User } from 'lib/types';import { setAuthKey } from 'lib/auth';@@ -37,7 +37,7 @@ export default async (return badRequest(res);}- const user = await getUser({ username }, { includePassword: true });+ const user = await getUserByUsername(username, { includePassword: true });if (user && checkPassword(password, user.password)) {if (redis.enabled) {diff --git a/pages/api/me/password.ts b/pages/api/me/password.tsindex 70d8de5f8..f9f60fc53 100644--- a/pages/api/me/password.ts+++ b/pages/api/me/password.ts@@ -9,7 +9,7 @@ import {forbidden,ok,} from 'next-basics';-import { getUser, updateUser } from 'queries';+import { getUserById, updateUser } from 'queries';export interface UserPasswordRequestQuery {id: string;@@ -34,7 +34,7 @@ export default async (const { id } = req.auth.user;if (req.method === 'POST') {- const user = await getUser({ id }, { includePassword: true });+ const user = await getUserById(id, { includePassword: true });if (!checkPassword(currentPassword, user.password)) {return badRequest(res, 'Current password is incorrect');diff --git a/pages/api/reports/[id].ts b/pages/api/reports/[id].tsindex bcd22b4ee..20731946f 100644--- a/pages/api/reports/[id].ts+++ b/pages/api/reports/[id].ts@@ -52,19 +52,14 @@ export default async (return unauthorized(res);}- const result = await updateReport(- {- websiteId,- userId,- type,- name,- description,- parameters: JSON.stringify(parameters),- } as any,- {- id: reportId,- },- );+ const result = await updateReport(reportId, {+ websiteId,+ userId,+ type,+ name,+ description,+ parameters: JSON.stringify(parameters),+ } as any);return ok(res, result);}diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.tsindex fcd8fd37e..c856b5659 100644--- a/pages/api/reports/index.ts+++ b/pages/api/reports/index.ts@@ -2,7 +2,7 @@ import { useAuth, useCors } from 'lib/middleware';import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';import { methodNotAllowed, ok, unauthorized } from 'next-basics';-import { createReport, getReports } from 'queries';+import { createReport, getWebsiteReports } from 'queries';import { canViewWebsite } from 'lib/auth';import { uuid } from 'lib/crypto';@@ -35,7 +35,7 @@ export default async (return unauthorized(res);}- const data = await getReports({ websiteId });+ const data = await getWebsiteReports(websiteId);return ok(res, data);}diff --git a/pages/api/share/[id].ts b/pages/api/share/[id].tsindex b5511f2de..0592d2167 100644--- a/pages/api/share/[id].ts+++ b/pages/api/share/[id].ts@@ -2,7 +2,7 @@ import { NextApiRequestQueryBody } from 'lib/types';import { secret } from 'lib/crypto';import { NextApiResponse } from 'next';import { createToken, methodNotAllowed, notFound, ok } from 'next-basics';-import { getWebsite } from 'queries';+import { getWebsiteByShareId } from 'queries';export interface ShareRequestQuery {id: string;@@ -20,7 +20,7 @@ export default async (const { id: shareId } = req.query;if (req.method === 'GET') {- const website = await getWebsite({ shareId });+ const website = await getWebsiteByShareId(shareId);if (website) {const data = { websiteId: website.id };diff --git a/pages/api/teams/[id]/index.ts b/pages/api/teams/[id]/index.tsindex 1c7dbb66e..7fb664a01 100644--- a/pages/api/teams/[id]/index.ts+++ b/pages/api/teams/[id]/index.ts@@ -4,7 +4,7 @@ import { canDeleteTeam, canUpdateTeam, canViewTeam } from 'lib/auth';import { useAuth } from 'lib/middleware';import { NextApiResponse } from 'next';import { methodNotAllowed, ok, unauthorized } from 'next-basics';-import { deleteTeam, getTeam, updateTeam } from 'queries';+import { deleteTeam, getTeamById, updateTeam } from 'queries';export interface TeamRequestQuery {id: string;@@ -28,7 +28,7 @@ export default async (return unauthorized(res);}- const user = await getTeam({ id: teamId });+ const user = await getTeamById(teamId, { includeTeamUser: true });return ok(res, user);}@@ -41,7 +41,7 @@ export default async (const { name, accessCode } = req.body;const data = { name, accessCode };- const updated = await updateTeam(data, { id: teamId });+ const updated = await updateTeam(teamId, data);return ok(res, updated);}diff --git a/pages/api/teams/[id]/users/index.ts b/pages/api/teams/[id]/users/index.tsindex af01d0ce0..c73da6836 100644--- a/pages/api/teams/[id]/users/index.ts+++ b/pages/api/teams/[id]/users/index.ts@@ -3,7 +3,7 @@ import { useAuth } from 'lib/middleware';import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';-import { createTeamUser, getTeamUsers, getUser } from 'queries';+import { createTeamUser, getTeamUsers, getUserByUsername } from 'queries';export interface TeamUserRequestQuery {id: string;@@ -40,7 +40,7 @@ export default async (const { email, roleId: roleId } = req.body;// Check for User- const user = await getUser({ username: email });+ const user = await getUserByUsername(email);if (!user) {return badRequest(res, 'The User does not exists.');diff --git a/pages/api/teams/join.ts b/pages/api/teams/join.tsindex 17c9bf324..ce7367a0c 100644--- a/pages/api/teams/join.ts+++ b/pages/api/teams/join.ts@@ -3,7 +3,7 @@ import { NextApiRequestQueryBody } from 'lib/types';import { useAuth } from 'lib/middleware';import { NextApiResponse } from 'next';import { methodNotAllowed, ok, notFound } from 'next-basics';-import { createTeamUser, getTeam, getTeamUser } from 'queries';+import { createTeamUser, getTeamByAccessCode, getTeamUser } from 'queries';import { ROLES } from 'lib/constants';export interface TeamsJoinRequestBody {@@ -19,7 +19,7 @@ export default async (if (req.method === 'POST') {const { accessCode } = req.body;- const team = await getTeam({ accessCode });+ const team = await getTeamByAccessCode(accessCode);if (!team) {return notFound(res, 'message.team-not-found');diff --git a/pages/api/users/[id]/index.ts b/pages/api/users/[id]/index.tsindex a4ab05fff..e09b1b5f8 100644--- a/pages/api/users/[id]/index.ts+++ b/pages/api/users/[id]/index.ts@@ -3,7 +3,7 @@ import { canDeleteUser, canUpdateUser, canViewUser } from 'lib/auth';import { useAuth } from 'lib/middleware';import { NextApiResponse } from 'next';import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';-import { deleteUser, getUser, updateUser } from 'queries';+import { deleteUser, getUserById, getUserByUsername, updateUser } from 'queries';export interface UserRequestQuery {id: string;@@ -31,7 +31,7 @@ export default async (return unauthorized(res);}- const user = await getUser({ id });+ const user = await getUserById(id);return ok(res, user);}@@ -43,7 +43,7 @@ export default async (const { username, password, role } = req.body;- const user = await getUser({ id });+ const user = await getUserById(id);const data: any = {};@@ -62,9 +62,9 @@ export default async (// Check when username changesif (data.username && user.username !== data.username) {- const userByUsername = await getUser({ username });+ const user = await getUserByUsername(username);- if (userByUsername) {+ if (user) {return badRequest(res, 'User already exists');}}diff --git a/pages/api/users/index.ts b/pages/api/users/index.tsindex c6103c35b..6f6c205f4 100644--- a/pages/api/users/index.ts+++ b/pages/api/users/index.ts@@ -5,7 +5,7 @@ import { useAuth } from 'lib/middleware';import { NextApiRequestQueryBody, Role, User } from 'lib/types';import { NextApiResponse } from 'next';import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';-import { createUser, getUser, getUsers } from 'queries';+import { createUser, getUserByUsername, getUsers } from 'queries';export interface UsersRequestBody {username: string;@@ -37,7 +37,7 @@ export default async (const { username, password, role, id } = req.body;- const existingUser = await getUser({ username }, { showDeleted: true });+ const existingUser = await getUserByUsername(username, { showDeleted: true });if (existingUser) {return badRequest(res, 'User already exists');diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.tsindex 1d7e4ac39..3d053d0eb 100644--- a/pages/api/websites/[id]/index.ts+++ b/pages/api/websites/[id]/index.ts@@ -3,7 +3,7 @@ import { methodNotAllowed, ok, serverError, unauthorized } from 'next-basics';import { Website, NextApiRequestQueryBody } from 'lib/types';import { canViewWebsite, canUpdateWebsite, canDeleteWebsite } from 'lib/auth';import { useAuth, useCors } from 'lib/middleware';-import { deleteWebsite, getWebsite, updateWebsite } from 'queries';+import { deleteWebsite, getWebsiteById, updateWebsite } from 'queries';import { SHARE_ID_REGEX } from 'lib/constants';export interface WebsiteRequestQuery {@@ -30,7 +30,7 @@ export default async (return unauthorized(res);}- const website = await getWebsite({ id: websiteId });+ const website = await getWebsiteById(websiteId);return ok(res, website);}diff --git a/queries/admin/report.ts b/queries/admin/report.tsindex 6b557a7a5..ee7a05920 100644--- a/queries/admin/report.ts+++ b/queries/admin/report.ts@@ -13,19 +13,29 @@ export async function getReportById(reportId: string): Promise<Report> {});}-export async function getReports(where: Prisma.ReportWhereInput): Promise<Report[]> {+export async function getUserReports(userId: string): Promise<Report[]> {return prisma.client.report.findMany({- where,+ where: {+ userId,+ },+ });+}++export async function getWebsiteReports(websiteId: string): Promise<Report[]> {+ return prisma.client.report.findMany({+ where: {+ websiteId,+ },});}export async function updateReport(+ reportId: string,data: Prisma.ReportUpdateInput,- where: Prisma.ReportWhereUniqueInput,): Promise<Report> {- return prisma.client.report.update({ data, where });+ return prisma.client.report.update({ where: { id: reportId }, data });}-export async function deleteReport(where: Prisma.ReportWhereUniqueInput): Promise<Report> {- return prisma.client.report.delete({ where });+export async function deleteReport(reportId: string): Promise<Report> {+ return prisma.client.report.delete({ where: { id: reportId } });}diff --git a/queries/admin/team.ts b/queries/admin/team.tsindex 5c3b372fc..a8b3385ca 100644--- a/queries/admin/team.ts+++ b/queries/admin/team.ts@@ -3,15 +3,29 @@ import prisma from 'lib/prisma';import { ROLES } from 'lib/constants';import { uuid } from 'lib/crypto';-export async function getTeam(where: Prisma.TeamWhereInput): Promise<Team> {+export interface GetTeamOptions {+ includeTeamUser?: boolean;+}++async function getTeam(where: Prisma.TeamWhereInput, options: GetTeamOptions = {}): Promise<Team> {+ const { includeTeamUser = false } = options;+return prisma.client.team.findFirst({where,include: {- teamUser: true,+ teamUser: includeTeamUser,},});}+export function getTeamById(teamId: string, options: GetTeamOptions = {}) {+ return getTeam({ id: teamId }, options);+}++export function getTeamByAccessCode(accessCode: string, options: GetTeamOptions = {}) {+ return getTeam({ accessCode }, options);+}+export async function getTeams(where: Prisma.TeamWhereInput): Promise<Team[]> {return prisma.client.team.findMany({where,@@ -36,16 +50,15 @@ export async function createTeam(data: Prisma.TeamCreateInput, userId: string):]);}-export async function updateTeam(- data: Prisma.TeamUpdateInput,- where: Prisma.TeamWhereUniqueInput,-): Promise<Team> {+export async function updateTeam(teamId: string, data: Prisma.TeamUpdateInput): Promise<Team> {return prisma.client.team.update({+ where: {+ id: teamId,+ },data: {...data,updatedAt: new Date(),},- where,});}diff --git a/queries/admin/teamUser.ts b/queries/admin/teamUser.tsindex b1c295bec..c5b27a024 100644--- a/queries/admin/teamUser.ts+++ b/queries/admin/teamUser.ts@@ -53,12 +53,14 @@ export async function createTeamUser(}export async function updateTeamUser(+ teamUserId: string,data: Prisma.TeamUserUpdateInput,- where: Prisma.TeamUserWhereUniqueInput,): Promise<TeamUser> {return prisma.client.teamUser.update({+ where: {+ id: teamUserId,+ },data,- where,});}diff --git a/queries/admin/teamWebsite.ts b/queries/admin/teamWebsite.tsindex 0aedc3c7a..169526ddf 100644--- a/queries/admin/teamWebsite.ts+++ b/queries/admin/teamWebsite.ts@@ -22,7 +22,7 @@ export async function getTeamWebsite(});}-export async function getTeamWebsiteByTeamMemberId(+export async function findTeamWebsiteByUserId(websiteId: string,userId: string,): Promise<TeamWebsite> {diff --git a/queries/admin/user.ts b/queries/admin/user.tsindex cab8a5624..f60c48010 100644--- a/queries/admin/user.ts+++ b/queries/admin/user.ts@@ -5,9 +5,14 @@ import { ROLES } from 'lib/constants';import prisma from 'lib/prisma';import { Website, User, Role } from 'lib/types';-export async function getUser(+export interface GetUserOptions {+ includePassword?: boolean;+ showDeleted?: boolean;+}++async function getUser(where: Prisma.UserWhereInput | Prisma.UserWhereUniqueInput,- options: { includePassword?: boolean; showDeleted?: boolean } = {},+ options: GetUserOptions = {},): Promise<User> {const { includePassword = false, showDeleted = false } = options;@@ -23,6 +28,14 @@ export async function getUser(});}+export async function getUserById(userId: string, options: GetUserOptions = {}) {+ return getUser({ id: userId }, options);+}++export async function getUserByUsername(username: string, options: GetUserOptions = {}) {+ return getUser({ username }, options);+}+export async function getUsers(): Promise<User[]> {return prisma.client.user.findMany({take: 100,diff --git a/queries/admin/website.ts b/queries/admin/website.tsindex 8714d8c98..35f32bac2 100644--- a/queries/admin/website.ts+++ b/queries/admin/website.ts@@ -2,12 +2,20 @@ import { Prisma, Website } from '@prisma/client';import cache from 'lib/cache';import prisma from 'lib/prisma';-export async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {+async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {return prisma.client.website.findUnique({where,});}+export async function getWebsiteById(id: string) {+ return getWebsite({ id });+}++export async function getWebsiteByShareId(shareId: string) {+ return getWebsite({ shareId });+}+export async function getWebsites(): Promise<Website[]> {return prisma.client.website.findMany({orderBy: {diff --git a/queries/analytics/eventData/saveEventData.ts b/queries/analytics/eventData/saveEventData.tsindex 97b1c882e..0f1ddb375 100644--- a/queries/analytics/eventData/saveEventData.ts+++ b/queries/analytics/eventData/saveEventData.ts@@ -2,7 +2,7 @@ import { Prisma } from '@prisma/client';import { DATA_TYPE } from 'lib/constants';import { uuid } from 'lib/crypto';import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';-import { flattenJSON } from 'lib/dynamicData';+import { flattenJSON } from 'lib/data';import kafka from 'lib/kafka';import prisma from 'lib/prisma';import { DynamicData } from 'lib/types';diff --git a/queries/analytics/events/getEventMetrics.ts b/queries/analytics/events/getEventMetrics.tsindex 37044d1b5..11a5c6909 100644--- a/queries/analytics/events/getEventMetrics.ts+++ b/queries/analytics/events/getEventMetrics.ts@@ -2,24 +2,23 @@ import prisma from 'lib/prisma';import clickhouse from 'lib/clickhouse';import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';import { WebsiteEventMetric } from 'lib/types';-import { DEFAULT_RESET_DATE, EVENT_TYPE } from 'lib/constants';+import { EVENT_TYPE } from 'lib/constants';import { loadWebsite } from 'lib/load';import { maxDate } from 'lib/date';+export interface GetEventMetricsCriteria {+ startDate: Date;+ endDate: Date;+ timezone: string;+ unit: string;+ filters: {+ url: string;+ eventName: string;+ };+}+export async function getEventMetrics(- ...args: [- websiteId: string,- data: {- startDate: Date;- endDate: Date;- timezone: string;- unit: string;- filters: {- url: string;- eventName: string;- };- },- ]+ ...args: [websiteId: string, criteria: GetEventMetricsCriteria]): Promise<WebsiteEventMetric[]> {return runQuery({[PRISMA]: () => relationalQuery(...args),@@ -27,25 +26,8 @@ export async function getEventMetrics(});}-async function relationalQuery(- websiteId: string,- {- startDate,- endDate,- timezone = 'utc',- unit = 'day',- filters,- }: {- startDate: Date;- endDate: Date;- timezone: string;- unit: string;- filters: {- url: string;- eventName: string;- };- },-) {+async function relationalQuery(websiteId: string, criteria: GetEventMetricsCriteria) {+ const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;const { rawQuery, getDateQuery, getFilterQuery } = prisma;const website = await loadWebsite(websiteId);const filterQuery = getFilterQuery(filters);@@ -74,25 +56,8 @@ async function relationalQuery();}-async function clickhouseQuery(- websiteId: string,- {- startDate,- endDate,- timezone = 'utc',- unit = 'day',- filters,- }: {- startDate: Date;- endDate: Date;- timezone: string;- unit: string;- filters: {- url: string;- eventName: string;- };- },-) {+async function clickhouseQuery(websiteId: string, criteria: GetEventMetricsCriteria) {+ const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;const { rawQuery, getDateQuery, getFilterQuery } = clickhouse;const website = await loadWebsite(websiteId);const filterQuery = getFilterQuery(filters);diff --git a/queries/analytics/sessions/getSession.ts b/queries/analytics/sessions/getSession.tsindex 2fd8d18f6..256ada4c0 100644--- a/queries/analytics/sessions/getSession.ts+++ b/queries/analytics/sessions/getSession.ts@@ -1,8 +1,9 @@-import { Prisma } from '@prisma/client';import prisma from 'lib/prisma';-export async function getSession(where: Prisma.SessionWhereUniqueInput) {+export async function getSession(id: string) {return prisma.client.session.findUnique({- where,+ where: {+ id,+ },});}diff --git a/queries/analytics/sessions/saveSessionData.ts b/queries/analytics/sessions/saveSessionData.tsindex 192053f10..ef32bcfb5 100644--- a/queries/analytics/sessions/saveSessionData.ts+++ b/queries/analytics/sessions/saveSessionData.ts@@ -1,6 +1,6 @@import { DATA_TYPE } from 'lib/constants';import { uuid } from 'lib/crypto';-import { flattenJSON } from 'lib/dynamicData';+import { flattenJSON } from 'lib/data';import prisma from 'lib/prisma';import { DynamicData } from 'lib/types';diff --git a/queries/index.js b/queries/index.jsindex f86551c4e..f509e0392 100644--- a/queries/index.js+++ b/queries/index.js@@ -1,7 +1,8 @@+export * from './admin/report';export * from './admin/team';export * from './admin/teamUser';+export * from './admin/teamWebsite';export * from './admin/user';-export * from './admin/report';export * from './admin/website';export * from './analytics/events/getEventMetrics';export * from './analytics/events/getEventUsage';