diff --git a/src/pages/api/users/[userId]/usage.ts b/src/pages/api/users/[userId]/usage.ts index 547de338..b5000395 100644 --- a/src/pages/api/users/[userId]/usage.ts +++ b/src/pages/api/users/[userId]/usage.ts @@ -62,6 +62,7 @@ export default async ( websiteName: a.name, websiteEventUsage: websiteEventUsage.find(b => a.id === b.websiteId)?.count || 0, eventDataUsage: eventDataUsage.find(b => a.id === b.websiteId)?.count || 0, + deletedAt: a.deletedAt, })); const usage = websiteUsage.reduce( @@ -74,9 +75,13 @@ export default async ( { websiteEventUsage: 0, eventDataUsage: 0 }, ); + const filteredWebsiteUsage = websiteUsage.filter( + a => !a.deletedAt && (a.websiteEventUsage > 0 || a.eventDataUsage > 0), + ); + return ok(res, { ...usage, - websites: websiteUsage, + websites: filteredWebsiteUsage, }); } diff --git a/src/pages/api/users/[userId]/websites.ts b/src/pages/api/users/[userId]/websites.ts index f443deb8..88a2bad1 100644 --- a/src/pages/api/users/[userId]/websites.ts +++ b/src/pages/api/users/[userId]/websites.ts @@ -9,7 +9,6 @@ import * as yup from 'yup'; const schema = { GET: yup.object().shape({ userId: yup.string().uuid().required(), - teamId: yup.string().uuid(), ...pageInfo, }), }; diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts index a3bcac7b..eb07f779 100644 --- a/src/queries/admin/website.ts +++ b/src/queries/admin/website.ts @@ -61,6 +61,7 @@ export async function getAllWebsites(userId: string) { }, }, ], + deletedAt: null, }, }); }