Used crate ID for SyncCrateFeed

Author: YohDeadfall

src/controllers/krate/publish.rs

@@ -614,7 +614,7 @@ pub async fn publish(app: AppState, req: Parts, body: Body) -> AppResult<Json<Go
         let git_index_job = jobs::SyncToGitIndex::new(&krate.name);
         let sparse_index_job = jobs::SyncToSparseIndex::new(&krate.name);
         let publish_notifications_job = SendPublishNotificationsJob::new(version.id);
-        let crate_feed_job = jobs::rss::SyncCrateFeed::new(krate.name.clone());
+        let crate_feed_job = jobs::rss::SyncCrateFeed::new(krate.id, krate.name.clone());
         let updates_feed_job = jobs::rss::SyncUpdatesFeed;
 
         tokio::try_join!(

src/worker/jobs/rss/sync_crate_feed.rs

@@ -22,12 +22,16 @@ const NUM_ITEMS: i64 = 10;
 
 #[derive(Serialize, Deserialize)]
 pub struct SyncCrateFeed {
+    crate_id: Option<i32>,
     name: String,
 }
 
 impl SyncCrateFeed {
-    pub fn new(name: String) -> Self {
-        Self { name }
+    pub fn new(crate_id: i32, name: String) -> Self {
+        Self {
+            crate_id: Some(crate_id),
+            name,
+        }
     }
 }
 
@@ -43,8 +47,13 @@ impl BackgroundJob for SyncCrateFeed {
 
         info!("Loading latest {NUM_ITEMS} version updates for `{name}` from the database…");
         let mut conn = ctx.deadpool.get().await?;
+        let crate_id = if let Some(crate_id) = self.crate_id {
+            crate_id
+        } else {
+            load_crate_id(name, &mut conn).await?
+        };
 
-        let version_updates = load_version_updates(name, &mut conn).await?;
+        let version_updates = load_version_updates(crate_id, &mut conn).await?;
 
         let feed_id = FeedId::Crate { name };
 
@@ -89,21 +98,28 @@ impl BackgroundJob for SyncCrateFeed {
     }
 }
 
+async fn load_crate_id(name: &str, conn: &mut AsyncPgConnection) -> QueryResult<i32> {
+    crates::table
+        .filter(crates::name.eq(name))
+        .select(crates::id)
+        .first::<i32>(conn)
+        .await
+}
+
 /// Load the latest versions from the database.
 ///
 /// This function will load all versions from the database that are younger
 /// than [`ALWAYS_INCLUDE_AGE`]. If there are less than [`NUM_ITEMS`] versions
 /// then the list will be padded with older versions until [`NUM_ITEMS`] are
 /// returned.
 async fn load_version_updates(
-    name: &str,
+    crate_id: i32,
     conn: &mut AsyncPgConnection,
 ) -> QueryResult<Vec<VersionUpdate>> {
     let threshold_dt = chrono::Utc::now().naive_utc() - ALWAYS_INCLUDE_AGE;
 
     let updates = versions::table
-        .inner_join(crates::table)
-        .filter(crates::name.eq(name))
+        .filter(versions::crate_id.eq(crate_id))
         .filter(versions::created_at.gt(threshold_dt))
         .order(versions::created_at.desc())
         .select(VersionUpdate::as_select())
@@ -116,8 +132,7 @@ async fn load_version_updates(
     }
 
     versions::table
-        .inner_join(crates::table)
-        .filter(crates::name.eq(name))
+        .filter(versions::crate_id.eq(crate_id))
         .order(versions::created_at.desc())
         .select(VersionUpdate::as_select())
         .limit(NUM_ITEMS)