models/keyword: Simplify update_crate() argument

This allows us to use this function even if we only have an id and not a full `Crate` instance.

Author: Turbo87

src/controllers/krate/publish.rs

@@ -427,7 +427,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             }
 
             // Update all keywords for this crate
-            Keyword::update_crate(conn, &krate, &keywords)?;
+            Keyword::update_crate(conn, krate.id, &keywords)?;
 
             // Update all categories for this crate, collecting any invalid categories
             // in order to be able to return an error to the user.

src/models/keyword.rs

@@ -61,20 +61,26 @@ impl Keyword {
             && chars.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-' || c == '+')
     }
 
-    pub fn update_crate(conn: &mut impl Conn, krate: &Crate, keywords: &[&str]) -> QueryResult<()> {
+    pub fn update_crate(conn: &mut impl Conn, crate_id: i32, keywords: &[&str]) -> QueryResult<()> {
         conn.transaction(|conn| {
             let keywords = Keyword::find_or_create_all(conn, keywords)?;
-            diesel::delete(CrateKeyword::belonging_to(krate)).execute(conn)?;
+
+            diesel::delete(crates_keywords::table)
+                .filter(crates_keywords::crate_id.eq(crate_id))
+                .execute(conn)?;
+
             let crate_keywords = keywords
                 .into_iter()
                 .map(|kw| CrateKeyword {
-                    crate_id: krate.id,
+                    crate_id,
                     keyword_id: kw.id,
                 })
                 .collect::<Vec<_>>();
+
             diesel::insert_into(crates_keywords::table)
                 .values(&crate_keywords)
                 .execute(conn)?;
+
             Ok(())
         })
     }

src/tests/builders/krate.rs

@@ -160,7 +160,7 @@ impl<'a> CrateBuilder<'a> {
         }
 
         if !self.keywords.is_empty() {
-            Keyword::update_crate(connection, &krate, &self.keywords)?;
+            Keyword::update_crate(connection, krate.id, &self.keywords)?;
         }
 
         if let Some(updated_at) = self.updated_at {

src/tests/routes/keywords/read.rs

@@ -50,27 +50,27 @@ async fn update_crate() {
     Keyword::find_or_create_all(&mut conn, &["kw1", "kw2"]).unwrap();
     let krate = CrateBuilder::new("fookey", user.id).expect_build(&mut conn);
 
-    Keyword::update_crate(&mut conn, &krate, &[]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &[]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 0);
     assert_eq!(cnt("kw2", &anon).await, 0);
 
-    Keyword::update_crate(&mut conn, &krate, &["kw1"]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &["kw1"]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 1);
     assert_eq!(cnt("kw2", &anon).await, 0);
 
-    Keyword::update_crate(&mut conn, &krate, &["kw2"]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &["kw2"]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 0);
     assert_eq!(cnt("kw2", &anon).await, 1);
 
-    Keyword::update_crate(&mut conn, &krate, &[]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &[]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 0);
     assert_eq!(cnt("kw2", &anon).await, 0);
 
-    Keyword::update_crate(&mut conn, &krate, &["kw1", "kw2"]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &["kw1", "kw2"]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 1);
     assert_eq!(cnt("kw2", &anon).await, 1);
 
-    Keyword::update_crate(&mut conn, &krate, &[]).unwrap();
+    Keyword::update_crate(&mut conn, krate.id, &[]).unwrap();
     assert_eq!(cnt("kw1", &anon).await, 0);
     assert_eq!(cnt("kw2", &anon).await, 0);
 }