fix: AddRootFolderBody now constructed prior to AddRootFolder event being sent down the network channel

src/network/radarr_network.rs

@@ -36,7 +36,7 @@ mod radarr_network_tests;
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub enum RadarrEvent {
   AddMovie(AddMovieBody),
-  AddRootFolder(Option<String>),
+  AddRootFolder(AddRootFolderBody),
   AddTag(String),
   ClearBlocklist,
   DeleteBlocklistItem(Option<i64>),
@@ -301,31 +301,14 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn add_radarr_root_folder(&mut self, root_folder: Option<String>) -> Result<Value> {
+  async fn add_radarr_root_folder(&mut self, add_root_folder_body: AddRootFolderBody) -> Result<Value> {
     info!("Adding new root folder to Radarr");
-    let event = RadarrEvent::AddRootFolder(None);
-    let body = if let Some(path) = root_folder {
-      AddRootFolderBody { path }
-    } else {
-      let mut app = self.app.lock().await;
-      let path = app
-        .data
-        .radarr_data
-        .edit_root_folder
-        .as_ref()
-        .unwrap()
-        .text
-        .clone();
-
-      app.data.radarr_data.edit_root_folder = None;
-
-      AddRootFolderBody { path }
-    };
-
-    debug!("Add root folder body: {body:?}");
+    let event = RadarrEvent::AddRootFolder(add_root_folder_body.clone());
+    
+    debug!("Add root folder body: {add_root_folder_body:?}");
 
     let request_props = self
-      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .request_props_from(event, RequestMethod::Post, Some(add_root_folder_body), None, None)
       .await;
 
     self

src/network/radarr_network_tests.rs

@@ -156,7 +156,7 @@ mod test {
   #[rstest]
   fn test_resource_root_folder(
     #[values(
-      RadarrEvent::AddRootFolder(None),
+      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
       RadarrEvent::GetRootFolders,
       RadarrEvent::DeleteRootFolder(None)
     )]
@@ -3456,60 +3456,20 @@ mod test {
       })),
       Some(json!({})),
       None,
-      RadarrEvent::AddRootFolder(None),
+      RadarrEvent::AddRootFolder(AddRootFolderBody::default()),
       None,
       None,
     )
     .await;
-
-    app_arc.lock().await.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
+    let add_root_folder_body = AddRootFolderBody { path: "/nfs/test".to_owned() };
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_radarr_event(RadarrEvent::AddRootFolder(None))
+      .handle_radarr_event(RadarrEvent::AddRootFolder(add_root_folder_body))
       .await
       .is_ok());
 
     async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .edit_root_folder
-      .is_none());
-  }
-
-  #[tokio::test]
-  async fn test_handle_add_radarr_root_folder_event_uses_provided_path() {
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Post,
-      Some(json!({
-        "path": "/test/test"
-      })),
-      Some(json!({})),
-      None,
-      RadarrEvent::AddRootFolder(None),
-      None,
-      None,
-    )
-    .await;
-
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_radarr_event(RadarrEvent::AddRootFolder(Some("/test/test".to_owned())))
-      .await
-      .is_ok());
-
-    async_server.assert_async().await;
-    assert!(app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .edit_root_folder
-      .is_none());
   }
 
   #[tokio::test]