fix(sonarr): Pass the root folder ID alongside all DeleteRootFolder events when publishing to the networking channel

src/network/sonarr_network.rs

@@ -46,7 +46,7 @@ pub enum SonarrEvent {
   DeleteDownload(i64),
   DeleteEpisodeFile(i64),
   DeleteIndexer(i64),
-  DeleteRootFolder(Option<i64>),
+  DeleteRootFolder(i64),
   DeleteSeries(Option<DeleteSeriesParams>),
   DeleteTag(i64),
   DownloadRelease(SonarrReleaseDownloadBody),
@@ -535,30 +535,16 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn delete_sonarr_root_folder(&mut self, root_folder_id: Option<i64>) -> Result<()> {
-    let event = SonarrEvent::DeleteRootFolder(None);
-    let id = if let Some(rf_id) = root_folder_id {
-      rf_id
-    } else {
-      self
-        .app
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .root_folders
-        .current_selection()
-        .id
-    };
-
-    info!("Deleting Sonarr root folder for folder with id: {id}");
+  async fn delete_sonarr_root_folder(&mut self, root_folder_id: i64) -> Result<()> {
+    let event = SonarrEvent::DeleteRootFolder(root_folder_id);
+    info!("Deleting Sonarr 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/sonarr_network_tests.rs

@@ -249,7 +249,7 @@ mod test {
   fn test_resource_root_folder(
     #[values(
       SonarrEvent::GetRootFolders,
-      SonarrEvent::DeleteRootFolder(None),
+      SonarrEvent::DeleteRootFolder(0),
       SonarrEvent::AddRootFolder(AddRootFolderBody::default())
     )]
     event: SonarrEvent,
@@ -648,36 +648,7 @@ mod test {
       None,
       None,
       None,
-      SonarrEvent::DeleteRootFolder(None),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .sonarr_data
-      .root_folders
-      .set_items(vec![root_folder()]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteRootFolder(None))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_sonarr_root_folder_event_uses_provided_id() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      SonarrEvent::DeleteRootFolder(None),
+      SonarrEvent::DeleteRootFolder(1),
       Some("/1"),
       None,
     )
@@ -685,7 +656,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_sonarr_event(SonarrEvent::DeleteRootFolder(Some(1)))
+      .handle_sonarr_event(SonarrEvent::DeleteRootFolder(1))
       .await
       .is_ok());