move deletion to single versions

Author: Marco Napetti

src/controllers/krate.rs

@@ -1,4 +1,3 @@
-pub mod delete;
 pub mod downloads;
 pub mod follow;
 pub mod metadata;

src/controllers/krate/delete.rs

@@ -1,3 +1,4 @@
+pub mod delete;
 pub mod deprecated;
 pub mod downloads;
 pub mod metadata;

src/controllers/version.rs

@@ -0,0 +1,69 @@
+//! Functionality related to deleting a crate.
+
+use std::sync::Arc;
+
+use chrono::{Duration, Utc};
+use diesel::dsl::count_star;
+
+use crate::controllers::cargo_prelude::*;
+
+use crate::schema::*;
+use crate::util::errors::internal;
+use crate::views::{EncodableCrate, GoodCrate, PublishWarnings};
+
+use super::{extract_crate_name_and_semver, version_and_crate};
+
+/// Handles the `DELETE /crates/:crate_id/:version` route.
+///
+/// Actually deletion is allowed only in the first 24 hours from creation
+pub fn delete(req: &mut dyn RequestExt) -> EndpointResult {
+    let app = Arc::clone(req.app());
+    let (crate_name, semver) = extract_crate_name_and_semver(req)?;
+    let conn = req.db_read()?;
+    let (version, krate) = version_and_crate(&conn, crate_name, semver)?;
+
+    if Utc::now()
+        .naive_utc()
+        .signed_duration_since(version.created_at)
+        > Duration::hours(24)
+    {
+        return Err(cargo_err(
+            "Version deletion is allowed only in the first 24 hours from creation",
+        ));
+    }
+
+    // Create a transaction on the database, if there are no errors,
+    // commit the transactions to delete the version.
+    // If there are no remaining versions, delete the crate
+    conn.transaction(|| {
+        diesel::delete(versions::table.find(version.id)).execute(&*conn)?;
+
+        let top_versions = krate.top_versions(&conn)?;
+
+        // we can't check top_versions to know if there aren't remaining versions
+        // because it excludes yanked versions
+        let remaining: i64 = versions::table
+            .filter(versions::crate_id.eq(krate.id))
+            .select(count_star())
+            .first(&*conn)
+            .optional()?
+            .unwrap_or_default();
+        if remaining <= 0 {
+            diesel::delete(crates::table.find(krate.id)).execute(&*conn)?;
+
+            let uploader = app.config.uploader();
+            uploader
+                .delete_index(app.http_client(), &krate.name)
+                .map_err(|e| internal(&format_args!("failed to delete crate: {}", e)))?;
+        }
+
+        Ok(req.json(&GoodCrate {
+            krate: EncodableCrate::from_minimal(krate, Some(&top_versions), None, true, None),
+            warnings: PublishWarnings {
+                invalid_categories: vec![],
+                invalid_badges: vec![],
+                other: vec![],
+            },
+        }))
+    })
+}

src/controllers/version/delete.rs

@@ -27,6 +27,10 @@ pub fn build_router(app: &App) -> RouteBuilder {
         "/api/v1/crates/:crate_id/owners",
         C(krate::owners::remove_owners),
     );
+    router.delete(
+        "/api/v1/crates/:crate_id/:version",
+        C(version::delete::delete),
+    );
     router.delete(
         "/api/v1/crates/:crate_id/:version/yank",
         C(version::yank::yank),
@@ -98,7 +102,6 @@ pub fn build_router(app: &App) -> RouteBuilder {
         "/api/v1/crates/:crate_id/reverse_dependencies",
         C(krate::metadata::reverse_dependencies),
     );
-    router.delete("/api/v1/crates/:crate_id", C(krate::delete::delete));
     router.get("/api/v1/keywords", C(keyword::index));
     router.get("/api/v1/keywords/:keyword_id", C(keyword::show));
     router.get("/api/v1/categories", C(category::index));