fix: Pass the delete movie params in with the DeleteMovie event when publishing to the networking channel

src/handlers/radarr_handlers/library/delete_movie_handler.rs

@@ -2,6 +2,7 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
+use crate::models::radarr_models::DeleteMovieParams;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::network::radarr_network::RadarrEvent;
 
@@ -16,6 +17,25 @@ pub(super) struct DeleteMovieHandler<'a, 'b> {
   _context: Option<ActiveRadarrBlock>,
 }
 
+impl<'a, 'b> DeleteMovieHandler<'a, 'b> {
+  fn build_delete_movie_params(&mut self) -> DeleteMovieParams {
+    let id = self.app.data.radarr_data.movies.current_selection().id;
+    let delete_movie_files = self.app.data.radarr_data.delete_movie_files;
+    let add_list_exclusion = self.app.data.radarr_data.add_list_exclusion;
+    self
+      .app
+      .data
+      .radarr_data
+      .reset_delete_movie_preferences();
+    
+    DeleteMovieParams {
+      id,
+      delete_movie_files,
+      add_list_exclusion,
+    }
+  }
+}
+
 impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'a, 'b> {
   fn accepts(active_block: ActiveRadarrBlock) -> bool {
     DELETE_MOVIE_BLOCKS.contains(&active_block)
@@ -72,7 +92,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
       match self.app.data.radarr_data.selected_block.get_active_block() {
         ActiveRadarrBlock::DeleteMovieConfirmPrompt => {
           if self.app.data.radarr_data.prompt_confirm {
-            self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteMovie(None));
+            self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteMovie(self.build_delete_movie_params()));
             self.app.should_refresh = true;
           } else {
             self.app.data.radarr_data.reset_delete_movie_preferences();
@@ -108,7 +128,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<'
       && self.key == DEFAULT_KEYBINDINGS.confirm.key
     {
       self.app.data.radarr_data.prompt_confirm = true;
-      self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteMovie(None));
+      self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::DeleteMovie(self.build_delete_movie_params()));
       self.app.should_refresh = true;
 
       self.app.pop_navigation_stack();

src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs

@@ -1,12 +1,15 @@
 #[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::radarr_handlers::library::delete_movie_handler::DeleteMovieHandler;
+  use crate::handlers::radarr_handlers::radarr_handler_test_utils::utils::movie;
   use crate::handlers::KeyEventHandler;
+  use crate::models::radarr_models::DeleteMovieParams;
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 
   mod test_handle_scroll_up_and_down {
@@ -119,8 +122,14 @@ mod tests {
     #[test]
     fn test_delete_movie_confirm_prompt_prompt_confirmation_submit() {
       let mut app = App::default();
+      let expected_delete_movie_params = DeleteMovieParams {
+        id: 1,
+        delete_movie_files: true,
+        add_list_exclusion: true,
+      };
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
+      app.data.radarr_data.movies.set_items(vec![movie()]);
       app.data.radarr_data.prompt_confirm = true;
       app.data.radarr_data.delete_movie_files = true;
       app.data.radarr_data.add_list_exclusion = true;
@@ -142,12 +151,12 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::DeleteMovie(None))
+        Some(RadarrEvent::DeleteMovie(expected_delete_movie_params))
       );
       assert!(app.should_refresh);
       assert!(app.data.radarr_data.prompt_confirm);
-      assert!(app.data.radarr_data.delete_movie_files);
-      assert!(app.data.radarr_data.add_list_exclusion);
+      assert!(!app.data.radarr_data.delete_movie_files);
+      assert!(!app.data.radarr_data.add_list_exclusion);
     }
 
     #[test]
@@ -212,6 +221,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;
@@ -248,14 +258,21 @@ mod tests {
       },
       network::radarr_network::RadarrEvent,
     };
+    use pretty_assertions::assert_eq;
 
     use super::*;
 
     #[test]
     fn test_delete_movie_confirm_prompt_prompt_confirm() {
       let mut app = App::default();
+      let expected_delete_movie_params = DeleteMovieParams {
+        id: 1,
+        delete_movie_files: true,
+        add_list_exclusion: true,
+      };
       app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
       app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into());
+      app.data.radarr_data.movies.set_items(vec![movie()]);
       app.data.radarr_data.delete_movie_files = true;
       app.data.radarr_data.add_list_exclusion = true;
       app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS);
@@ -276,12 +293,12 @@ mod tests {
       assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into());
       assert_eq!(
         app.data.radarr_data.prompt_confirm_action,
-        Some(RadarrEvent::DeleteMovie(None))
+        Some(RadarrEvent::DeleteMovie(expected_delete_movie_params))
       );
       assert!(app.should_refresh);
       assert!(app.data.radarr_data.prompt_confirm);
-      assert!(app.data.radarr_data.delete_movie_files);
-      assert!(app.data.radarr_data.add_list_exclusion);
+      assert!(!app.data.radarr_data.delete_movie_files);
+      assert!(!app.data.radarr_data.add_list_exclusion);
     }
   }
 
@@ -296,6 +313,30 @@ mod tests {
     });
   }
 
+  #[test]
+  fn test_build_delete_movie_params() {
+    let mut app = App::default();
+    app.data.radarr_data.movies.set_items(vec![movie()]);
+    app.data.radarr_data.delete_movie_files = true;
+    app.data.radarr_data.add_list_exclusion = true;
+    let expected_delete_movie_params = DeleteMovieParams {
+      id: 1,
+      delete_movie_files: true,
+      add_list_exclusion: true,
+    };
+
+    let delete_movie_params = DeleteMovieHandler::with(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveRadarrBlock::DeleteMoviePrompt,
+      None,
+    ).build_delete_movie_params();
+
+    assert_eq!(delete_movie_params, expected_delete_movie_params);
+    assert!(!app.data.radarr_data.delete_movie_files);
+    assert!(!app.data.radarr_data.add_list_exclusion);
+  }
+
   #[test]
   fn test_delete_movie_handler_not_ready_when_loading() {
     let mut app = App::default();