Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Fix usage.

Brian Caod057b15460c9
diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts
index 66e927688..9d2bc37ea 100644
--- a/src/pages/api/users/[userId]/usage.ts
+++ b/src/pages/api/users/[userId]/usage.ts
@@ -2,7 +2,7 @@ import { useAuth, useCors, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getAllWebsites, getEventDataUsage, getEventUsage } from 'queries';
+import { getAllUserWebsitesIncludingTeamOwner, getEventDataUsage, getEventUsage } from 'queries';
import * as yup from 'yup';
export interface UserUsageRequestQuery {
@@ -50,7 +50,7 @@ export default async (
const startDate = new Date(+startAt);
const endDate = new Date(+endAt);
- const websites = await getAllWebsites(userId);
+ const websites = await getAllUserWebsitesIncludingTeamOwner(userId);
const websiteIds = websites.map(a => a.id);
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index d191aa657..37dd5f482 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -3,6 +3,7 @@ import redis from '@umami/redis-client';
import prisma from 'lib/prisma';
import { PageResult, PageParams } from 'lib/types';
import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
+import { ROLES } from 'lib/constants';
async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
return prisma.client.website.findUnique(criteria);
@@ -52,6 +53,27 @@ export async function getAllWebsites(userId: string) {
});
}
+export async function getAllUserWebsitesIncludingTeamOwner(userId: string) {
+ return prisma.client.website.findMany({
+ where: {
+ OR: [
+ { userId },
+ {
+ team: {
+ deletedAt: null,
+ teamUser: {
+ some: {
+ role: ROLES.teamOwner,
+ userId,
+ },
+ },
+ },
+ },
+ ],
+ },
+ });
+}
+
export async function getUserWebsites(
userId: string,
filters?: PageParams,