Split queries into prisma and sql.

src/app/(collect)/p/[slug]/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server';
 import { notFound } from '@/lib/response';
-import { findPixel } from '@/queries';
+import { findPixel } from '@/queries/prisma';
 import { POST } from '@/app/api/send/route';
 
 const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw', 'base64');

src/app/(collect)/q/[slug]/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server';
 import { notFound } from '@/lib/response';
-import { findLink } from '@/queries';
+import { findLink } from '@/queries/prisma';
 import { POST } from '@/app/api/send/route';
 
 export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {

src/app/api/auth/login/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { createSecureToken } from '@/lib/jwt';
 import redis from '@/lib/redis';
-import { getUserByUsername } from '@/queries';
+import { getUserByUsername } from '@/queries/prisma';
 import { json, unauthorized } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
 import { saveAuth } from '@/lib/auth';

src/app/api/auth/verify/route.ts

@@ -1,6 +1,6 @@
 import { parseRequest } from '@/lib/request';
 import { json } from '@/lib/response';
-import { getAllUserTeams } from '@/queries';
+import { getAllUserTeams } from '@/queries/prisma';
 
 export async function POST(request: Request) {
   const { auth, error } = await parseRequest(request);

src/app/api/links/[linkId]/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { canUpdateLink, canDeleteLink, canViewLink } from '@/permissions';
 import { parseRequest } from '@/lib/request';
 import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';
-import { deleteLink, getLink, updateLink } from '@/queries';
+import { deleteLink, getLink, updateLink } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ linkId: string }> }) {
   const { auth, error } = await parseRequest(request);

src/app/api/links/route.ts

@@ -4,7 +4,7 @@ import { json, unauthorized } from '@/lib/response';
 import { uuid } from '@/lib/crypto';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { createLink, getUserLinks } from '@/queries';
+import { createLink, getUserLinks } from '@/queries/prisma';
 
 export async function GET(request: Request) {
   const schema = z.object({

src/app/api/me/teams/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { pagingParams } from '@/lib/schema';
-import { getUserTeams } from '@/queries';
+import { getUserTeams } from '@/queries/prisma';
 import { json } from '@/lib/response';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 

src/app/api/me/websites/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { pagingParams } from '@/lib/schema';
-import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries';
+import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma';
 import { json } from '@/lib/response';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 

src/app/api/pixels/[pixelId]/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { canUpdatePixel, canDeletePixel, canViewPixel } from '@/permissions';
 import { parseRequest } from '@/lib/request';
 import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';
-import { deletePixel, getPixel, updatePixel } from '@/queries';
+import { deletePixel, getPixel, updatePixel } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ pixelId: string }> }) {
   const { auth, error } = await parseRequest(request);

src/app/api/pixels/route.ts

@@ -4,7 +4,7 @@ import { json, unauthorized } from '@/lib/response';
 import { uuid } from '@/lib/crypto';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { createPixel, getUserPixels } from '@/queries';
+import { createPixel, getUserPixels } from '@/queries/prisma';
 
 export async function GET(request: Request) {
   const schema = z.object({

src/app/api/realtime/[websiteId]/route.ts

@@ -1,5 +1,5 @@
 import { json, unauthorized } from '@/lib/response';
-import { getRealtimeData } from '@/queries';
+import { getRealtimeData } from '@/queries/sql';
 import { canViewWebsite } from '@/permissions';
 import { startOfMinute, subMinutes } from 'date-fns';
 import { REALTIME_RANGE } from '@/lib/constants';

src/app/api/reports/[reportId]/route.ts

@@ -1,5 +1,5 @@
 import { parseRequest } from '@/lib/request';
-import { deleteReport, getReport, updateReport } from '@/queries';
+import { deleteReport, getReport, updateReport } from '@/queries/prisma';
 import { canDeleteReport, canUpdateReport, canViewReport } from '@/permissions';
 import { unauthorized, json, notFound, ok } from '@/lib/response';
 import { reportSchema } from '@/lib/schema';

src/app/api/reports/breakdown/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
 import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
-import { BreakdownParameters, getBreakdown } from '@/queries';
+import { BreakdownParameters, getBreakdown } from '@/queries/sql';
 import { reportResultSchema } from '@/lib/schema';
 
 export async function POST(request: Request) {

src/app/api/reports/funnel/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
 import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
-import { FunnelParameters, getFunnel } from '@/queries';
+import { FunnelParameters, getFunnel } from '@/queries/sql';
 import { reportResultSchema } from '@/lib/schema';
 
 export async function POST(request: Request) {

src/app/api/reports/journey/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
 import { getQueryFilters, parseRequest } from '@/lib/request';
-import { getJourney } from '@/queries';
+import { getJourney } from '@/queries/sql';
 import { reportResultSchema } from '@/lib/schema';
 
 export async function POST(request: Request) {

src/app/api/reports/retention/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
 import { parseRequest, getQueryFilters, setWebsiteDate } from '@/lib/request';
-import { getRetention, RetentionParameters } from '@/queries';
+import { getRetention, RetentionParameters } from '@/queries/sql';
 import { reportResultSchema } from '@/lib/schema';
 
 export async function POST(request: Request) {

src/app/api/reports/route.ts

@@ -4,7 +4,7 @@ import { pagingParams, reportSchema } from '@/lib/schema';
 import { parseRequest } from '@/lib/request';
 import { canViewWebsite, canUpdateWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
-import { getReports, createReport } from '@/queries';
+import { getReports, createReport } from '@/queries/prisma';
 
 export async function GET(request: Request) {
   const schema = z.object({

src/app/api/reports/utm/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { unauthorized, json } from '@/lib/response';
 import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
-import { getUTM, UTMParameters } from '@/queries';
+import { getUTM, UTMParameters } from '@/queries/sql';
 import { reportResultSchema } from '@/lib/schema';
 import { UTM_PARAMS } from '@/lib/constants';
 

src/app/api/send/route.ts

@@ -12,7 +12,7 @@ import { secret, uuid, hash } from '@/lib/crypto';
 import { COLLECTION_TYPE, EVENT_TYPE } from '@/lib/constants';
 import { anyObjectParam, urlOrPathParam } from '@/lib/schema';
 import { safeDecodeURI, safeDecodeURIComponent } from '@/lib/url';
-import { createSession, saveEvent, saveSessionData } from '@/queries';
+import { createSession, saveEvent, saveSessionData } from '@/queries/sql';
 
 const log = debug('umami:send');
 

src/app/api/share/[shareId]/route.ts

@@ -1,7 +1,7 @@
 import { json, notFound } from '@/lib/response';
 import { createToken } from '@/lib/jwt';
 import { secret } from '@/lib/crypto';
-import { getSharedWebsite } from '@/queries';
+import { getSharedWebsite } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ shareId: string }> }) {
   const { shareId } = await params;

src/app/api/teams/[teamId]/links/route.ts

@@ -3,7 +3,7 @@ import { unauthorized, json } from '@/lib/response';
 import { canViewTeam } from '@/permissions';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { getTeamLinks } from '@/queries';
+import { getTeamLinks } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
   const schema = z.object({

src/app/api/teams/[teamId]/pixels/route.ts

@@ -3,7 +3,7 @@ import { unauthorized, json } from '@/lib/response';
 import { canViewTeam } from '@/permissions';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { getTeamPixels } from '@/queries';
+import { getTeamPixels } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
   const schema = z.object({

src/app/api/teams/[teamId]/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { unauthorized, json, notFound, ok } from '@/lib/response';
 import { canDeleteTeam, canUpdateTeam, canViewTeam } from '@/permissions';
 import { parseRequest } from '@/lib/request';
-import { deleteTeam, getTeam, updateTeam } from '@/queries';
+import { deleteTeam, getTeam, updateTeam } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
   const { auth, error } = await parseRequest(request);

src/app/api/teams/[teamId]/users/[userId]/route.ts

@@ -1,7 +1,7 @@
 import { canDeleteTeamUser, canUpdateTeam } from '@/permissions';
 import { parseRequest } from '@/lib/request';
 import { badRequest, json, ok, unauthorized } from '@/lib/response';
-import { deleteTeamUser, getTeamUser, updateTeamUser } from '@/queries';
+import { deleteTeamUser, getTeamUser, updateTeamUser } from '@/queries/prisma';
 import { z } from 'zod';
 
 export async function GET(

src/app/api/teams/[teamId]/users/route.ts

@@ -3,7 +3,7 @@ import { unauthorized, json, badRequest } from '@/lib/response';
 import { canAddUserToTeam, canViewTeam } from '@/permissions';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, teamRoleParam, searchParams } from '@/lib/schema';
-import { createTeamUser, getTeamUser, getTeamUsers } from '@/queries';
+import { createTeamUser, getTeamUser, getTeamUsers } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
   const schema = z.object({

src/app/api/teams/[teamId]/websites/route.ts

@@ -3,7 +3,7 @@ import { unauthorized, json } from '@/lib/response';
 import { canViewTeam } from '@/permissions';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { getTeamWebsites } from '@/queries';
+import { getTeamWebsites } from '@/queries/prisma';
 
 export async function GET(request: Request, { params }: { params: Promise<{ teamId: string }> }) {
   const schema = z.object({

src/app/api/teams/join/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { json, badRequest, notFound } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
 import { ROLES } from '@/lib/constants';
-import { createTeamUser, findTeam, getTeamUser } from '@/queries';
+import { createTeamUser, findTeam, getTeamUser } from '@/queries/prisma';
 
 export async function POST(request: Request) {
   const schema = z.object({

src/app/api/teams/route.ts

@@ -4,7 +4,7 @@ import { unauthorized, json } from '@/lib/response';
 import { canCreateTeam } from '@/permissions';
 import { uuid } from '@/lib/crypto';
 import { parseRequest } from '@/lib/request';
-import { createTeam } from '@/queries';
+import { createTeam } from '@/queries/prisma';
 
 export async function POST(request: Request) {
   const schema = z.object({

src/app/api/users/[userId]/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { canUpdateUser, canViewUser, canDeleteUser } from '@/permissions';
-import { getUser, getUserByUsername, updateUser, deleteUser } from '@/queries';
+import { getUser, getUserByUsername, updateUser, deleteUser } from '@/queries/prisma';
 import { json, unauthorized, badRequest, ok } from '@/lib/response';
 import { hashPassword } from '@/lib/password';
 import { parseRequest } from '@/lib/request';

src/app/api/users/[userId]/teams/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { pagingParams } from '@/lib/schema';
-import { getUserTeams } from '@/queries';
+import { getUserTeams } from '@/queries/prisma';
 import { unauthorized, json } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
 

src/app/api/users/route.ts

@@ -5,7 +5,7 @@ import { ROLES } from '@/lib/constants';
 import { uuid } from '@/lib/crypto';
 import { parseRequest } from '@/lib/request';
 import { unauthorized, json, badRequest } from '@/lib/response';
-import { createUser, getUserByUsername } from '@/queries';
+import { createUser, getUserByUsername } from '@/queries/prisma';
 
 export async function POST(request: Request) {
   const schema = z.object({

src/app/api/websites/[websiteId]/active/route.ts

@@ -1,6 +1,6 @@
 import { canViewWebsite } from '@/permissions';
 import { json, unauthorized } from '@/lib/response';
-import { getActiveVisitors } from '@/queries';
+import { getActiveVisitors } from '@/queries/sql';
 import { parseRequest } from '@/lib/request';
 
 export async function GET(

src/app/api/websites/[websiteId]/daterange/route.ts

@@ -1,5 +1,5 @@
 import { canViewWebsite } from '@/permissions';
-import { getWebsiteDateRange } from '@/queries';
+import { getWebsiteDateRange } from '@/queries/sql';
 import { json, unauthorized } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
 

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getEventDataFields } from '@/queries';
+import { getEventDataFields } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getEventDataProperties } from '@/queries';
+import { getEventDataProperties } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getEventDataStats } from '@/queries';
+import { getEventDataStats } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getEventDataValues } from '@/queries';
+import { getEventDataValues } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/events/route.ts

@@ -3,7 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { dateRangeParams, pagingParams, filterParams, searchParams } from '@/lib/schema';
-import { getWebsiteEvents } from '@/queries';
+import { getWebsiteEvents } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/events/series/route.ts

@@ -3,7 +3,7 @@ import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { filterParams, timezoneParam, unitParam } from '@/lib/schema';
-import { getEventStats } from '@/queries';
+import { getEventStats } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/export/route.ts

@@ -5,7 +5,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { pagingParams, dateRangeParams } from '@/lib/schema';
-import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries';
+import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/metrics/expanded/route.ts

@@ -8,7 +8,7 @@ import {
   getEventExpandedMetrics,
   getPageviewExpandedMetrics,
   getSessionExpandedMetrics,
-} from '@/queries';
+} from '@/queries/sql';
 import { z } from 'zod';
 
 export async function GET(

src/app/api/websites/[websiteId]/metrics/route.ts

@@ -7,7 +7,7 @@ import {
   getEventMetrics,
   getPageviewMetrics,
   getSessionMetrics,
-} from '@/queries';
+} from '@/queries/sql';
 import { z } from 'zod';
 import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
 

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -4,7 +4,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getCompareDate } from '@/lib/date';
 import { unauthorized, json } from '@/lib/response';
-import { getPageviewStats, getSessionStats } from '@/queries';
+import { getPageviewStats, getSessionStats } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/reports/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { canViewWebsite } from '@/permissions';
-import { getReports } from '@/queries';
+import { getReports } from '@/queries/prisma';
 import { filterParams, pagingParams } from '@/lib/schema';
 import { parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';

src/app/api/websites/[websiteId]/reset/route.ts

@@ -1,5 +1,5 @@
 import { canUpdateWebsite } from '@/permissions';
-import { resetWebsite } from '@/queries';
+import { resetWebsite } from '@/queries/prisma';
 import { unauthorized, ok } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
 

src/app/api/websites/[websiteId]/route.ts

@@ -3,7 +3,7 @@ import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/permission
 import { SHARE_ID_REGEX } from '@/lib/constants';
 import { parseRequest } from '@/lib/request';
 import { ok, json, unauthorized, serverError, badRequest } from '@/lib/response';
-import { deleteWebsite, getWebsite, updateWebsite } from '@/queries';
+import { deleteWebsite, getWebsite, updateWebsite } from '@/queries/prisma';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts

@@ -2,7 +2,7 @@ import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/permission
 import { parseRequest } from '@/lib/request';
 import { json, notFound, ok, unauthorized } from '@/lib/response';
 import { anyObjectParam, segmentTypeParam } from '@/lib/schema';
-import { deleteSegment, getSegment, updateSegment } from '@/queries';
+import { deleteSegment, getSegment, updateSegment } from '@/queries/prisma';
 import { z } from 'zod';
 
 export async function GET(

src/app/api/websites/[websiteId]/segments/route.ts

@@ -3,7 +3,7 @@ import { uuid } from '@/lib/crypto';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
 import { segmentTypeParam, searchParams, anyObjectParam } from '@/lib/schema';
-import { createSegment, getWebsiteSegments } from '@/queries';
+import { createSegment, getWebsiteSegments } from '@/queries/prisma';
 import { z } from 'zod';
 
 export async function GET(

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getSessionDataProperties } from '@/queries';
+import { getSessionDataProperties } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -1,7 +1,7 @@
 import { canViewWebsite } from '@/permissions';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
-import { getSessionDataValues } from '@/queries';
+import { getSessionDataValues } from '@/queries/sql';
 import { z } from 'zod';
 
 export async function GET(

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getSessionActivity } from '@/queries';
+import { getSessionActivity } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts

@@ -1,6 +1,6 @@
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getSessionData } from '@/queries';
+import { getSessionData } from '@/queries/sql';
 import { parseRequest } from '@/lib/request';
 
 export async function GET(

src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts

@@ -1,6 +1,6 @@
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
-import { getWebsiteSession } from '@/queries';
+import { getWebsiteSession } from '@/queries/sql';
 import { parseRequest } from '@/lib/request';
 
 export async function GET(

src/app/api/websites/[websiteId]/sessions/route.ts

@@ -3,7 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';
-import { getWebsiteSessions } from '@/queries';
+import { getWebsiteSessions } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -3,7 +3,7 @@ import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { filterParams } from '@/lib/schema';
-import { getWebsiteSessionStats } from '@/queries';
+import { getWebsiteSessionStats } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -3,7 +3,7 @@ import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { filterParams, pagingParams, timezoneParam } from '@/lib/schema';
-import { getWeeklyTraffic } from '@/queries';
+import { getWeeklyTraffic } from '@/queries/sql';
 
 export async function GET(
   request: Request,

src/app/api/websites/[websiteId]/stats/route.ts

@@ -3,7 +3,7 @@ import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/permissions';
 import { dateRangeParams, filterParams } from '@/lib/schema';
-import { getWebsiteStats } from '@/queries';
+import { getWebsiteStats } from '@/queries/sql';
 import { getCompareDate } from '@/lib/date';
 
 export async function GET(

src/app/api/websites/[websiteId]/transfer/route.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/permissions';
-import { updateWebsite } from '@/queries';
+import { updateWebsite } from '@/queries/prisma';
 import { parseRequest } from '@/lib/request';
 import { badRequest, unauthorized, json } from '@/lib/response';
 

src/app/api/websites/[websiteId]/values/route.ts

@@ -2,7 +2,8 @@ import { canViewWebsite } from '@/permissions';
 import { EVENT_COLUMNS, FILTER_COLUMNS, SEGMENT_TYPES, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';
-import { getWebsiteSegments, getValues } from '@/queries';
+import { getValues } from '@/queries/sql';
+import { getWebsiteSegments } from '@/queries/prisma';
 import { z } from 'zod';
 import { dateRangeParams, fieldsParam, searchParams } from '@/lib/schema';
 

src/app/api/websites/route.ts

@@ -4,7 +4,7 @@ import { json, unauthorized } from '@/lib/response';
 import { uuid } from '@/lib/crypto';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { pagingParams, searchParams } from '@/lib/schema';
-import { createWebsite } from '@/queries';
+import { createWebsite } from '@/queries/prisma';
 import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
 
 export async function GET(request: Request) {

src/lib/load.ts

@@ -1,6 +1,7 @@
 import { Website, Session } from '@/generated/prisma/client';
 import redis from '@/lib/redis';
-import { getWebsiteSession, getWebsite } from '@/queries';
+import { getWebsite } from '@/queries/prisma';
+import { getWebsiteSession } from '@/queries/sql';
 
 export async function fetchWebsite(websiteId: string): Promise<Website> {
   let website = null;

src/lib/request.ts

@@ -5,7 +5,7 @@ import { getAllowedUnits, getMinimumUnit, maxDate, parseDateRange } from '@/lib/
 import { fetchWebsite } from '@/lib/load';
 import { badRequest, unauthorized } from '@/lib/response';
 import { QueryFilters } from '@/lib/types';
-import { getWebsiteSegment } from '@/queries';
+import { getWebsiteSegment } from '@/queries/prisma';
 import { filtersArrayToObject } from '@/lib/params';
 
 export async function parseRequest(

src/permissions/link.ts

@@ -1,5 +1,5 @@
 import { Auth } from '@/lib/types';
-import { getLink, getTeamUser } from '@/queries';
+import { getLink, getTeamUser } from '@/queries/prisma';
 import { hasPermission } from '@/lib/auth';
 import { PERMISSIONS } from '@/lib/constants';
 

src/permissions/pixel.ts

@@ -1,5 +1,5 @@
 import { Auth } from '@/lib/types';
-import { getPixel, getTeamUser } from '@/queries';
+import { getPixel, getTeamUser } from '@/queries/prisma';
 import { hasPermission } from '@/lib/auth';
 import { PERMISSIONS } from '@/lib/constants';
 

src/permissions/team.ts

@@ -1,6 +1,6 @@
 import { Auth } from '@/lib/types';
 import { PERMISSIONS } from '@/lib/constants';
-import { getTeamUser } from '@/queries';
+import { getTeamUser } from '@/queries/prisma';
 import { hasPermission } from '@/lib/auth';
 
 export async function canViewTeam({ user }: Auth, teamId: string) {

src/permissions/website.ts

@@ -1,7 +1,7 @@
 import { Auth } from '@/lib/types';
 import { PERMISSIONS } from '@/lib/constants';
 import { hasPermission } from '@/lib/auth';
-import { getTeamUser, getWebsite } from '@/queries';
+import { getTeamUser, getWebsite } from '@/queries/prisma';
 
 export async function canViewWebsite({ user, shareToken }: Auth, websiteId: string) {
   if (user?.isAdmin) {

src/queries/index.ts

@@ -1,49 +0,0 @@
-export * from '@/queries/prisma/link';
-export * from '@/queries/prisma/pixel';
-export * from '@/queries/prisma/report';
-export * from '@/queries/prisma/segment';
-export * from '@/queries/prisma/team';
-export * from '@/queries/prisma/teamUser';
-export * from '@/queries/prisma/user';
-export * from '@/queries/prisma/website';
-export * from '@/queries/sql/events/getEventDataEvents';
-export * from '@/queries/sql/events/getEventDataFields';
-export * from '@/queries/sql/events/getEventDataProperties';
-export * from '@/queries/sql/events/getEventDataValues';
-export * from '@/queries/sql/events/getEventDataStats';
-export * from '@/queries/sql/events/getEventDataUsage';
-export * from '@/queries/sql/events/getEventMetrics';
-export * from '@/queries/sql/events/getEventExpandedMetrics';
-export * from '@/queries/sql/events/getEventStats';
-export * from '@/queries/sql/events/getWebsiteEvents';
-export * from '@/queries/sql/events/getEventUsage';
-export * from '@/queries/sql/events/saveEvent';
-export * from '@/queries/sql/reports/getFunnel';
-export * from '@/queries/sql/reports/getJourney';
-export * from '@/queries/sql/reports/getRetention';
-export * from '@/queries/sql/reports/getBreakdown';
-export * from '@/queries/sql/reports/getUTM';
-export * from '@/queries/sql/pageviews/getPageviewMetrics';
-export * from '@/queries/sql/pageviews/getPageviewExpandedMetrics';
-export * from '@/queries/sql/pageviews/getPageviewStats';
-export * from '@/queries/sql/sessions/createSession';
-export * from '@/queries/sql/sessions/getWebsiteSession';
-export * from '@/queries/sql/sessions/getSessionData';
-export * from '@/queries/sql/sessions/getSessionDataProperties';
-export * from '@/queries/sql/sessions/getSessionDataValues';
-export * from '@/queries/sql/sessions/getSessionMetrics';
-export * from '@/queries/sql/sessions/getSessionExpandedMetrics';
-export * from '@/queries/sql/sessions/getWebsiteSessions';
-export * from '@/queries/sql/sessions/getWebsiteSessionStats';
-export * from '@/queries/sql/sessions/getSessionActivity';
-export * from '@/queries/sql/sessions/getSessionStats';
-export * from '@/queries/sql/sessions/saveSessionData';
-export * from '@/queries/sql/getActiveVisitors';
-export * from '@/queries/sql/getChannelMetrics';
-export * from '@/queries/sql/getChannelExpandedMetrics';
-export * from '@/queries/sql/getRealtimeActivity';
-export * from '@/queries/sql/getRealtimeData';
-export * from '@/queries/sql/getValues';
-export * from '@/queries/sql/getWebsiteDateRange';
-export * from '@/queries/sql/getWebsiteStats';
-export * from '@/queries/sql/getWeeklyTraffic';

src/queries/prisma/index.ts

@@ -0,0 +1,8 @@
+export * from './link';
+export * from './pixel';
+export * from './report';
+export * from './segment';
+export * from './team';
+export * from './teamUser';
+export * from './user';
+export * from './website';

src/queries/sql/index.ts

@@ -0,0 +1,41 @@
+export * from './events/getEventDataEvents';
+export * from './events/getEventDataFields';
+export * from './events/getEventDataProperties';
+export * from './events/getEventDataValues';
+export * from './events/getEventDataStats';
+export * from './events/getEventDataUsage';
+export * from './events/getEventMetrics';
+export * from './events/getEventExpandedMetrics';
+export * from './events/getEventStats';
+export * from './events/getWebsiteEvents';
+export * from './events/getEventUsage';
+export * from './events/saveEvent';
+export * from './reports/getFunnel';
+export * from './reports/getJourney';
+export * from './reports/getRetention';
+export * from './reports/getBreakdown';
+export * from './reports/getUTM';
+export * from './pageviews/getPageviewMetrics';
+export * from './pageviews/getPageviewExpandedMetrics';
+export * from './pageviews/getPageviewStats';
+export * from './sessions/createSession';
+export * from './sessions/getWebsiteSession';
+export * from './sessions/getSessionData';
+export * from './sessions/getSessionDataProperties';
+export * from './sessions/getSessionDataValues';
+export * from './sessions/getSessionMetrics';
+export * from './sessions/getSessionExpandedMetrics';
+export * from './sessions/getWebsiteSessions';
+export * from './sessions/getWebsiteSessionStats';
+export * from './sessions/getSessionActivity';
+export * from './sessions/getSessionStats';
+export * from './sessions/saveSessionData';
+export * from './getActiveVisitors';
+export * from './getChannelMetrics';
+export * from './getChannelExpandedMetrics';
+export * from './getRealtimeActivity';
+export * from './getRealtimeData';
+export * from './getValues';
+export * from './getWebsiteDateRange';
+export * from './getWebsiteStats';
+export * from './getWeeklyTraffic';