fix(radarr): Pass the root folder ID in with the DeleteRootFolder event when publishing to the networking channel

src/network/radarr_network.rs

@@ -43,7 +43,7 @@ pub enum RadarrEvent {
   DeleteDownload(i64),
   DeleteIndexer(i64),
   DeleteMovie(DeleteMovieParams),
-  DeleteRootFolder(Option<i64>),
+  DeleteRootFolder(i64),
   DeleteTag(i64),
   DownloadRelease(Option<RadarrReleaseDownloadBody>),
   EditAllIndexerSettings(Option<IndexerSettings>),
@@ -469,30 +469,16 @@ impl<'a, 'b> Network<'a, 'b> {
     resp
   }
 
-  async fn delete_radarr_root_folder(&mut self, root_folder_id: Option<i64>) -> Result<()> {
-    let event = RadarrEvent::DeleteRootFolder(None);
-    let id = if let Some(rf_id) = root_folder_id {
-      rf_id
-    } else {
-      self
-        .app
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .root_folders
-        .current_selection()
-        .id
-    };
-
-    info!("Deleting Radarr root folder for folder with id: {id}");
+  async fn delete_radarr_root_folder(&mut self, root_folder_id: i64) -> Result<()> {
+    let event = RadarrEvent::DeleteRootFolder(root_folder_id);
+    info!("Deleting Radarr root folder for folder with id: {root_folder_id}");
 
     let request_props = self
       .request_props_from(
         event,
         RequestMethod::Delete,
         None::<()>,
-        Some(format!("/{id}")),
+        Some(format!("/{root_folder_id}")),
         None,
       )
       .await;

src/network/radarr_network_tests.rs

@@ -158,7 +158,7 @@ mod test {
     #[values(
       RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
       RadarrEvent::GetRootFolders,
-      RadarrEvent::DeleteRootFolder(None)
+      RadarrEvent::DeleteRootFolder(0)
     )]
     event: RadarrEvent,
   ) {
@@ -3232,36 +3232,7 @@ mod test {
       None,
       None,
       None,
-      RadarrEvent::DeleteRootFolder(None),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .root_folders
-      .set_items(vec![root_folder()]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteRootFolder(None))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_radarr_root_folder_event_uses_provided_id() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteRootFolder(None),
+      RadarrEvent::DeleteRootFolder(1),
       Some("/1"),
       None,
     )
@@ -3269,7 +3240,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteRootFolder(Some(1)))
+      .handle_radarr_event(RadarrEvent::DeleteRootFolder(1))
       .await
       .is_ok());