From cb5250527b2f65e5a1daf6e172afea721108ec8f Mon Sep 17 00:00:00 2001
From: Geometrically <jai.a@tuta.io>
Date: Sat, 26 Dec 2020 12:08:28 -0700
Subject: [PATCH 1/3] Fix invites failing

---
 src/routes/teams.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/teams.rs b/src/routes/teams.rs
index 459abab25..87c572759 100644
--- a/src/routes/teams.rs
+++ b/src/routes/teams.rs
@@ -154,7 +154,7 @@ pub async fn add_team_member(
     }
     let request = crate::database::models::team_item::TeamMember::get_from_user_id_pending(
         team_id,
-        member.user_id,
+        new_member.user_id.into(),
         &**pool,
     )
     .await?;

From 42c46d7d5ce2cc4c599f2e5473d7a037e84dfd20 Mon Sep 17 00:00:00 2001
From: Geometrically <jai.a@tuta.io>
Date: Sat, 26 Dec 2020 12:20:23 -0700
Subject: [PATCH 2/3] Fix incorrect route for team fetching

---
 src/routes/users.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/users.rs b/src/routes/users.rs
index 0eca4d05b..a041e9e5b 100644
--- a/src/routes/users.rs
+++ b/src/routes/users.rs
@@ -148,7 +148,7 @@ pub async fn mods_list(
     }
 }
 
-#[get("teams")]
+#[get("{user_id}/teams")]
 pub async fn teams(
     req: HttpRequest,
     info: web::Path<(UserId,)>,

From 4beace1bb0c8257676d48c31f7758e7d711316d1 Mon Sep 17 00:00:00 2001
From: Geometrically <jai.a@tuta.io>
Date: Sat, 26 Dec 2020 15:17:51 -0700
Subject: [PATCH 3/3] Fix inites (again)

---
 sqlx-data.json                   | 33 ++++++++++++++++----------------
 src/database/models/team_item.rs |  5 +++--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/sqlx-data.json b/sqlx-data.json
index b84a19e93..f3915cc37 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -1277,22 +1277,6 @@
       ]
     }
   },
-  "596bf1e0a31e35ab768b1239673a69ac6598b0cb94700a84c15682aae55de9bd": {
-    "query": "\n            INSERT INTO team_members (\n                id, user_id, role, permissions, accepted\n            )\n            VALUES (\n                $1, $2, $3, $4, $5\n            )\n            ",
-    "describe": {
-      "columns": [],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Int8",
-          "Varchar",
-          "Int8",
-          "Bool"
-        ]
-      },
-      "nullable": []
-    }
-  },
   "5c4262689205aafdd97a74bee0003f39eef0a34c97f97a939c14fb8fe349f7eb": {
     "query": "\n                    UPDATE files\n                    SET is_primary = TRUE\n                    WHERE (id = $1)\n                    ",
     "describe": {
@@ -1587,6 +1571,23 @@
       "nullable": []
     }
   },
+  "6fd06767f42be894c7a35c6b61f43407c55de43dc77ed02b39062278f3de81e3": {
+    "query": "\n            INSERT INTO team_members (\n                id, team_id, user_id, role, permissions, accepted\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6\n            )\n            ",
+    "describe": {
+      "columns": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8",
+          "Int8",
+          "Varchar",
+          "Int8",
+          "Bool"
+        ]
+      },
+      "nullable": []
+    }
+  },
   "70cdf1b4a17405974909d89b1437a8425792d620f9ed67fd8e31e004e4609e83": {
     "query": "\n                    UPDATE users\n                    SET username = $1\n                    WHERE (id = $2)\n                    ",
     "describe": {
diff --git a/src/database/models/team_item.rs b/src/database/models/team_item.rs
index 6d144935e..a3c4dd93f 100644
--- a/src/database/models/team_item.rs
+++ b/src/database/models/team_item.rs
@@ -302,13 +302,14 @@ impl TeamMember {
         sqlx::query!(
             "
             INSERT INTO team_members (
-                id, user_id, role, permissions, accepted
+                id, team_id, user_id, role, permissions, accepted
             )
             VALUES (
-                $1, $2, $3, $4, $5
+                $1, $2, $3, $4, $5, $6
             )
             ",
             self.id as TeamMemberId,
+            self.team_id as TeamId,
             self.user_id as UserId,
             self.role,
             self.permissions.bits() as i64,