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

src/network/sonarr_network.rs

@@ -87,7 +87,7 @@ pub enum SonarrEvent {
   TestIndexer(i64),
   TestAllIndexers,
   ToggleSeasonMonitoring((i64, i64)),
-  ToggleEpisodeMonitoring(Option<i64>),
+  ToggleEpisodeMonitoring(i64),
   TriggerAutomaticEpisodeSearch(Option<i64>),
   TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
   TriggerAutomaticSeriesSearch(Option<i64>),
@@ -2131,11 +2131,11 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn toggle_sonarr_episode_monitoring(&mut self, episode_id: Option<i64>) -> Result<()> {
+  async fn toggle_sonarr_episode_monitoring(&mut self, episode_id: i64) -> Result<()> {
     let event = SonarrEvent::ToggleEpisodeMonitoring(episode_id);
     let detail_event = SonarrEvent::GetEpisodeDetails(0);
 
-    let (id, monitored) = if let Some(episode_id) = episode_id {
+    let monitored = {
       info!("Fetching episode details for episode id: {episode_id}");
       let request_props = self
         .request_props_from(
@@ -2159,24 +2159,13 @@ impl<'a, 'b> Network<'a, 'b> {
         })
         .await?;
 
-      (episode_id, monitored)
-    } else {
-      let app = self.app.lock().await;
-      let current_selection = app
-        .data
-        .sonarr_data
-        .season_details_modal
-        .as_ref()
-        .unwrap()
-        .episodes
-        .current_selection();
-      (current_selection.id, current_selection.monitored)
+      monitored
     };
 
-    info!("Toggling monitoring for episode id: {id}");
+    info!("Toggling monitoring for episode id: {episode_id}");
 
     let body = MonitorEpisodeBody {
-      episode_ids: vec![id],
+      episode_ids: vec![episode_id],
       monitored: !monitored,
     };
 

src/network/sonarr_network_tests.rs

@@ -289,7 +289,7 @@ mod test {
   #[case(SonarrEvent::SearchNewSeries(String::new()), "/series/lookup")]
   #[case(SonarrEvent::TestIndexer(0), "/indexer/test")]
   #[case(SonarrEvent::TestAllIndexers, "/indexer/testall")]
-  #[case(SonarrEvent::ToggleEpisodeMonitoring(None), "/episode/monitor")]
+  #[case(SonarrEvent::ToggleEpisodeMonitoring(0), "/episode/monitor")]
   fn test_resource(#[case] event: SonarrEvent, #[case] expected_uri: String) {
     assert_str_eq!(event.resource(), expected_uri);
   }
@@ -5036,39 +5036,6 @@ mod test {
 
   #[tokio::test]
   async fn test_handle_toggle_episode_monitoring_event() {
-    let expected_body = MonitorEpisodeBody {
-      episode_ids: vec![1],
-      monitored: false,
-    };
-
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Put,
-      Some(json!(expected_body)),
-      None,
-      None,
-      SonarrEvent::ToggleEpisodeMonitoring(None),
-      None,
-      None,
-    )
-    .await;
-    {
-      let mut app = app_arc.lock().await;
-      let mut season_details_modal = SeasonDetailsModal::default();
-      season_details_modal.episodes.set_items(vec![episode()]);
-      app.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleEpisodeMonitoring(None))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_toggle_episode_monitoring_event_uses_provided_episode_id() {
     let expected_body = MonitorEpisodeBody {
       episode_ids: vec![2],
       monitored: false,
@@ -5090,7 +5057,7 @@ mod test {
         "PUT",
         format!(
           "/api/v3{}",
-          SonarrEvent::ToggleEpisodeMonitoring(None).resource()
+          SonarrEvent::ToggleEpisodeMonitoring(2).resource()
         )
         .as_str(),
       )
@@ -5099,16 +5066,10 @@ mod test {
       .match_body(Matcher::Json(json!(expected_body)))
       .create_async()
       .await;
-    {
-      let mut app = app_arc.lock().await;
-      let mut season_details_modal = SeasonDetailsModal::default();
-      season_details_modal.episodes.set_items(vec![episode()]);
-      app.data.sonarr_data.season_details_modal = Some(season_details_modal);
-    }
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleEpisodeMonitoring(Some(2)))
+      .handle_sonarr_event(SonarrEvent::ToggleEpisodeMonitoring(2))
       .await
       .is_ok());