fix: Ensure we place songs on the correct yearly playlist based on the year they were liked

Author: notheotherben

src/workflows/spotify_yearly_playlist.rs

@@ -28,18 +28,29 @@ impl Job for SpotifyYearlyPlaylistWorkflow {
         let new_tracks = collector.list(&services).await?;
 
         if !new_tracks.is_empty() {
-            crate::publishers::SpotifyAddToPlaylist::dispatch(
-                crate::publishers::SpotifyAddToPlaylistPayload {
-                    account_id: user.id.clone(),
-                    name: format!("{} Liked Songs", chrono::Utc::now().year()),
-                    description: Some("A yearly playlist of all my liked songs.".to_string()),
-                    access_token: token.clone(),
-                    track_uris: new_tracks.iter().map(|t| t.track.uri.clone()).collect(),
+            let year_groups = new_tracks.iter().fold(
+                std::collections::HashMap::<i32, Vec<&crate::publishers::spotify::SpotifySavedTrack>>::new(),
+                |mut acc, track| {
+                    let year = track.added_at.year();
+                    acc.entry(year).or_default().push(track);
+                    acc
                 },
-                None,
-                &services,
-            )
-            .await?;
+            );
+
+            for (year, tracks) in year_groups {
+                 crate::publishers::SpotifyAddToPlaylist::dispatch(
+                    crate::publishers::SpotifyAddToPlaylistPayload {
+                        account_id: user.id.clone(),
+                        name: format!("{} Liked Songs", year),
+                        description: Some(format!("A yearly playlist of all my liked songs from {}.", year)),
+                        access_token: token.clone(),
+                        track_uris: tracks.iter().map(|t| t.track.uri.clone()).collect(),
+                    },
+                    None,
+                    &services,
+                )
+                .await?;
+            }
         }
 
         Self::dispatch_delayed(token, Some(user.id.into()), TimeDelta::hours(1), &services).await?;