fix(sonarr): Pass the indexer ID directly alongside all TestIndexer events when publishing to the networking channel

src/network/sonarr_network.rs

@@ -84,7 +84,7 @@ pub enum SonarrEvent {
   MarkHistoryItemAsFailed(i64),
   SearchNewSeries(String),
   StartTask(SonarrTaskName),
-  TestIndexer(Option<i64>),
+  TestIndexer(i64),
   TestAllIndexers,
   ToggleSeasonMonitoring(Option<(i64, i64)>),
   ToggleEpisodeMonitoring(Option<i64>),
@@ -2041,32 +2041,19 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn test_sonarr_indexer(&mut self, indexer_id: Option<i64>) -> Result<Value> {
+  async fn test_sonarr_indexer(&mut self, indexer_id: i64) -> Result<Value> {
     let detail_event = SonarrEvent::GetIndexers;
-    let event = SonarrEvent::TestIndexer(None);
-    let id = if let Some(i_id) = indexer_id {
-      i_id
-    } else {
-      self
-        .app
-        .lock()
-        .await
-        .data
-        .sonarr_data
-        .indexers
-        .current_selection()
-        .id
-    };
-    info!("Testing Sonarr indexer with ID: {id}");
+    let event = SonarrEvent::TestIndexer(indexer_id);
+    info!("Testing Sonarr indexer with ID: {indexer_id}");
 
-    info!("Fetching indexer details for indexer with ID: {id}");
+    info!("Fetching indexer details for indexer with ID: {indexer_id}");
 
     let request_props = self
       .request_props_from(
         detail_event,
         RequestMethod::Get,
         None::<()>,
-        Some(format!("/{id}")),
+        Some(format!("/{indexer_id}")),
         None,
       )
       .await;

src/network/sonarr_network_tests.rs

@@ -287,7 +287,7 @@ mod test {
   #[case(SonarrEvent::GetUpdates, "/update")]
   #[case(SonarrEvent::MarkHistoryItemAsFailed(0), "/history/failed")]
   #[case(SonarrEvent::SearchNewSeries(String::new()), "/series/lookup")]
-  #[case(SonarrEvent::TestIndexer(None), "/indexer/test")]
+  #[case(SonarrEvent::TestIndexer(0), "/indexer/test")]
   #[case(SonarrEvent::TestAllIndexers, "/indexer/testall")]
   #[case(SonarrEvent::ToggleEpisodeMonitoring(None), "/episode/monitor")]
   fn test_resource(#[case] event: SonarrEvent, #[case] expected_uri: String) {
@@ -4836,7 +4836,7 @@ mod test {
     let async_test_server = server
       .mock(
         "POST",
-        format!("/api/v3{}", SonarrEvent::TestIndexer(None).resource()).as_str(),
+        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
       )
       .with_status(400)
       .match_header("X-Api-Key", "test1234")
@@ -4854,7 +4854,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::TestIndexer(None))
+      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
       .await
       .unwrap()
     {
@@ -4905,7 +4905,7 @@ mod test {
     let async_test_server = server
       .mock(
         "POST",
-        format!("/api/v3{}", SonarrEvent::TestIndexer(None).resource()).as_str(),
+        format!("/api/v3{}", SonarrEvent::TestIndexer(1).resource()).as_str(),
       )
       .with_status(200)
       .match_header("X-Api-Key", "test1234")
@@ -4923,7 +4923,7 @@ mod test {
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::TestIndexer(None))
+      .handle_sonarr_event(SonarrEvent::TestIndexer(1))
       .await
       .unwrap()
     {
@@ -4937,64 +4937,6 @@ mod test {
     }
   }
 
-  #[tokio::test]
-  async fn test_handle_test_sonarr_indexer_event_success_uses_provided_id() {
-    let indexer_details_json = json!({
-        "enableRss": true,
-        "enableAutomaticSearch": true,
-        "enableInteractiveSearch": true,
-        "name": "Test Indexer",
-        "fields": [
-            {
-                "name": "baseUrl",
-                "value": "https://test.com",
-            },
-            {
-                "name": "apiKey",
-                "value": "",
-            },
-            {
-                "name": "seedCriteria.seedRatio",
-                "value": "1.2",
-            },
-        ],
-        "tags": [1],
-        "id": 1
-    });
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(indexer_details_json.clone()),
-      None,
-      SonarrEvent::GetIndexers,
-      Some("/1"),
-      None,
-    )
-    .await;
-    let async_test_server = server
-      .mock(
-        "POST",
-        format!("/api/v3{}", SonarrEvent::TestIndexer(None).resource()).as_str(),
-      )
-      .with_status(200)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(indexer_details_json.clone()))
-      .with_body("{}")
-      .create_async()
-      .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let SonarrSerdeable::Value(value) = network
-      .handle_sonarr_event(SonarrEvent::TestIndexer(Some(1)))
-      .await
-      .unwrap()
-    {
-      async_details_server.assert_async().await;
-      async_test_server.assert_async().await;
-      assert_eq!(value, json!({}));
-    }
-  }
-
   #[tokio::test]
   async fn test_handle_test_all_sonarr_indexers_event() {
     let indexers = vec![