Backend of deployable chunk 1 of owner invitations

migrations/2017-08-31-230457_invitations/down.sql

@@ -0,0 +1 @@
+DROP TABLE crate_owner_invitations;

migrations/2017-08-31-230457_invitations/up.sql

@@ -0,0 +1,7 @@
+CREATE TABLE crate_owner_invitations (
+ invited_user_id INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ invited_by_user_id INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ crate_id INTEGER NOT NULL REFERENCES crates (id) ON DELETE CASCADE,
+ created_at TIMESTAMP NOT NULL DEFAULT now(),
+ PRIMARY KEY (invited_user_id, crate_id)
+);

src/crate_owner_invitation.rs

@@ -0,0 +1,82 @@
+use conduit::{Request, Response};
+use diesel::prelude::*;
+use time::Timespec;
+
+use db::RequestTransaction;
+use schema::{crate_owner_invitations, users, crates};
+use user::RequestUser;
+use util::errors::CargoResult;
+use util::RequestUtils;
+
+/// The model representing a row in the `crate_owner_invitations` database table.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Identifiable, Queryable)]
+#[primary_key(invited_user_id, crate_id)]
+pub struct CrateOwnerInvitation {
+ pub invited_user_id: i32,
+ pub invited_by_user_id: i32,
+ pub crate_id: i32,
+ pub created_at: Timespec,
+}
+
+#[derive(Insertable, Clone, Copy, Debug)]
+#[table_name = "crate_owner_invitations"]
+pub struct NewCrateOwnerInvitation {
+ pub invited_user_id: i32,
+ pub invited_by_user_id: i32,
+ pub crate_id: i32,
+}
+
+impl CrateOwnerInvitation {
+ pub fn invited_by_username(&self, conn: &PgConnection) -> String {
+ users::table
+ .find(self.invited_by_user_id)
+ .select(users::gh_login)
+ .first(&*conn)
+ .unwrap_or_else(|_| String::from("(unknown username)"))
+ }
+
+ pub fn crate_name(&self, conn: &PgConnection) -> String {
+ crates::table
+ .find(self.crate_id)
+ .select(crates::name)
+ .first(&*conn)
+ .unwrap_or_else(|_| String::from("(unknown crate name)"))
+ }
+
+ pub fn encodable(self, conn: &PgConnection) -> EncodableCrateOwnerInvitation {
+ EncodableCrateOwnerInvitation {
+ invited_by_username: self.invited_by_username(conn),
+ crate_name: self.crate_name(conn),
+ crate_id: self.crate_id,
+ created_at: ::encode_time(self.created_at),
+ }
+ }
+}
+
+/// The serialization format for the `CrateOwnerInvitation` model.
+#[derive(Deserialize, Serialize, Debug)]
+pub struct EncodableCrateOwnerInvitation {
+ pub invited_by_username: String,
+ pub crate_name: String,
+ pub crate_id: i32,
+ pub created_at: String,
+}
+
+/// Handles the `GET /me/crate_owner_invitations` route.
+pub fn list(req: &mut Request) -> CargoResult<Response> {
+ let conn = &*req.db_conn()?;
+ let user_id = req.user()?.id;
+
+ let invitations = crate_owner_invitations::table
+ .filter(crate_owner_invitations::invited_user_id.eq(user_id))
+ .load::<CrateOwnerInvitation>(&*conn)?
+ .into_iter()
+ .map(|i| i.encodable(conn))
+ .collect();
+
+ #[derive(Serialize)]
+ struct R {
+ invitations: Vec<EncodableCrateOwnerInvitation>,
+ }
+ Ok(req.json(&R { invitations }))
+}

src/lib.rs

@@ -76,6 +76,7 @@ pub mod badge;
 pub mod categories;
 pub mod category;
 pub mod config;
+pub mod crate_owner_invitation;
 pub mod db;
 pub mod dependency;
 pub mod dist;
