fix(sonarr): Pass the series ID alongside all GetSeriesHistory events when publishing to the networking channel

src/app/sonarr/mod.rs

@@ -38,7 +38,9 @@ impl<'a> App<'a> {
       }
       ActiveSonarrBlock::SeriesHistory => {
         self
-          .dispatch_network_event(SonarrEvent::GetSeriesHistory(None).into())
+          .dispatch_network_event(
+            SonarrEvent::GetSeriesHistory(self.extract_series_id().await).into(),
+          )
           .await;
       }
       ActiveSonarrBlock::SeasonDetails => {

src/app/sonarr/sonarr_tests.rs

@@ -42,6 +42,10 @@ mod tests {
     #[tokio::test]
     async fn test_dispatch_by_series_history_block() {
       let (mut app, mut sync_network_rx) = construct_app_unit();
+      app.data.sonarr_data.series.set_items(vec![Series {
+        id: 1,
+        ..Series::default()
+      }]);
 
       app
         .dispatch_by_sonarr_block(&ActiveSonarrBlock::SeriesHistory)
@@ -50,7 +54,7 @@ mod tests {
       assert!(app.is_loading);
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        SonarrEvent::GetSeriesHistory(None).into()
+        SonarrEvent::GetSeriesHistory(1).into()
       );
       assert!(!app.data.sonarr_data.prompt_confirm);
       assert_eq!(app.tick_count, 0);

src/cli/sonarr/list_command_handler.rs

@@ -260,7 +260,7 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrListCommand> for SonarrListCommandH
       SonarrListCommand::SeriesHistory { series_id } => {
         let resp = self
           .network
-          .handle_network_event(SonarrEvent::GetSeriesHistory(Some(series_id)).into())
+          .handle_network_event(SonarrEvent::GetSeriesHistory(series_id).into())
           .await?;
         serde_json::to_string_pretty(&resp)?
       }

src/cli/sonarr/list_command_handler_tests.rs

@@ -435,7 +435,7 @@ mod tests {
       mock_network
         .expect_handle_network_event()
         .with(eq::<NetworkEvent>(
-          SonarrEvent::GetSeriesHistory(Some(expected_series_id)).into(),
+          SonarrEvent::GetSeriesHistory(expected_series_id).into(),
         ))
         .times(1)
         .returning(|_| {

src/network/sonarr_network.rs

@@ -74,7 +74,7 @@ pub enum SonarrEvent {
   GetSeasonReleases((i64, i64)),
   GetSecurityConfig,
   GetSeriesDetails(i64),
-  GetSeriesHistory(Option<i64>),
+  GetSeriesHistory(i64),
   GetStatus,
   GetUpdates,
   GetTags,
@@ -1783,12 +1783,8 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn get_sonarr_series_history(
+  async fn get_sonarr_series_history(&mut self, series_id: i64) -> Result<Vec<SonarrHistoryItem>> {
-    &mut self,
+    info!("Fetching Sonarr series history for series with ID: {series_id}");
-    series_id: Option<i64>,
-  ) -> Result<Vec<SonarrHistoryItem>> {
-    let (id, series_id_param) = self.extract_series_id(series_id).await;
-    info!("Fetching Sonarr series history for series with ID: {id}");
     let event = SonarrEvent::GetSeriesHistory(series_id);
 
     let request_props = self
@@ -1797,7 +1793,7 @@ impl<'a, 'b> Network<'a, 'b> {
         RequestMethod::Get,
         None::<()>,
         None,
-        Some(series_id_param),
+        Some(format!("seriesId={series_id}")),
       )
       .await;
 

src/network/sonarr_network_tests.rs

@@ -227,7 +227,7 @@ mod test {
   #[rstest]
   fn test_resource_series_history(
     #[values(
-      SonarrEvent::GetSeriesHistory(None),
+      SonarrEvent::GetSeriesHistory(0),
       SonarrEvent::GetSeasonHistory((0, 0))
     )]
     event: SonarrEvent,
@@ -4040,7 +4040,7 @@ mod test {
       None,
       Some(history_json),
       None,
-      SonarrEvent::GetSeriesHistory(None),
+      SonarrEvent::GetSeriesHistory(1),
       None,
       Some("seriesId=1"),
     )
@@ -4075,113 +4075,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(None))
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert!(app_arc
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .series_history
-        .is_some());
-      assert_eq!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .items,
-        expected_history_items
-      );
-      assert!(
-        app_arc
-          .lock()
-          .await
-          .data
-          .sonarr_data
-          .series_history
-          .as_ref()
-          .unwrap()
-          .sort_asc
-      );
-      assert_eq!(history_items, response);
-    }
-  }
-
-  #[tokio::test]
-  async fn test_handle_get_sonarr_series_history_event_uses_provided_series_id() {
-    let history_json = json!([{
-      "id": 123,
-      "sourceTitle": "z episode",
-      "episodeId": 1007,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    },
-    {
-      "id": 456,
-      "sourceTitle": "A Episode",
-      "episodeId": 2001,
-      "quality": { "quality": { "name": "Bluray-1080p" } },
-      "languages": [{ "id": 1, "name": "English" }],
-      "date": "2024-02-10T07:28:45Z",
-      "eventType": "grabbed",
-      "data": {
-        "droppedPath": "/nfs/nzbget/completed/series/Coolness/something.cool.mkv",
-        "importedPath": "/nfs/tv/Coolness/Season 1/Coolness - S01E01 - Something Cool Bluray-1080p.mkv"
-      }
-    }]);
-    let response: Vec<SonarrHistoryItem> = serde_json::from_value(history_json.clone()).unwrap();
-    let expected_history_items = vec![
-      SonarrHistoryItem {
-        id: 123,
-        episode_id: 1007,
-        source_title: "z episode".into(),
-        ..history_item()
-      },
-      SonarrHistoryItem {
-        id: 456,
-        episode_id: 2001,
-        source_title: "A Episode".into(),
-        ..history_item()
-      },
-    ];
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(history_json),
-      None,
-      SonarrEvent::GetSeriesHistory(Some(2)),
-      None,
-      Some("seriesId=2"),
-    )
-    .await;
-    app_arc.lock().await.data.sonarr_data.series_history = Some(StatefulTable {
-      sort_asc: true,
-      ..StatefulTable::default()
-    });
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .series
-      .set_items(vec![series()]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(Some(2)))
       .await
       .unwrap()
     {
@@ -4268,7 +4162,7 @@ mod test {
       None,
       Some(history_json),
       None,
-      SonarrEvent::GetSeriesHistory(None),
+      SonarrEvent::GetSeriesHistory(1),
       None,
       Some("seriesId=1"),
     )
@@ -4283,7 +4177,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(None))
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
       .await
       .unwrap()
     {
@@ -4356,7 +4250,7 @@ mod test {
       None,
       Some(history_json),
       None,
-      SonarrEvent::GetSeriesHistory(None),
+      SonarrEvent::GetSeriesHistory(1),
       None,
       Some("seriesId=1"),
     )
@@ -4391,7 +4285,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::SonarrHistoryItems(history_items) = network
-      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(None))
+      .handle_sonarr_event(SonarrEvent::GetSeriesHistory(1))
       .await
       .unwrap()
     {