From c80be88d14e5c718aa6fa8ac56fb2c1a159cbdee Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 14 May 2024 09:39:04 -0700 Subject: [PATCH] update getAllwebsites, match usage query with api / cloud call --- src/pages/api/users/[userId]/usage.ts | 3 +-- src/queries/admin/website.ts | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts index 9d2bc37e..90cfb9ee 100644 --- a/src/pages/api/users/[userId]/usage.ts +++ b/src/pages/api/users/[userId]/usage.ts @@ -7,8 +7,7 @@ import * as yup from 'yup'; export interface UserUsageRequestQuery { id: string; - startAt: string; - endAt: string; + params: { startAt: string; endAt: string }; } export interface UserUsageRequestResponse { diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts index 37dd5f48..a3bcac7b 100644 --- a/src/queries/admin/website.ts +++ b/src/queries/admin/website.ts @@ -48,7 +48,19 @@ export async function getWebsites( export async function getAllWebsites(userId: string) { return prisma.client.website.findMany({ where: { - userId, + OR: [ + { userId }, + { + team: { + deletedAt: null, + teamUser: { + some: { + userId, + }, + }, + }, + }, + ], }, }); }