fix: Blocklist Item ID passed in the DeleteBlocklistItem event when sent to the networking channel

src/network/radarr_network.rs

@@ -39,7 +39,7 @@ pub enum RadarrEvent {
   AddRootFolder(AddRootFolderBody),
   AddTag(String),
   ClearBlocklist,
-  DeleteBlocklistItem(Option<i64>),
+  DeleteBlocklistItem(i64),
   DeleteDownload(Option<i64>),
   DeleteIndexer(Option<i64>),
   DeleteMovie(Option<DeleteMovieParams>),
@@ -387,30 +387,17 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn delete_radarr_blocklist_item(&mut self, blocklist_item_id: Option<i64>) -> Result<()> {
-    let event = RadarrEvent::DeleteBlocklistItem(None);
-    let id = if let Some(b_id) = blocklist_item_id {
-      b_id
-    } else {
-      self
-        .app
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .blocklist
-        .current_selection()
-        .id
-    };
+  async fn delete_radarr_blocklist_item(&mut self, blocklist_item_id: i64) -> Result<()> {
+    let event = RadarrEvent::DeleteBlocklistItem(blocklist_item_id);
 
-    info!("Deleting Radarr blocklist item for item with id: {id}");
+    info!("Deleting Radarr blocklist item for item with id: {blocklist_item_id}");
 
     let request_props = self
       .request_props_from(
         event,
         RequestMethod::Delete,
         None::<()>,
-        Some(format!("/{id}")),
+        Some(format!("/{blocklist_item_id}")),
         None,
       )
       .await;

src/network/radarr_network_tests.rs

@@ -217,7 +217,7 @@ mod test {
 
   #[rstest]
   #[case(RadarrEvent::ClearBlocklist, "/blocklist/bulk")]
-  #[case(RadarrEvent::DeleteBlocklistItem(None), "/blocklist")]
+  #[case(RadarrEvent::DeleteBlocklistItem(1), "/blocklist")]
   #[case(RadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
   #[case(RadarrEvent::GetLogs(Some(500)), "/log")]
   #[case(RadarrEvent::SearchNewMovie(None), "/movie/lookup")]
@@ -3199,36 +3199,7 @@ mod test {
       None,
       None,
       None,
-      RadarrEvent::DeleteBlocklistItem(None),
-      Some("/1"),
-      None,
-    )
-    .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .blocklist
-      .set_items(vec![blocklist_item()]);
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteBlocklistItem(None))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_delete_blocklist_item_event_uses_provided_id() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Delete,
-      None,
-      None,
-      None,
-      RadarrEvent::DeleteBlocklistItem(None),
+      RadarrEvent::DeleteBlocklistItem(1),
       Some("/1"),
       None,
     )
@@ -3236,7 +3207,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_radarr_event(RadarrEvent::DeleteBlocklistItem(Some(1)))
+      .handle_radarr_event(RadarrEvent::DeleteBlocklistItem(1))
       .await
       .is_ok());