database: Move versions_published_by::insert() call outside of NewVersion::save() fn

This prepares for the "Trusted Publishing" implementation, where there is no associated user account for a release and thus no email address either. Moving the call outside of the transaction is fine since the only production code call is already happening in an outer transaction.

Author: Turbo87

crates/crates_io_database/src/models/version.rs

@@ -8,7 +8,7 @@ use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
 use serde::Deserialize;
 
-use crate::models::{Crate, User, versions_published_by};
+use crate::models::{Crate, User};
 use crate::schema::{readme_renderings, users, versions};
 
 // Queryable has a custom implementation below
@@ -107,11 +107,7 @@ pub struct NewVersion<'a> {
 }
 
 impl NewVersion<'_> {
-    pub async fn save(
-        &self,
-        conn: &mut AsyncPgConnection,
-        published_by_email: &str,
-    ) -> QueryResult<Version> {
+    pub async fn save(&self, conn: &mut AsyncPgConnection) -> QueryResult<Version> {
         use diesel::insert_into;
 
         conn.transaction(|conn| {
@@ -122,8 +118,6 @@ impl NewVersion<'_> {
                     .get_result(conn)
                     .await?;
 
-                versions_published_by::insert(version.id, published_by_email, conn).await?;
-
                 Ok(version)
             }
             .scope_boxed()

src/controllers/krate/publish.rs

@@ -42,6 +42,7 @@ use crate::util::errors::{AppResult, BoxedAppError, bad_request, custom, interna
 use crate::views::{
     EncodableCrate, EncodableCrateDependency, GoodCrate, PublishMetadata, PublishWarnings,
 };
+use crates_io_database::models::versions_published_by;
 use crates_io_diesel_helpers::canon_crate_name;
 
 const MISSING_RIGHTS_ERROR_MESSAGE: &str = "this crate exists but you don't seem to be an owner. \
@@ -432,7 +433,7 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
             .keywords(&keywords)
             .build();
 
-        let version = new_version.save(conn, &verified_email_address).await.map_err(|error| {
+        let version = new_version.save(conn).await.map_err(|error| {
             use diesel::result::{Error, DatabaseErrorKind};
             match error {
                 Error::DatabaseError(DatabaseErrorKind::UniqueViolation, _) =>
@@ -441,6 +442,8 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
             }
         })?;
 
+        versions_published_by::insert(version.id, &verified_email_address, conn).await?;
+
         NewVersionOwnerAction::builder()
             .version_id(version.id)
             .user_id(user.id)

src/tests/builders/version.rs

@@ -3,6 +3,7 @@ use crate::schema::dependencies;
 use std::collections::BTreeMap;
 
 use chrono::{DateTime, Utc};
+use crates_io_database::models::versions_published_by;
 use diesel::prelude::*;
 use diesel_async::{AsyncPgConnection, RunQueryDsl};
 
@@ -110,7 +111,8 @@ impl VersionBuilder {
             .maybe_created_at(self.created_at.as_ref())
             .build();
 
-        let vers = new_version.save(connection, "[email protected]").await?;
+        let vers = new_version.save(connection).await?;
+        versions_published_by::insert(vers.id, "[email protected]", connection).await?;
 
         let new_deps = self
             .dependencies

src/worker/jobs/downloads/update_metadata.rs

@@ -107,6 +107,7 @@ mod tests {
     use super::*;
     use crate::models::{Crate, NewCrate, NewUser, NewVersion, User, Version};
     use crate::schema::{crate_downloads, crates, versions};
+    use crates_io_database::models::versions_published_by;
     use crates_io_test_db::TestDatabase;
     use diesel::sql_types::Timestamptz;
     use diesel_async::AsyncConnection;
@@ -136,7 +137,12 @@ mod tests {
             .checksum("0000000000000000000000000000000000000000000000000000000000000000")
             .build();
 
-        let version = version.save(conn, "[email protected]").await.unwrap();
+        let version = version.save(conn).await.unwrap();
+
+        versions_published_by::insert(version.id, "[email protected]", conn)
+            .await
+            .unwrap();
+
         (krate, version)
     }