seperate revenue queries for better api/performance. Fix realtime css/ui issues.
This commit is contained in:
1 parent
c6ec8385c9
commit
b7e1d902f4
18 files changed
+755
-355
No files matched your search
@@ -3,8 +3,14 @@ import { getQueryFilters, parseRequest, setWebsiteDate } from '@/lib/request';
|
||||
import { json, unauthorized } from '@/lib/response';
|
||||
import { reportResultSchema } from '@/lib/schema';
|
||||
import { canViewWebsite } from '@/permissions';
|
||||
import { getRevenue, type RevenuParameters } from '@/queries/sql/reports/getRevenue';
|
||||
import { getRevenueMetrics } from '@/queries/sql/reports/getRevenueMetrics';
|
||||
import {
|
||||
getRevenueChart,
|
||||
type RevenuParameters,
|
||||
} from '@/queries/sql/reports/getRevenueChart';
|
||||
import {
|
||||
getRevenueMetrics,
|
||||
type RevenueMetricsResult,
|
||||
} from '@/queries/sql/reports/getRevenueMetrics';
|
||||
import { getRevenueStats } from '@/queries/sql/reports/getRevenueStats';
|
||||
|
||||
export async function POST(request: Request) {
|
||||
@@ -22,20 +28,39 @@ export async function POST(request: Request) {
|
||||
|
||||
const parameters = await setWebsiteDate(websiteId, body.parameters);
|
||||
const filters = await getQueryFilters(body.filters, websiteId);
|
||||
|
||||
const [{ chart }, total, metrics] = await Promise.all([
|
||||
getRevenue(websiteId, parameters as RevenuParameters, filters),
|
||||
getRevenueStats(websiteId, parameters as RevenuParameters, filters),
|
||||
getRevenueMetrics(websiteId, parameters as RevenuParameters, filters),
|
||||
]);
|
||||
|
||||
const { compare = 'prev' } = parameters as RevenuParameters;
|
||||
const { startDate, endDate } = getCompareDate(compare, parameters.startDate, parameters.endDate);
|
||||
const comparison = await getRevenueStats(
|
||||
websiteId,
|
||||
{ ...(parameters as RevenuParameters), startDate, endDate },
|
||||
filters,
|
||||
);
|
||||
const comparisonParameters = { ...(parameters as RevenuParameters), startDate, endDate };
|
||||
|
||||
return json({ chart, total: { ...total, comparison }, ...metrics });
|
||||
const [{ chart }, total, comparison, country, region, referrer, channel] = await Promise.all([
|
||||
getRevenueChart(websiteId, parameters as RevenuParameters, filters),
|
||||
getRevenueStats(websiteId, parameters as RevenuParameters, filters),
|
||||
getRevenueStats(websiteId, comparisonParameters, filters),
|
||||
getRevenueMetrics(
|
||||
websiteId,
|
||||
parameters as RevenuParameters,
|
||||
filters,
|
||||
'country',
|
||||
) as Promise<RevenueMetricsResult['country']>,
|
||||
getRevenueMetrics(
|
||||
websiteId,
|
||||
parameters as RevenuParameters,
|
||||
filters,
|
||||
'region',
|
||||
) as Promise<RevenueMetricsResult['region']>,
|
||||
getRevenueMetrics(
|
||||
websiteId,
|
||||
parameters as RevenuParameters,
|
||||
filters,
|
||||
'referrer',
|
||||
) as Promise<RevenueMetricsResult['referrer']>,
|
||||
getRevenueMetrics(
|
||||
websiteId,
|
||||
parameters as RevenuParameters,
|
||||
filters,
|
||||
'channel',
|
||||
) as Promise<RevenueMetricsResult['channel']>,
|
||||
]);
|
||||
|
||||
return json({ chart, total: { ...total, comparison }, country, region, referrer, channel });
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
import { z } from 'zod';
|
||||
import { getQueryFilters, parseRequest } from '@/lib/request';
|
||||
import { json, unauthorized } from '@/lib/response';
|
||||
import { filterParams, withDateRange } from '@/lib/schema';
|
||||
import { canViewWebsite } from '@/permissions';
|
||||
import {
|
||||
getRevenueChart,
|
||||
type RevenuParameters,
|
||||
} from '@/queries/sql/reports/getRevenueChart';
|
||||
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ websiteId: string }> },
|
||||
) {
|
||||
const schema = withDateRange({
|
||||
currency: z.string(),
|
||||
...filterParams,
|
||||
});
|
||||
|
||||
const { auth, query, error } = await parseRequest(request, schema);
|
||||
|
||||
if (error) {
|
||||
return error();
|
||||
}
|
||||
|
||||
const { websiteId } = await params;
|
||||
|
||||
if (!(await canViewWebsite(auth, websiteId))) {
|
||||
return unauthorized();
|
||||
}
|
||||
|
||||
const { currency } = query;
|
||||
const filters = await getQueryFilters(query, websiteId);
|
||||
const parameters = { ...filters, currency } as RevenuParameters;
|
||||
|
||||
return json(await getRevenueChart(websiteId, parameters, filters));
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
import { z } from 'zod';
|
||||
import { getQueryFilters, parseRequest } from '@/lib/request';
|
||||
import { badRequest, json, unauthorized } from '@/lib/response';
|
||||
import { filterParams, withDateRange } from '@/lib/schema';
|
||||
import { canViewWebsite } from '@/permissions';
|
||||
import {
|
||||
getRevenueMetrics,
|
||||
type RevenueMetricType,
|
||||
} from '@/queries/sql/reports/getRevenueMetrics';
|
||||
import type { RevenuParameters } from '@/queries/sql/reports/getRevenueChart';
|
||||
|
||||
const revenueMetricType = z.enum(['country', 'region', 'referrer', 'channel']);
|
||||
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ websiteId: string }> },
|
||||
) {
|
||||
const schema = withDateRange({
|
||||
type: revenueMetricType,
|
||||
currency: z.string(),
|
||||
...filterParams,
|
||||
});
|
||||
|
||||
const { auth, query, error } = await parseRequest(request, schema);
|
||||
|
||||
if (error) {
|
||||
return error();
|
||||
}
|
||||
|
||||
const { websiteId } = await params;
|
||||
|
||||
if (!(await canViewWebsite(auth, websiteId))) {
|
||||
return unauthorized();
|
||||
}
|
||||
|
||||
const { type, currency } = query;
|
||||
const filters = await getQueryFilters(query, websiteId);
|
||||
|
||||
if (!type) {
|
||||
return badRequest();
|
||||
}
|
||||
|
||||
const parameters = { ...filters, currency } as RevenuParameters;
|
||||
|
||||
return json(
|
||||
await getRevenueMetrics(websiteId, parameters, filters, type as RevenueMetricType),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import { z } from 'zod';
|
||||
import { getCompareDate } from '@/lib/date';
|
||||
import { getQueryFilters, parseRequest } from '@/lib/request';
|
||||
import { json, unauthorized } from '@/lib/response';
|
||||
import { filterParams, withDateRange } from '@/lib/schema';
|
||||
import { canViewWebsite } from '@/permissions';
|
||||
import { type RevenuParameters } from '@/queries/sql/reports/getRevenueChart';
|
||||
import { getRevenueStats } from '@/queries/sql/reports/getRevenueStats';
|
||||
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ websiteId: string }> },
|
||||
) {
|
||||
const schema = withDateRange({
|
||||
currency: z.string(),
|
||||
...filterParams,
|
||||
});
|
||||
|
||||
const { auth, query, error } = await parseRequest(request, schema);
|
||||
|
||||
if (error) {
|
||||
return error();
|
||||
}
|
||||
|
||||
const { websiteId } = await params;
|
||||
|
||||
if (!(await canViewWebsite(auth, websiteId))) {
|
||||
return unauthorized();
|
||||
}
|
||||
|
||||
const { currency } = query;
|
||||
const filters = await getQueryFilters(query, websiteId);
|
||||
const parameters = { ...filters, currency } as RevenuParameters;
|
||||
const { compare = 'prev' } = parameters;
|
||||
const { startDate, endDate } = getCompareDate(compare, parameters.startDate, parameters.endDate);
|
||||
const comparisonParameters = { ...parameters, startDate, endDate };
|
||||
|
||||
const [stats, comparison] = await Promise.all([
|
||||
getRevenueStats(websiteId, parameters, filters),
|
||||
getRevenueStats(websiteId, comparisonParameters, filters),
|
||||
]);
|
||||
|
||||
return json({ ...stats, comparison });
|
||||
}
|
||||
Reference in new issue
Block a user