fix issue where visitor stats is not filtered by shortener id

pull/3/head
TZGyn 2 years ago
parent 092d18bbe4
commit 5db9bf0dce
Signed by: TZGyn
GPG Key ID: 122EAF77AE81FD4A

@ -1,7 +1,7 @@
import { db } from '$lib/db' import { db } from '$lib/db'
import { redirect } from '@sveltejs/kit' import { redirect } from '@sveltejs/kit'
import type { PageServerLoad } from './$types' import type { PageServerLoad } from './$types'
import { sql } from 'drizzle-orm' import { eq, sql } from 'drizzle-orm'
import { visitor as visitorSchema } from '$lib/db/schema' import { visitor as visitorSchema } from '$lib/db/schema'
export const load = (async (event) => { export const load = (async (event) => {
@ -29,6 +29,7 @@ export const load = (async (event) => {
month: sql<number>`cast(to_char(${visitorSchema.createdAt}, 'MM') as int)`, month: sql<number>`cast(to_char(${visitorSchema.createdAt}, 'MM') as int)`,
}) })
.from(visitorSchema) .from(visitorSchema)
.where(eq(visitorSchema.shortenerId, shortener.id))
.groupBy(sql`to_char(${visitorSchema.createdAt}, 'MM')`) .groupBy(sql`to_char(${visitorSchema.createdAt}, 'MM')`)
const visitorByCountry = await db const visitorByCountry = await db
@ -38,6 +39,7 @@ export const load = (async (event) => {
code: visitorSchema.countryCode, code: visitorSchema.countryCode,
}) })
.from(visitorSchema) .from(visitorSchema)
.where(eq(visitorSchema.shortenerId, shortener.id))
.groupBy(visitorSchema.country, visitorSchema.countryCode) .groupBy(visitorSchema.country, visitorSchema.countryCode)
const visitorByCity = await db const visitorByCity = await db
@ -48,6 +50,7 @@ export const load = (async (event) => {
city: visitorSchema.city, city: visitorSchema.city,
}) })
.from(visitorSchema) .from(visitorSchema)
.where(eq(visitorSchema.shortenerId, shortener.id))
.groupBy( .groupBy(
visitorSchema.country, visitorSchema.country,
visitorSchema.countryCode, visitorSchema.countryCode,

Loading…
Cancel
Save