models/action: Extract NewVersionOwnerAction struct

... including `insert()` fn

Author: Turbo87

src/controllers/krate/publish.rs

@@ -24,8 +24,8 @@ use tokio::runtime::Handle;
 use url::Url;
 
 use crate::models::{
-    default_versions::Version as DefaultVersion, insert_version_owner_action, Category, Crate,
-    DependencyKind, Keyword, NewCrate, NewVersion, Rights, VersionAction,
+    default_versions::Version as DefaultVersion, Category, Crate, DependencyKind, Keyword,
+    NewCrate, NewVersion, NewVersionOwnerAction, Rights, VersionAction,
 };
 
 use crate::licenses::parse_license_expr;
@@ -415,13 +415,13 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
                 }
             })?;
 
-            insert_version_owner_action(
-                conn,
-                version.id,
-                user.id,
-                api_token_id,
-                VersionAction::Publish,
-            )?;
+            NewVersionOwnerAction::builder()
+                .version_id(version.id)
+                .user_id(user.id)
+                .maybe_api_token_id(api_token_id)
+                .action(VersionAction::Publish)
+                .build()
+                .insert(conn)?;
 
             // Link this new version to all dependencies
             add_dependencies(conn, &deps, version.id)?;

src/controllers/version/metadata.rs

@@ -21,8 +21,7 @@ use crate::app::AppState;
 use crate::auth::{AuthCheck, Authentication};
 use crate::models::token::EndpointScope;
 use crate::models::{
-    insert_version_owner_action, Crate, Dependency, Rights, Version, VersionAction,
-    VersionOwnerAction,
+    Crate, Dependency, NewVersionOwnerAction, Rights, Version, VersionAction, VersionOwnerAction,
 };
 use crate::rate_limiter::LimitedAction;
 use crate::schema::versions;
@@ -247,7 +246,13 @@ pub fn perform_version_yank_update(
     } else {
         VersionAction::Unyank
     };
-    insert_version_owner_action(conn, version.id, user.id, api_token_id, action)?;
+    NewVersionOwnerAction::builder()
+        .version_id(version.id)
+        .user_id(user.id)
+        .maybe_api_token_id(api_token_id)
+        .action(action)
+        .build()
+        .insert(conn)?;
 
     SyncToGitIndex::new(&krate.name).enqueue(conn)?;
     SyncToSparseIndex::new(&krate.name).enqueue(conn)?;

src/models.rs

@@ -1,4 +1,4 @@
-pub use self::action::{insert_version_owner_action, VersionAction, VersionOwnerAction};
+pub use self::action::{NewVersionOwnerAction, VersionAction, VersionOwnerAction};
 pub use self::category::{Category, CrateCategory, NewCategory};
 pub use self::crate_owner_invitation::{CrateOwnerInvitation, NewCrateOwnerInvitationOutcome};
 pub use self::default_versions::{update_default_version, verify_default_version};

src/models/action.rs

@@ -3,6 +3,7 @@ use crate::schema::*;
 use crate::sql::pg_enum;
 use crate::util::diesel::prelude::*;
 use crate::util::diesel::Conn;
+use bon::Builder;
 use chrono::NaiveDateTime;
 use diesel_async::AsyncPgConnection;
 
@@ -95,22 +96,22 @@ impl VersionOwnerAction {
     }
 }
 
-pub fn insert_version_owner_action(
-    conn: &mut impl Conn,
-    version_id_: i32,
-    user_id_: i32,
-    api_token_id_: Option<i32>,
-    action_: VersionAction,
-) -> QueryResult<VersionOwnerAction> {
-    use diesel::RunQueryDsl;
-    use version_owner_actions::dsl::{action, api_token_id, user_id, version_id};
-
-    diesel::insert_into(version_owner_actions::table)
-        .values((
-            version_id.eq(version_id_),
-            user_id.eq(user_id_),
-            api_token_id.eq(api_token_id_),
-            action.eq(action_),
-        ))
-        .get_result(conn)
+#[derive(Insertable, Debug, Builder)]
+#[diesel(table_name = version_owner_actions, check_for_backend(diesel::pg::Pg))]
+pub struct NewVersionOwnerAction {
+    version_id: i32,
+    user_id: i32,
+    api_token_id: Option<i32>,
+    #[builder(into)]
+    action: VersionAction,
+}
+
+impl NewVersionOwnerAction {
+    pub fn insert(&self, conn: &mut impl Conn) -> QueryResult<VersionOwnerAction> {
+        use diesel::RunQueryDsl;
+
+        diesel::insert_into(version_owner_actions::table)
+            .values(self)
+            .get_result(conn)
+    }
 }