@@ -183,6 +184,10 @@ pub fn middleware(app: Arc<App>) -> MiddlewareBuilder {
  api_router.get("/me/tokens", C(token::list));
  api_router.post("/me/tokens", C(token::new));
  api_router.delete("/me/tokens/:id", C(token::revoke));
+ api_router.get(
+ "/me/crate_owner_invitations",
+ C(crate_owner_invitation::list),
+ );
  api_router.get("/summary", C(krate::summary));
  let api_router = Arc::new(R404(api_router));
 

src/schema.rs

@@ -138,6 +138,38 @@ table! {
  }
 }
 
+table! {
+ /// Representation of the `crate_owner_invitations` table.
+ ///
+ /// (Automatically generated by Diesel.)
+ crate_owner_invitations (invited_user_id, crate_id) {
+ /// The `invited_user_id` column of the `crate_owner_invitations` table.
+ ///
+ /// Its SQL type is `Int4`.
+ ///
+ /// (Automatically generated by Diesel.)
+ invited_user_id -> Int4,
+ /// The `invited_by_user_id` column of the `crate_owner_invitations` table.
+ ///
+ /// Its SQL type is `Int4`.
+ ///
+ /// (Automatically generated by Diesel.)
+ invited_by_user_id -> Int4,
+ /// The `crate_id` column of the `crate_owner_invitations` table.
+ ///
+ /// Its SQL type is `Int4`.
+ ///
+ /// (Automatically generated by Diesel.)
+ crate_id -> Int4,
+ /// The `created_at` column of the `crate_owner_invitations` table.
+ ///
+ /// Its SQL type is `Timestamp`.
+ ///
+ /// (Automatically generated by Diesel.)
+ created_at -> Timestamp,
+ }
+}
+
 table! {
  /// Representation of the `crate_owners` table.
  ///
@@ -720,3 +752,4 @@ joinable!(version_downloads -> versions (version_id));
 joinable!(crate_owners -> teams (owner_id));
 joinable!(crate_owners -> users (owner_id));
 joinable!(readme_rendering -> versions (version_id));
+joinable!(crate_owner_invitations -> crates (crate_id));

src/tests/all.rs

@@ -31,8 +31,8 @@ use cargo_registry::app::App;
 use cargo_registry::category::NewCategory;
 use cargo_registry::dependency::NewDependency;
 use cargo_registry::keyword::Keyword;
-use cargo_registry::krate::{NewCrate, CrateDownload};
-use cargo_registry::schema::dependencies;
+use cargo_registry::krate::{NewCrate, CrateDownload, EncodableCrate};
+use cargo_registry::schema::*;
 use cargo_registry::upload as u;
 use cargo_registry::user::NewUser;
 use cargo_registry::owner::{CrateOwner, NewTeam, Team};
@@ -43,7 +43,6 @@ use conduit::{Request, Method};
 use conduit_test::MockRequest;
 use diesel::prelude::*;
 use diesel::pg::upsert::*;
-use cargo_registry::schema::*;
 
 macro_rules! t {
  ($e:expr) => (
@@ -89,13 +88,35 @@ mod category;
 mod git;
 mod keyword;
 mod krate;
+mod owners;
 mod record;
 mod schema_details;
 mod team;
 mod token;
 mod user;
 mod version;
 
+#[derive(Deserialize)]
+struct GoodCrate {
+ #[serde(rename = "crate")]
+ krate: EncodableCrate,
+ warnings: Warnings,
+}
+#[derive(Deserialize)]
+struct CrateList {
+ crates: Vec<EncodableCrate>,
+ meta: CrateMeta,
+}
+#[derive(Deserialize)]
+struct Warnings {
+ invalid_categories: Vec<String>,
+ invalid_badges: Vec<String>,
+}
+#[derive(Deserialize)]
+struct CrateMeta {
+ total: i32,
+}
+
 fn app() -> (record::Bomb, Arc<App>, conduit_middleware::MiddlewareBuilder) {
  dotenv::dotenv().ok();
  git::init();