fix(radarr): Build and pass the edit indexer settings body with the EditAllIndexerSettings event when publishing to the networking channel

src/network/radarr_network.rs

@@ -46,7 +46,7 @@ pub enum RadarrEvent {
   DeleteRootFolder(i64),
   DeleteTag(i64),
   DownloadRelease(RadarrReleaseDownloadBody),
-  EditAllIndexerSettings(Option<IndexerSettings>),
+  EditAllIndexerSettings(IndexerSettings),
   EditCollection(Option<EditCollectionParams>),
   EditIndexer(Option<EditIndexerParams>),
   EditMovie(Option<EditMovieParams>),
@@ -506,38 +506,21 @@ impl<'a, 'b> Network<'a, 'b> {
 
   async fn edit_all_radarr_indexer_settings(
     &mut self,
-    params: Option<IndexerSettings>,
+    params: IndexerSettings,
   ) -> Result<Value> {
     info!("Updating Radarr indexer settings");
-    let event = RadarrEvent::EditAllIndexerSettings(None);
+    let event = RadarrEvent::EditAllIndexerSettings(params.clone());
 
-    let body = if let Some(indexer_settings) = params {
-      indexer_settings
-    } else {
-      self
-        .app
-        .lock()
-        .await
-        .data
-        .radarr_data
-        .indexer_settings
-        .as_ref()
-        .unwrap()
-        .clone()
-    };
-
-    debug!("Indexer settings body: {body:?}");
+    debug!("Indexer settings body: {params:?}");
 
     let request_props = self
-      .request_props_from(event, RequestMethod::Put, Some(body), None, None)
+      .request_props_from(event, RequestMethod::Put, Some(params), None, None)
       .await;
 
     let resp = self
       .handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
       .await;
 
-    self.app.lock().await.data.radarr_data.indexer_settings = None;
-
     resp
   }
 

src/network/radarr_network_tests.rs

@@ -15,8 +15,8 @@ mod test {
 
   use crate::app::ServarrConfig;
   use crate::models::radarr_models::{
-    AddMovieOptions, BlocklistItem, BlocklistItemMovie, CollectionMovie, MediaInfo,
-    MinimumAvailability, MovieCollection, MovieFile, Rating, RatingsList,
+    AddMovieOptions, BlocklistItem, BlocklistItemMovie, CollectionMovie, IndexerSettings,
+    MediaInfo, MinimumAvailability, MovieCollection, MovieFile, Rating, RatingsList
   };
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
   use crate::models::servarr_models::{
@@ -146,7 +146,7 @@ mod test {
   fn test_resource_all_indexer_settings(
     #[values(
       RadarrEvent::GetAllIndexerSettings,
-      RadarrEvent::EditAllIndexerSettings(None)
+      RadarrEvent::EditAllIndexerSettings(IndexerSettings::default())
     )]
     event: RadarrEvent,
   ) {
@@ -3341,60 +3341,15 @@ mod test {
       Some(indexer_settings_json),
       None,
       None,
-      RadarrEvent::EditAllIndexerSettings(None),
+      RadarrEvent::EditAllIndexerSettings(indexer_settings()),
       None,
       None,
     )
     .await;
-
-    app_arc.lock().await.data.radarr_data.indexer_settings = Some(indexer_settings());
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_radarr_event(RadarrEvent::EditAllIndexerSettings(None))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .indexer_settings
-      .is_none());
-  }
-
-  #[tokio::test]
-  async fn test_handle_edit_all_radarr_indexer_settings_event_uses_provided_settings() {
-    let indexer_settings_json = json!({
-        "minimumAge": 0,
-        "maximumSize": 0,
-        "retention": 0,
-        "rssSyncInterval": 60,
-        "preferIndexerFlags": false,
-        "availabilityDelay": 0,
-        "allowHardcodedSubs": true,
-        "whitelistedHardcodedSubs": "",
-        "id": 1
-    });
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Put,
-      Some(indexer_settings_json),
-      None,
-      None,
-      RadarrEvent::EditAllIndexerSettings(None),
-      None,
-      None,
-    )
-    .await;
-
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::EditAllIndexerSettings(
-        Some(indexer_settings())
-      ))
+      .handle_radarr_event(RadarrEvent::EditAllIndexerSettings(indexer_settings()))
       .await
       .is_ok());