update team invite schema

Author: warrenyun

Cargo.lock

@@ -15,6 +15,7 @@ rand = "0.8.4"
 regex = "1.5.4"
 reqwest = {version = "0.11.6", features = ["json"]}
 time = "0.2.25"
+nanoid = "0.4.0"
 
 tokio = {version = "1.15.0", features = ["full"]}
 

Cargo.toml

@@ -1,103 +1,97 @@
 table! {
-	apps (id) {
-		id -> Int4,
-		created_at -> Timestamp,
-		slug -> Text,
-		team_id -> Int4,
-		enabled -> Bool,
-		container_id -> Nullable<Text>,
-		network_id -> Nullable<Text>,
-	}
+    apps (id) {
+        id -> Int4,
+        created_at -> Timestamp,
+        slug -> Text,
+        team_id -> Int4,
+        enabled -> Bool,
+        container_id -> Nullable<Text>,
+        network_id -> Nullable<Text>,
+    }
 }
 
 table! {
-	builds (id) {
-		id -> Int4,
-		started_at -> Timestamp,
-		ended_at -> Nullable<Timestamp>,
-		events -> Array<Text>,
-		app_id -> Int4,
-	}
+    builds (id) {
+        id -> Int4,
+        started_at -> Timestamp,
+        ended_at -> Nullable<Timestamp>,
+        events -> Array<Text>,
+        app_id -> Int4,
+    }
 }
 
 table! {
-	domains (id) {
-		id -> Int4,
-		domain -> Text,
-		verified -> Bool,
-		app_id -> Int4,
-	}
+    domains (id) {
+        id -> Int4,
+        domain -> Text,
+        verified -> Bool,
+        app_id -> Int4,
+    }
 }
 
 table! {
-	oauth_apps (client_id) {
-		client_id -> Text,
-		name -> Text,
-	}
+    oauth_apps (client_id) {
+        client_id -> Text,
+        name -> Text,
+    }
 }
 
 table! {
-	oauth_device_requests (id) {
-		id -> Int4,
-		created_at -> Timestamp,
-		expires_at -> Timestamp,
-		oauth_app_id -> Text,
-		token -> Nullable<Text>,
-		device_code -> Text,
-		user_code -> Text,
-		token_retrieved -> Bool,
-		access_denied -> Bool,
-	}
+    oauth_device_requests (id) {
+        id -> Int4,
+        created_at -> Timestamp,
+        expires_at -> Timestamp,
+        oauth_app_id -> Text,
+        token -> Nullable<Text>,
+        device_code -> Text,
+        user_code -> Text,
+        token_retrieved -> Bool,
+        access_denied -> Bool,
+    }
 }
 
 table! {
-	team_users (team_id, user_id) {
-		user_id -> Int4,
-		team_id -> Int4,
-	}
+    team_users (team_id, user_id) {
+        user_id -> Int4,
+        team_id -> Int4,
+    }
 }
 
 table! {
-	invites (team_id, user_id) {
-		user_id -> Int4,
-		team_id -> Int4,
-	}
+    teams (id) {
+        id -> Int4,
+        created_at -> Timestamp,
+        name -> Nullable<Text>,
+        avatar -> Nullable<Text>,
+        personal -> Bool,
+        slug -> Text,
+        invite -> Text,
+    }
 }
 
 table! {
-	teams (id) {
-		id -> Int4,
-		created_at -> Timestamp,
-		name -> Nullable<Text>,
-		avatar -> Nullable<Text>,
-		personal -> Bool,
-		slug -> Text,
-	}
+    tokens (token) {
+        token -> Text,
+        created_at -> Timestamp,
+        expires_at -> Timestamp,
+        user_id -> Int4,
+    }
 }
 
 table! {
-	tokens (token) {
-		token -> Text,
-		created_at -> Timestamp,
-		expires_at -> Timestamp,
-		user_id -> Int4,
-	}
+    users (id) {
+        id -> Int4,
+        created_at -> Timestamp,
+        slack_user_id -> Text,
+        name -> Text,
+        avatar -> Nullable<Text>,
+    }
 }
 
 table! {
-	users (id) {
-		id -> Int4,
-		created_at -> Timestamp,
-		slack_user_id -> Text,
-		name -> Text,
-		avatar -> Nullable<Text>,
-	}
-}
-
-table! {
-	whitelist (slack_user_id) {
-		slack_user_id -> Text,
-	}
+    whitelist (slack_user_id) {
+        slack_user_id -> Text,
+    }
 }
 
 joinable!(apps -> teams (team_id));
@@ -107,19 +101,17 @@ joinable!(oauth_device_requests -> oauth_apps (oauth_app_id));
 joinable!(oauth_device_requests -> tokens (token));
 joinable!(team_users -> teams (team_id));
 joinable!(team_users -> users (user_id));
-joinable!(invites -> teams (team_id));
-joinable!(invites -> users (user_id));
 joinable!(tokens -> users (user_id));
 
 allow_tables_to_appear_in_same_query!(
-	apps,
-	builds,
-	domains,
-	oauth_apps,
-	oauth_device_requests,
-	team_users,
-	teams,
-	tokens,
-	users,
-	whitelist,
+    apps,
+    builds,
+    domains,
+    oauth_apps,
+    oauth_device_requests,
+    team_users,
+    teams,
+    tokens,
+    users,
+    whitelist,
 );

crates/db_models/src/schema.rs

@@ -11,6 +11,7 @@ pub struct Team {
 	pub avatar: Option<String>,
 	pub personal: bool,
 	pub slug: String,
+  pub invite: String,
 }
 
 #[derive(Clone, Debug, Insertable, Deserialize)]
@@ -21,6 +22,7 @@ pub struct NewTeam {
 	#[serde(skip_deserializing)]
 	pub personal: bool,
 	pub slug: String,
+  pub invite: String,
 }
 
 #[derive(Clone, Debug, AsChangeset, Deserialize)]

crates/db_models/src/team.rs

@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE teams DROP COLUMN invite

migrations/2022-08-25-052916_invite/down.sql

@@ -0,0 +1,3 @@
+-- Your SQL goes here
+ALTER TABLE teams
+ADD COLUMN invite TEXT NOT NULL UNIQUE 

migrations/2022-08-25-052916_invite/up.sql

@@ -12,11 +12,12 @@ use db_models::{App, NewTeam, Team, TeamUser, UpdatedTeam, User};
 
 use crate::{auth::AuthUser, utils::slug::validate_slug, DbConn};
 
+use nanoid::nanoid;
+
 /// Fetches a team by the `slug`, which can either be a Team.slug or a numeric Team.id
 fn fetch_team(team_slug: String, user_id: i32, c: &diesel::PgConnection) -> QueryResult<Team> {
 	use db_models::schema::team_users;
 	use db_models::schema::teams::dsl::*;
-
 	// Attempt to parse out a numeric ID
 	let team = match team_slug.parse::<i32>() {
 		Ok(i) => teams
@@ -48,6 +49,8 @@ pub async fn create(
 		use db_models::schema::team_users::dsl::*;
 		use db_models::schema::teams::dsl::*;
 
+    let inv_id = nanoid!(7);
+
 		let created_team = diesel::insert_into(teams)
 			.values(team.0)
 			.get_result::<Team>(c)