fix(sonarr): Construct and pass delete series params alongside all DeleteSeries events when publishing to the networking channel

src/handlers/sonarr_handlers/library/delete_series_handler.rs

@@ -1,9 +1,10 @@
+use crate::models::sonarr_models::DeleteSeriesParams;
+use crate::network::sonarr_network::SonarrEvent;
 use crate::{
   app::{key_binding::DEFAULT_KEYBINDINGS, App},
   event::Key,
   handlers::{handle_prompt_toggle, KeyEventHandler},
   models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DELETE_SERIES_BLOCKS},
-  network::sonarr_network::SonarrEvent,
 };
 
 #[cfg(test)]
@@ -17,6 +18,21 @@ pub(super) struct DeleteSeriesHandler<'a, 'b> {
   _context: Option<ActiveSonarrBlock>,
 }
 
+impl<'a, 'b> DeleteSeriesHandler<'a, 'b> {
+  fn build_delete_series_params(&mut self) -> DeleteSeriesParams {
+    let id = self.app.data.sonarr_data.series.current_selection().id;
+    let delete_series_files = self.app.data.sonarr_data.delete_series_files;
+    let add_list_exclusion = self.app.data.sonarr_data.add_list_exclusion;
+    self.app.data.sonarr_data.reset_delete_series_preferences();
+
+    DeleteSeriesParams {
+      id,
+      delete_series_files,
+      add_list_exclusion,
+    }
+  }
+}
+
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<'a, 'b> {
   fn accepts(active_block: ActiveSonarrBlock) -> bool {
     DELETE_SERIES_BLOCKS.contains(&active_block)
@@ -73,7 +89,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<
       match self.app.data.sonarr_data.selected_block.get_active_block() {
         ActiveSonarrBlock::DeleteSeriesConfirmPrompt => {
           if self.app.data.sonarr_data.prompt_confirm {
-            self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::DeleteSeries(None));
+            self.app.data.sonarr_data.prompt_confirm_action =
+              Some(SonarrEvent::DeleteSeries(self.build_delete_series_params()));
             self.app.should_refresh = true;
           } else {
             self.app.data.sonarr_data.reset_delete_series_preferences();
@@ -109,7 +126,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler<
       && self.key == DEFAULT_KEYBINDINGS.confirm.key
     {
       self.app.data.sonarr_data.prompt_confirm = true;
-      self.app.data.sonarr_data.prompt_confirm_action = Some(SonarrEvent::DeleteSeries(None));
+      self.app.data.sonarr_data.prompt_confirm_action =
+        Some(SonarrEvent::DeleteSeries(self.build_delete_series_params()));
       self.app.should_refresh = true;
 
       self.app.pop_navigation_stack();

src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs

@@ -1,13 +1,16 @@
 #[cfg(test)]
 mod tests {
+  use pretty_assertions::assert_eq;
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::sonarr_handlers::library::delete_series_handler::DeleteSeriesHandler;
+  use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::series;
   use crate::handlers::KeyEventHandler;
   use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, DELETE_SERIES_BLOCKS};
+  use crate::models::sonarr_models::DeleteSeriesParams;
 
   mod test_handle_scroll_up_and_down {
     use pretty_assertions::assert_eq;
@@ -132,6 +135,12 @@ mod tests {
       app.data.sonarr_data.prompt_confirm = true;
       app.data.sonarr_data.delete_series_files = true;
       app.data.sonarr_data.add_list_exclusion = true;
+      app.data.sonarr_data.series.set_items(vec![series()]);
+      let expected_delete_series_params = DeleteSeriesParams {
+        id: 1,
+        delete_series_files: true,
+        add_list_exclusion: true,
+      };
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS);
       app
@@ -151,12 +160,12 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
       assert_eq!(
         app.data.sonarr_data.prompt_confirm_action,
-        Some(SonarrEvent::DeleteSeries(None))
+        Some(SonarrEvent::DeleteSeries(expected_delete_series_params))
       );
       assert!(app.should_refresh);
       assert!(app.data.sonarr_data.prompt_confirm);
-      assert!(app.data.sonarr_data.delete_series_files);
-      assert!(app.data.sonarr_data.add_list_exclusion);
+      assert!(!app.data.sonarr_data.delete_series_files);
+      assert!(!app.data.sonarr_data.add_list_exclusion);
     }
 
     #[test]
@@ -222,6 +231,7 @@ mod tests {
 
   mod test_handle_esc {
     use super::*;
+    use pretty_assertions::assert_eq;
     use rstest::rstest;
 
     const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -258,6 +268,7 @@ mod tests {
       },
       network::sonarr_network::SonarrEvent,
     };
+    use pretty_assertions::assert_eq;
 
     use super::*;
 
@@ -268,6 +279,12 @@ mod tests {
       app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into());
       app.data.sonarr_data.delete_series_files = true;
       app.data.sonarr_data.add_list_exclusion = true;
+      app.data.sonarr_data.series.set_items(vec![series()]);
+      let expected_delete_series_params = DeleteSeriesParams {
+        id: 1,
+        delete_series_files: true,
+        add_list_exclusion: true,
+      };
       app.data.sonarr_data.selected_block =
         BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS);
       app
@@ -287,12 +304,12 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into());
       assert_eq!(
         app.data.sonarr_data.prompt_confirm_action,
-        Some(SonarrEvent::DeleteSeries(None))
+        Some(SonarrEvent::DeleteSeries(expected_delete_series_params))
       );
       assert!(app.should_refresh);
       assert!(app.data.sonarr_data.prompt_confirm);
-      assert!(app.data.sonarr_data.delete_series_files);
-      assert!(app.data.sonarr_data.add_list_exclusion);
+      assert!(!app.data.sonarr_data.delete_series_files);
+      assert!(!app.data.sonarr_data.add_list_exclusion);
     }
   }
 
@@ -307,6 +324,31 @@ mod tests {
     });
   }
 
+  #[test]
+  fn test_build_delete_series_params() {
+    let mut app = App::default();
+    app.data.sonarr_data.series.set_items(vec![series()]);
+    app.data.sonarr_data.delete_series_files = true;
+    app.data.sonarr_data.add_list_exclusion = true;
+    let expected_delete_series_params = DeleteSeriesParams {
+      id: 1,
+      delete_series_files: true,
+      add_list_exclusion: true,
+    };
+
+    let delete_series_params = DeleteSeriesHandler::with(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveSonarrBlock::DeleteSeriesPrompt,
+      None,
+    )
+    .build_delete_series_params();
+
+    assert_eq!(delete_series_params, expected_delete_series_params);
+    assert!(!app.data.sonarr_data.delete_series_files);
+    assert!(!app.data.sonarr_data.add_list_exclusion);
+  }
+
   #[test]
   fn test_delete_series_handler_not_ready_when_loading() {
     let mut app = App::default();