admin/delete_crate: Add --deleted-by CLI option

Author: Turbo87

src/bin/crates-admin/delete_crate.rs

@@ -2,7 +2,7 @@ use crate::dialoguer;
 use anyhow::Context;
 use chrono::{NaiveDateTime, Utc};
 use colored::Colorize;
-use crates_io::models::NewDeletedCrate;
+use crates_io::models::{NewDeletedCrate, User};
 use crates_io::schema::{crate_downloads, deleted_crates};
 use crates_io::worker::jobs;
 use crates_io::{db, schema::crates};
@@ -29,6 +29,10 @@ pub struct Opts {
     /// Don't ask for confirmation: yes, we are sure. Best for scripting.
     #[arg(short, long)]
     yes: bool,
+
+    /// Your GitHub username.
+    #[arg(long)]
+    deleted_by: Option<String>,
 }
 
 pub async fn run(opts: Opts) -> anyhow::Result<()> {
@@ -63,6 +67,8 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
         return Ok(());
     }
 
+    let deleted_by = get_deleted_by(&mut conn, opts.deleted_by.as_deref()).await?;
+
     let now = Utc::now();
 
     for name in &crate_names {
@@ -73,6 +79,7 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
             let deleted_crate = NewDeletedCrate::builder(name)
                 .created_at(&created_at)
                 .deleted_at(&now)
+                .maybe_deleted_by(deleted_by)
                 .available_at(&now)
                 .build();
 
@@ -109,6 +116,18 @@ pub async fn run(opts: Opts) -> anyhow::Result<()> {
     Ok(())
 }
 
+async fn get_deleted_by(
+    conn: &mut AsyncPgConnection,
+    deleted_by: Option<&str>,
+) -> QueryResult<Option<i32>> {
+    let Some(deleted_by) = deleted_by else {
+        return Ok(None);
+    };
+
+    let user = User::async_find_by_login(conn, deleted_by).await?;
+    Ok(Some(user.id))
+}
+
 async fn delete_from_database(
     conn: &mut AsyncPgConnection,
     crate_id: i32,

src/models/user.rs

@@ -51,6 +51,20 @@ impl User {
             .first(conn)
     }
 
+    pub async fn async_find_by_login(
+        conn: &mut AsyncPgConnection,
+        login: &str,
+    ) -> QueryResult<User> {
+        use diesel_async::RunQueryDsl;
+
+        users::table
+            .filter(lower(users::gh_login).eq(login.to_lowercase()))
+            .filter(users::gh_id.ne(-1))
+            .order(users::gh_id.desc())
+            .first(conn)
+            .await
+    }
+
     pub fn owning(krate: &Crate, conn: &mut impl Conn) -> QueryResult<Vec<Owner>> {
         use diesel::RunQueryDsl;