Merge #1032

1032: Don't list crates that teams/users used to own r=carols10cents

I noticed that the cargo-canoe crate was still listed under my crates on /dashboard, even though alex changed all the ownership records except one to `deleted=true`. Turns out we didn't have that condition on here!

The new tests with the ownership records changed to deleted failed before these changes and pass after.

Author: bors-voyager[bot]

src/krate.rs

@@ -673,6 +673,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
                 crate_owners::table
                     .select(crate_owners::crate_id)
                     .filter(crate_owners::owner_id.eq(user_id))
+                    .filter(crate_owners::deleted.eq(false))
                     .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32)),
             ),
         );
@@ -682,6 +683,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
                 crate_owners::table
                     .select(crate_owners::crate_id)
                     .filter(crate_owners::owner_id.eq(team_id))
+                    .filter(crate_owners::deleted.eq(false))
                     .filter(crate_owners::owner_kind.eq(OwnerKind::Team as i32)),
             ),
         );

src/tests/team.rs

@@ -2,6 +2,7 @@ use std::sync::ONCE_INIT;
 use conduit::{Handler, Method};
 
 use cargo_registry::user::NewUser;
+use cargo_registry::krate::EncodableCrate;
 use record::GhUser;
 
 // Users: `crates-tester-1` and `crates-tester-2`
@@ -351,3 +352,56 @@ fn add_owners_as_team_owner() {
         json.errors
     );
 }
+
+#[test]
+fn crates_by_team_id() {
+    let (_b, app, middle) = ::app();
+
+    let team = {
+        let conn = app.diesel_database.get().unwrap();
+        let u = ::new_user("user_foo").create_or_update(&conn).unwrap();
+        let t = ::new_team("team_foo").create_or_update(&conn).unwrap();
+        let krate = ::CrateBuilder::new("foo", u.id).expect_build(&conn);
+        ::add_team_to_crate(&t, &krate, &u, &conn).unwrap();
+        t
+    };
+
+    let mut req = ::req(app, Method::Get, "/api/v1/crates");
+    req.with_query(&format!("team_id={}", team.id));
+    let mut response = ok_resp!(middle.call(&mut req));
+
+    #[derive(Deserialize)]
+    struct Response {
+        crates: Vec<EncodableCrate>,
+    }
+    let response: Response = ::json(&mut response);
+    assert_eq!(response.crates.len(), 1);
+}
+
+#[test]
+fn crates_by_team_id_not_including_deleted_owners() {
+    let (_b, app, middle) = ::app();
+
+    let team = {
+        let conn = app.diesel_database.get().unwrap();
+        let u = ::new_user("user_foo").create_or_update(&conn).unwrap();
+        let t = ::new_team("github:org_foo:team_foo")
+            .create_or_update(&conn)
+            .unwrap();
+        let krate = ::CrateBuilder::new("foo", u.id).expect_build(&conn);
+        ::add_team_to_crate(&t, &krate, &u, &conn).unwrap();
+        krate.owner_remove(&conn, &u, &t.login).unwrap();
+        t
+    };
+
+    let mut req = ::req(app, Method::Get, "/api/v1/crates");
+    req.with_query(&format!("team_id={}", team.id));
+    let mut response = ok_resp!(middle.call(&mut req));
+
+    #[derive(Deserialize)]
+    struct Response {
+        crates: Vec<EncodableCrate>,
+    }
+    let response: Response = ::json(&mut response);
+    assert_eq!(response.crates.len(), 0);
+}

src/tests/user.rs

@@ -100,6 +100,29 @@ fn crates_by_user_id() {
     assert_eq!(response.crates.len(), 1);
 }
 
+#[test]
+fn crates_by_user_id_not_including_deleted_owners() {
+    let (_b, app, middle) = ::app();
+    let u;
+    {
+        let conn = app.diesel_database.get().unwrap();
+        u = ::new_user("foo").create_or_update(&conn).unwrap();
+        let krate = ::CrateBuilder::new("foo_my_packages", u.id).expect_build(&conn);
+        krate.owner_remove(&conn, &u, "foo").unwrap();
+    }
+
+    let mut req = ::req(app, Method::Get, "/api/v1/crates");
+    req.with_query(&format!("user_id={}", u.id));
+    let mut response = ok_resp!(middle.call(&mut req));
+
+    #[derive(Deserialize)]
+    struct Response {
+        crates: Vec<EncodableCrate>,
+    }
+    let response: Response = ::json(&mut response);
+    assert_eq!(response.crates.len(), 0);
+}
+
 #[test]
 fn following() {
     #[derive(Deserialize)]