Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Mike Cao 2023-04-13 23:06:04 -07:00
commit fa52e6c83f
3 changed files with 1 additions and 3 deletions

View File

@ -10,7 +10,6 @@ const unitTypes = ['year', 'month', 'hour', 'day'];
export interface WebsitePageviewRequestQuery { export interface WebsitePageviewRequestQuery {
id: string; id: string;
websiteId: string;
startAt: number; startAt: number;
endAt: number; endAt: number;
unit: string; unit: string;

View File

@ -7,7 +7,6 @@ import { getWebsiteStats } from 'queries';
export interface WebsiteStatsRequestQuery { export interface WebsiteStatsRequestQuery {
id: string; id: string;
type: string;
startAt: number; startAt: number;
endAt: number; endAt: number;
url: string; url: string;

View File

@ -44,7 +44,7 @@ async function relationalQuery(data: Prisma.SessionCreateInput) {
screen, screen,
language, language,
country, country,
subdivision1: country.concat('-', subdivision1), subdivision1: subdivision1 ? country.concat('-', subdivision1) : null,
subdivision2, subdivision2,
city, city,
}, },