controllers/krate/publish: Expose the default_version field

Author: eth3lbert

src/controllers/krate/publish.rs

@@ -392,6 +392,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
                 .first(conn)
                 .optional()?;
 
+            let mut default_version = None;
             // Upsert the `default_value` determined by the existing `default_value` and the
             // published version. Note that this could potentially write an outdated version
             // (although this should not happen regularly), as we might be comparing to an
@@ -412,6 +413,8 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
                         .filter(default_versions::crate_id.eq(krate.id))
                         .set(default_versions::version_id.eq(version.id))
                         .execute(conn)?;
+                } else {
+                    default_version = Some(existing_default_version.num.to_string());
                 }
 
                 // Update the default version asynchronously in a background job
@@ -507,7 +510,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             Ok(Json(GoodCrate {
                 krate: EncodableCrate::from_minimal(
                     krate,
-                    None,
+                    default_version.or(Some(version_string)).as_deref(),
                     Some(&top_versions),
                     None,
                     false,

src/tests/krate/publish/basics.rs

@@ -112,6 +112,37 @@ async fn new_krate_twice() {
     "###);
 }
 
+// This is similar to the `new_krate_twice` case, but the versions are published in reverse order.
+// The primary purpose is to verify that the `default_version` we provide is as expected.
+#[tokio::test(flavor = "multi_thread")]
+async fn new_krate_twice_alt() {
+    let (app, _, _, token) = TestApp::full().with_token();
+
+    let crate_to_publish =
+        PublishBuilder::new("foo_twice", "2.0.0").description("2.0.0 description");
+    token.publish_crate(crate_to_publish).await.good();
+
+    let crate_to_publish = PublishBuilder::new("foo_twice", "0.99.0");
+    let response = token.publish_crate(crate_to_publish).await;
+    assert_eq!(response.status(), StatusCode::OK);
+    assert_json_snapshot!(response.json(), {
+        ".crate.created_at" => "[datetime]",
+        ".crate.updated_at" => "[datetime]",
+    });
+
+    let crates = app.crates_from_index_head("foo_twice");
+    assert_json_snapshot!(crates);
+
+    assert_snapshot!(app.stored_files().await.join("\n"), @r###"
+    crates/foo_twice/foo_twice-0.99.0.crate
+    crates/foo_twice/foo_twice-2.0.0.crate
+    index/fo/o_/foo_twice
+    rss/crates.xml
+    rss/crates/foo_twice.xml
+    rss/updates.xml
+    "###);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn new_krate_duplicate_version() {
     let (app, _, user, token) = TestApp::full().with_token();

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "1.0.0",
     "description": "description",
     "documentation": null,
     "downloads": 0,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "2.0.0",
     "description": "2.0.0 description",
     "documentation": null,
     "downloads": 0,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt-2.snap

@@ -0,0 +1,22 @@
+---
+source: src/tests/krate/publish/basics.rs
+expression: crates
+---
+[
+  {
+    "name": "foo_twice",
+    "vers": "2.0.0",
+    "deps": [],
+    "cksum": "d6e88a7d30b9e5c3d268ede9a9937b62815e45a06fd2c572d602e0705ab6513d",
+    "features": {},
+    "yanked": false
+  },
+  {
+    "name": "foo_twice",
+    "vers": "0.99.0",
+    "deps": [],
+    "cksum": "45b0b19cd0280034e07820789d9bb6e4016526eba85c75fc697d49ec99fd2550",
+    "features": {},
+    "yanked": false
+  }
+]

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_twice_alt.snap

@@ -0,0 +1,40 @@
+---
+source: src/tests/krate/publish/basics.rs
+expression: response.json()
+---
+{
+  "crate": {
+    "badges": null,
+    "categories": null,
+    "created_at": "[datetime]",
+    "default_version": "2.0.0",
+    "description": "description",
+    "documentation": null,
+    "downloads": 0,
+    "exact_match": false,
+    "homepage": null,
+    "id": "foo_twice",
+    "keywords": null,
+    "links": {
+      "owner_team": "/api/v1/crates/foo_twice/owner_team",
+      "owner_user": "/api/v1/crates/foo_twice/owner_user",
+      "owners": "/api/v1/crates/foo_twice/owners",
+      "reverse_dependencies": "/api/v1/crates/foo_twice/reverse_dependencies",
+      "version_downloads": "/api/v1/crates/foo_twice/downloads",
+      "versions": "/api/v1/crates/foo_twice/versions"
+    },
+    "max_stable_version": "2.0.0",
+    "max_version": "2.0.0",
+    "name": "foo_twice",
+    "newest_version": "0.99.0",
+    "recent_downloads": null,
+    "repository": null,
+    "updated_at": "[datetime]",
+    "versions": null
+  },
+  "warnings": {
+    "invalid_badges": [],
+    "invalid_categories": [],
+    "other": []
+  }
+}

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_weird_version.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "0.0.0-pre",
     "description": "description",
     "documentation": null,
     "downloads": 0,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__basics__new_krate_with_token.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "1.0.0",
     "description": "description",
     "documentation": null,
     "downloads": 0,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__build_metadata__version_with_build_metadata@build_metadata_1.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "1.0.0+foo",
     "description": "description",
     "documentation": null,
     "downloads": 0,

src/tests/krate/publish/snapshots/crates_io__tests__krate__publish__build_metadata__version_with_build_metadata@build_metadata_2.snap

@@ -7,6 +7,7 @@ expression: response.json()
     "badges": null,
     "categories": null,
     "created_at": "[datetime]",
+    "default_version": "1.0.0-beta.1",
     "description": "description",
     "documentation": null,
     "downloads": 0,