refactor: Network module is now broken out into similar directory structures for each servarr to mimic the rest of the project to make it easier to develop and maintain

src/network/sonarr_network/downloads/mod.rs

@@ -0,0 +1,81 @@
+use crate::models::servarr_models::CommandBody;
+use crate::models::sonarr_models::DownloadsResponse;
+use crate::network::sonarr_network::SonarrEvent;
+use crate::network::{Network, RequestMethod};
+use anyhow::Result;
+use log::info;
+use serde_json::Value;
+
+#[cfg(test)]
+#[path = "sonarr_downloads_network_tests.rs"]
+mod sonarr_downloads_network_tests;
+
+impl Network<'_, '_> {
+  pub(in crate::network::sonarr_network) async fn delete_sonarr_download(
+    &mut self,
+    download_id: i64,
+  ) -> Result<()> {
+    let event = SonarrEvent::DeleteDownload(download_id);
+    info!("Deleting Sonarr download for download with id: {download_id}");
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Delete,
+        None::<()>,
+        Some(format!("/{download_id}")),
+        None,
+      )
+      .await;
+
+    self
+      .handle_request::<(), ()>(request_props, |_, _| ())
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn get_sonarr_downloads(
+    &mut self,
+    count: u64,
+  ) -> Result<DownloadsResponse> {
+    info!("Fetching Sonarr downloads");
+    let event = SonarrEvent::GetDownloads(count);
+
+    let request_props = self
+      .request_props_from(
+        event,
+        RequestMethod::Get,
+        None::<()>,
+        None,
+        Some(format!("pageSize={count}")),
+      )
+      .await;
+
+    self
+      .handle_request::<(), DownloadsResponse>(request_props, |queue_response, mut app| {
+        app
+          .data
+          .sonarr_data
+          .downloads
+          .set_items(queue_response.records);
+      })
+      .await
+  }
+
+  pub(in crate::network::sonarr_network) async fn update_sonarr_downloads(
+    &mut self,
+  ) -> Result<Value> {
+    info!("Updating Sonarr downloads");
+    let event = SonarrEvent::UpdateDownloads;
+    let body = CommandBody {
+      name: "RefreshMonitoredDownloads".to_owned(),
+    };
+
+    let request_props = self
+      .request_props_from(event, RequestMethod::Post, Some(body), None, None)
+      .await;
+
+    self
+      .handle_request::<CommandBody, Value>(request_props, |_, _| ())
+      .await
+  }
+}

src/network/sonarr_network/downloads/sonarr_downloads_network_tests.rs

@@ -0,0 +1,113 @@
+#[cfg(test)]
+mod tests {
+  use crate::models::sonarr_models::{DownloadsResponse, SonarrSerdeable};
+  use crate::network::network_tests::test_utils::mock_servarr_api;
+  use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::{
+    download_record, downloads_response,
+  };
+  use crate::network::sonarr_network::SonarrEvent;
+  use crate::network::{Network, RequestMethod};
+  use pretty_assertions::assert_eq;
+  use reqwest::Client;
+  use serde_json::json;
+  use tokio_util::sync::CancellationToken;
+
+  #[tokio::test]
+  async fn test_handle_delete_sonarr_download_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Delete,
+      None,
+      None,
+      None,
+      SonarrEvent::DeleteDownload(1),
+      Some("/1"),
+      None,
+    )
+    .await;
+    app_arc
+      .lock()
+      .await
+      .data
+      .sonarr_data
+      .downloads
+      .set_items(vec![download_record()]);
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::DeleteDownload(1))
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+
+  #[tokio::test]
+  async fn test_handle_get_sonarr_downloads_event() {
+    let downloads_response_json = json!({
+      "records": [{
+        "title": "Test Download Title",
+        "status": "downloading",
+        "id": 1,
+        "episodeId": 1,
+        "size": 3543348019f64,
+        "sizeleft": 1771674009f64,
+        "outputPath": "/nfs/tv/Test show/season 1/",
+        "indexer": "kickass torrents",
+        "downloadClient": "transmission",
+      }]
+    });
+    let response: DownloadsResponse =
+      serde_json::from_value(downloads_response_json.clone()).unwrap();
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Get,
+      None,
+      Some(downloads_response_json),
+      None,
+      SonarrEvent::GetDownloads(500),
+      None,
+      Some("pageSize=500"),
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    if let SonarrSerdeable::DownloadsResponse(downloads) = network
+      .handle_sonarr_event(SonarrEvent::GetDownloads(500))
+      .await
+      .unwrap()
+    {
+      async_server.assert_async().await;
+      assert_eq!(
+        app_arc.lock().await.data.sonarr_data.downloads.items,
+        downloads_response().records
+      );
+      assert_eq!(downloads, response);
+    }
+  }
+
+  #[tokio::test]
+  async fn test_handle_update_sonarr_downloads_event() {
+    let (async_server, app_arc, _server) = mock_servarr_api(
+      RequestMethod::Post,
+      Some(json!({
+        "name": "RefreshMonitoredDownloads"
+      })),
+      Some(json!({})),
+      None,
+      SonarrEvent::UpdateDownloads,
+      None,
+      None,
+    )
+    .await;
+    app_arc.lock().await.server_tabs.next();
+    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
+
+    assert!(network
+      .handle_sonarr_event(SonarrEvent::UpdateDownloads)
+      .await
+      .is_ok());
+
+    async_server.assert_async().await;
+  }
+}