Add description to crate admin list

Author: carols10cents

src/controllers/admin.rs

@@ -42,18 +42,20 @@ pub async fn list(
         .first::<(User, Option<bool>, Option<String>)>(&mut conn)
         .await?;
 
-    let crates: Vec<(i32, String, DateTime<Utc>, i64)> = CrateOwner::by_owner_kind(OwnerKind::User)
-        .inner_join(crates::table)
-        .filter(crate_owners::owner_id.eq(user.id))
-        .select((
-            crates::id,
-            crates::name,
-            crates::updated_at,
-            rev_deps_subquery(),
-        ))
-        .order(crates::name.asc())
-        .load(&mut conn)
-        .await?;
+    let crates: Vec<(i32, String, Option<String>, DateTime<Utc>, i64)> =
+        CrateOwner::by_owner_kind(OwnerKind::User)
+            .inner_join(crates::table)
+            .filter(crate_owners::owner_id.eq(user.id))
+            .select((
+                crates::id,
+                crates::name,
+                crates::description,
+                crates::updated_at,
+                rev_deps_subquery(),
+            ))
+            .order(crates::name.asc())
+            .load(&mut conn)
+            .await?;
 
     let crate_ids: Vec<_> = crates.iter().map(|(id, ..)| id).collect();
 
@@ -71,11 +73,12 @@ pub async fn list(
     let verified = verified.unwrap_or(false);
     let crates = crates
         .into_iter()
-        .map(|(crate_id, name, updated_at, num_rev_deps)| {
+        .map(|(crate_id, name, description, updated_at, num_rev_deps)| {
             let versions = versions_by_crate_id.get(&crate_id);
             let last_version = versions.and_then(|v| v.last());
             AdminCrateInfo {
                 name,
+                description,
                 updated_at,
                 num_rev_deps,
                 num_versions: versions.map(|v| v.len()).unwrap_or(0),
@@ -101,6 +104,7 @@ pub struct AdminListResponse {
 #[derive(Debug, Serialize)]
 pub struct AdminCrateInfo {
     pub name: String,
+    pub description: Option<String>,
     pub updated_at: DateTime<Utc>,
     pub num_rev_deps: i64,
     pub num_versions: usize,

src/tests/mod.rs

@@ -92,6 +92,7 @@ pub struct AdminListResponse {
 #[derive(Deserialize)]
 pub struct AdminCrateInfo {
     name: String,
+    description: Option<String>,
     num_versions: usize,
     num_rev_deps: i64,
 }

src/tests/routes/crates/admin.rs

@@ -43,6 +43,7 @@ async fn index_include_yanked() -> anyhow::Result<()> {
         .unwrap();
 
     let crate_1 = CrateBuilder::new("unyanked", user.id)
+        .description("My Fun Crate")
         .version(VersionBuilder::new("0.1.0").yanked(true))
         .version(VersionBuilder::new("1.0.0"))
         .version(VersionBuilder::new("2.0.0"))
@@ -67,13 +68,17 @@ async fn index_include_yanked() -> anyhow::Result<()> {
     assert_eq!(json.user_email.unwrap(), "foo@example.com");
     assert_eq!(json.crates.len(), 2);
 
-    assert_eq!(json.crates[0].name, "all_yanked");
-    assert_eq!(json.crates[0].num_versions, 2);
-    assert_eq!(json.crates[0].num_rev_deps, 0);
+    let json_crate_0 = &json.crates[0];
+    assert_eq!(json_crate_0.name, "all_yanked");
+    assert!(json_crate_0.description.is_none());
+    assert_eq!(json_crate_0.num_versions, 2);
+    assert_eq!(json_crate_0.num_rev_deps, 0);
 
-    assert_eq!(json.crates[1].name, "unyanked");
-    assert_eq!(json.crates[1].num_versions, 3);
-    assert_eq!(json.crates[1].num_rev_deps, 1);
+    let json_crate_1 = &json.crates[1];
+    assert_eq!(json_crate_1.name, "unyanked");
+    assert_eq!(json_crate_1.description.as_ref().unwrap(), "My Fun Crate");
+    assert_eq!(json_crate_1.num_versions, 3);
+    assert_eq!(json_crate_1.num_rev_deps, 1);
 
     Ok(())
 }