Use CrateOwner::by_owner_kind to exclude deleted crate ownerships

Author: carols10cents

src/controllers/user/me.rs

@@ -38,10 +38,9 @@ pub fn me(req: &mut dyn Request) -> AppResult<Response> {
         ))
         .first::<(User, Option<bool>, Option<String>, bool)>(&*conn)?;
 
-    let owned_crates = crate_owners::table
+    let owned_crates = CrateOwner::by_owner_kind(OwnerKind::User)
         .inner_join(crates::table)
         .filter(crate_owners::owner_id.eq(user_id))
-        .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32))
         .select((crates::id, crates::name, crate_owners::email_notifications))
         .order(crates::name.asc())
         .load(&*conn)?

src/controllers/user/other.rs

@@ -1,6 +1,6 @@
 use crate::controllers::prelude::*;
 
-use crate::models::{OwnerKind, User};
+use crate::models::{CrateOwner, OwnerKind, User};
 use crate::schema::{crate_owners, crates, users};
 use crate::views::EncodablePublicUser;
 
@@ -31,13 +31,9 @@ pub fn stats(req: &mut dyn Request) -> AppResult<Response> {
     let user_id = &req.params()["user_id"].parse::<i32>().ok().unwrap();
     let conn = req.db_conn()?;
 
-    let data = crate_owners::table
+    let data = CrateOwner::by_owner_kind(OwnerKind::User)
         .inner_join(crates::table)
-        .filter(
-            crate_owners::owner_id
-                .eq(user_id)
-                .and(crate_owners::owner_kind.eq(OwnerKind::User as i32)),
-        )
+        .filter(crate_owners::owner_id.eq(user_id))
         .select(sum(crates::downloads))
         .first::<Option<i64>>(&*conn)?
         .unwrap_or(0);

src/tests/user.rs

@@ -326,11 +326,13 @@ fn user_total_downloads() {
 
         let mut no_longer_my_krate = CrateBuilder::new("nacho", user.id).expect_build(conn);
         no_longer_my_krate.downloads = 5;
-        update(&no_longer_my_krate).set(&no_longer_my_krate).execute(conn).unwrap();
+        update(&no_longer_my_krate)
+            .set(&no_longer_my_krate)
+            .execute(conn)
+            .unwrap();
         no_longer_my_krate
             .owner_remove(app.as_inner(), conn, user, &user.gh_login)
             .unwrap();
-
     });
 
     let url = format!("/api/v1/users/{}/stats", user.id);