From 0335fd35296e8049459e42f3b598ed56d3fd38db Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 13 Apr 2023 20:57:22 -0700
Subject: [PATCH] Remove webisite.teamId related code.  Clean up queries.

---
 lib/auth.ts                                |  8 +-------
 pages/api/websites/[id]/index.ts           |  6 ++++--
 pages/api/websites/index.ts                | 11 +++--------
 queries/analytics/event/getEventMetrics.ts |  2 --
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/lib/auth.ts b/lib/auth.ts
index 93f24b2c..2195ad8f 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -95,17 +95,11 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
   return false;
 }
 
-export async function canCreateWebsite({ user }: Auth, teamId?: string) {
+export async function canCreateWebsite({ user }: Auth) {
   if (user.isAdmin) {
     return true;
   }
 
-  if (teamId) {
-    const teamUser = await getTeamUser(teamId, user.id);
-
-    return hasPermission(teamUser?.role, PERMISSIONS.websiteCreate);
-  }
-
   return hasPermission(user.role, PERMISSIONS.websiteCreate);
 }
 
diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.ts
index 671f6274..c1907fce 100644
--- a/pages/api/websites/[id]/index.ts
+++ b/pages/api/websites/[id]/index.ts
@@ -41,15 +41,17 @@ export default async (
 
     const { name, domain, shareId } = req.body;
 
+    let website;
+
     try {
-      await updateWebsite(websiteId, { name, domain, shareId });
+      website = await updateWebsite(websiteId, { name, domain, shareId });
     } catch (e: any) {
       if (e.message.includes('Unique constraint') && e.message.includes('share_id')) {
         return serverError(res, 'That share ID is already taken.');
       }
     }
 
-    return ok(res);
+    return ok(res, website);
   }
 
   if (req.method === 'DELETE') {
diff --git a/pages/api/websites/index.ts b/pages/api/websites/index.ts
index 52c3ba35..49797d08 100644
--- a/pages/api/websites/index.ts
+++ b/pages/api/websites/index.ts
@@ -10,7 +10,6 @@ export interface WebsitesRequestBody {
   name: string;
   domain: string;
   shareId: string;
-  teamId?: string;
 }
 
 export default async (
@@ -31,9 +30,9 @@ export default async (
   }
 
   if (req.method === 'POST') {
-    const { name, domain, shareId, teamId } = req.body;
+    const { name, domain, shareId } = req.body;
 
-    if (!(await canCreateWebsite(req.auth, teamId))) {
+    if (!(await canCreateWebsite(req.auth))) {
       return unauthorized(res);
     }
 
@@ -44,11 +43,7 @@ export default async (
       shareId,
     };
 
-    if (teamId) {
-      data.teamId = teamId;
-    } else {
-      data.userId = userId;
-    }
+    data.userId = userId;
 
     const website = await createWebsite(data);
 
diff --git a/queries/analytics/event/getEventMetrics.ts b/queries/analytics/event/getEventMetrics.ts
index 662e072b..32deef5d 100644
--- a/queries/analytics/event/getEventMetrics.ts
+++ b/queries/analytics/event/getEventMetrics.ts
@@ -13,7 +13,6 @@ export async function getEventMetrics(
       endDate: Date;
       timezone: string;
       unit: string;
-      column: string;
       filters: {
         url: string;
         eventName: string;
@@ -40,7 +39,6 @@ async function relationalQuery(
     endDate: Date;
     timezone: string;
     unit: string;
-    column: string;
     filters: {
       url: string;
       eventName: string;