Merge pull request #9901 from Turbo87/async-owners

models/krate: Add `async_owners()` fn

Author: Turbo87

src/controllers/krate/owners.rs

@@ -19,26 +19,24 @@ use tokio::runtime::Handle;
 
 /// Handles the `GET /crates/:crate_id/owners` route.
 pub async fn owners(state: AppState, Path(crate_name): Path<String>) -> AppResult<Json<Value>> {
-    let conn = state.db_read().await?;
-    spawn_blocking(move || {
-        use diesel::RunQueryDsl;
+    use diesel_async::RunQueryDsl;
 
-        let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
+    let mut conn = state.db_read().await?;
 
-        let krate: Crate = Crate::by_name(&crate_name)
-            .first(conn)
-            .optional()?
-            .ok_or_else(|| crate_not_found(&crate_name))?;
+    let krate: Crate = Crate::by_name(&crate_name)
+        .first(&mut conn)
+        .await
+        .optional()?
+        .ok_or_else(|| crate_not_found(&crate_name))?;
 
-        let owners = krate
-            .owners(conn)?
-            .into_iter()
-            .map(Owner::into)
-            .collect::<Vec<EncodableOwner>>();
+    let owners = krate
+        .async_owners(&mut conn)
+        .await?
+        .into_iter()
+        .map(Owner::into)
+        .collect::<Vec<EncodableOwner>>();
 
-        Ok(Json(json!({ "users": owners })))
-    })
-    .await
+    Ok(Json(json!({ "users": owners })))
 }
 
 /// Handles the `GET /crates/:crate_id/owner_team` route.

src/models/krate.rs

@@ -355,6 +355,30 @@ impl Crate {
         ))
     }
 
+    pub async fn async_owners(&self, conn: &mut AsyncPgConnection) -> QueryResult<Vec<Owner>> {
+        use diesel_async::RunQueryDsl;
+
+        let users = CrateOwner::by_owner_kind(OwnerKind::User)
+            .filter(crate_owners::crate_id.eq(self.id))
+            .inner_join(users::table)
+            .select(User::as_select())
+            .load(conn)
+            .await?
+            .into_iter()
+            .map(Owner::User);
+
+        let teams = CrateOwner::by_owner_kind(OwnerKind::Team)
+            .filter(crate_owners::crate_id.eq(self.id))
+            .inner_join(teams::table)
+            .select(Team::as_select())
+            .load(conn)
+            .await?
+            .into_iter()
+            .map(Owner::Team);
+
+        Ok(users.chain(teams).collect())
+    }
+
     pub fn owners(&self, conn: &mut impl Conn) -> QueryResult<Vec<Owner>> {
         use diesel::RunQueryDsl;