fix(sonarr): Pass the series ID and season number alongside all toggle season monitoring events when publishing to the networking channel

2024-12-18 01:12:32 -07:00
parent 1d404d4d2c
commit 18a8b81631
6 changed files with 103 additions and 142 deletions
@@ -86,7 +86,7 @@ pub enum SonarrEvent {
  StartTask(SonarrTaskName),
  TestIndexer(i64),
  TestAllIndexers,
-  ToggleSeasonMonitoring(Option<(i64, i64)>),
+  ToggleSeasonMonitoring((i64, i64)),
  ToggleEpisodeMonitoring(Option<i64>),
  TriggerAutomaticEpisodeSearch(Option<i64>),
  TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
@@ -967,86 +967,81 @@ impl<'a, 'b> Network<'a, 'b> {

  async fn toggle_sonarr_season_monitoring(
    &mut self,
-    series_id_season_number_tuple: Option<(i64, i64)>,
+    series_id_season_number_tuple: (i64, i64),
  ) -> Result<()> {
    let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
-    let (series_id, season_number) =
-      if let Some((series_id, season_number)) = series_id_season_number_tuple {
-        (Some(series_id), Some(season_number))
-      } else {
-        (None, None)
-      };
+    let (series_id, season_number) = series_id_season_number_tuple;

-    let (series_id, _) = self.extract_series_id(series_id).await;
    let detail_event = SonarrEvent::GetSeriesDetails(series_id);
-    if let Ok((season_number, _)) = self.extract_season_number(season_number).await {
-      info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
-      info!("Fetching series details for series with ID: {series_id}");
+    info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
+    info!("Fetching series details for series with ID: {series_id}");

-      let request_props = self
-        .request_props_from(
-          detail_event,
-          RequestMethod::Get,
-          None::<()>,
-          Some(format!("/{series_id}")),
-          None,
-        )
-        .await;
+    let request_props = self
+      .request_props_from(
+        detail_event,
+        RequestMethod::Get,
+        None::<()>,
+        Some(format!("/{series_id}")),
+        None,
+      )
+      .await;

-      let mut response = String::new();
+    let mut response = String::new();

-      self
-        .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
-          response = detailed_series_body.to_string()
-        })
-        .await?;
+    self
+      .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
+        response = detailed_series_body.to_string()
+      })
+      .await?;

-      info!("Constructing toggle season monitoring body");
+    info!("Constructing toggle season monitoring body");

-      let mut detailed_series_body: Value =
-        serde_json::from_str(&response).expect("Request for detailed series body was interrupted");
-      let monitored = detailed_series_body
-        .get("seasons")
-        .unwrap()
-        .as_array()
-        .unwrap()
-        .iter()
-        .find(|season| season["seasonNumber"] == season_number)
-        .unwrap()
-        .get("monitored")
-        .unwrap()
-        .as_bool()
-        .unwrap();
+    match serde_json::from_str::<Value>(&response) {
+      Ok(mut detailed_series_body) => {
+        let monitored = detailed_series_body
+          .get("seasons")
+          .unwrap()
+          .as_array()
+          .unwrap()
+          .iter()
+          .find(|season| season["seasonNumber"] == season_number)
+          .unwrap()
+          .get("monitored")
+          .unwrap()
+          .as_bool()
+          .unwrap();

-      *detailed_series_body
-        .get_mut("seasons")
-        .unwrap()
-        .as_array_mut()
-        .unwrap()
-        .iter_mut()
-        .find(|season| season["seasonNumber"] == season_number)
-        .unwrap()
-        .get_mut("monitored")
-        .unwrap() = json!(!monitored);
+        *detailed_series_body
+          .get_mut("seasons")
+          .unwrap()
+          .as_array_mut()
+          .unwrap()
+          .iter_mut()
+          .find(|season| season["seasonNumber"] == season_number)
+          .unwrap()
+          .get_mut("monitored")
+          .unwrap() = json!(!monitored);

-      debug!("Toggle season monitoring body: {detailed_series_body:?}");
+        debug!("Toggle season monitoring body: {detailed_series_body:?}");

-      let request_props = self
-        .request_props_from(
-          event,
-          RequestMethod::Put,
-          Some(detailed_series_body),
-          Some(format!("/{series_id}")),
-          None,
-        )
-        .await;
+        let request_props = self
+          .request_props_from(
+            event,
+            RequestMethod::Put,
+            Some(detailed_series_body),
+            Some(format!("/{series_id}")),
+            None,
+          )
+          .await;

-      self
-        .handle_request::<Value, ()>(request_props, |_, _| ())
-        .await
-    } else {
-      warn!("Season number was not provided. Aborting...");
-      Ok(())
+        self
+          .handle_request::<Value, ()>(request_props, |_, _| ())
+          .await
+      }
+      Err(_) => {
+        warn!("Request for detailed series body was interrupted");
+        Ok(())
+      }
    }
  }

@@ -162,7 +162,7 @@ mod test {
      SonarrEvent::GetSeriesDetails(0),
      SonarrEvent::DeleteSeries(DeleteSeriesParams::default()),
      SonarrEvent::EditSeries(EditSeriesParams::default()),
-      SonarrEvent::ToggleSeasonMonitoring(None)
+      SonarrEvent::ToggleSeasonMonitoring((0, 0))
    )]
    event: SonarrEvent,
  ) {
@@ -5145,7 +5145,7 @@ mod test {
        "PUT",
        format!(
          "/api/v3{}/1",
-          SonarrEvent::ToggleSeasonMonitoring(None).resource()
+          SonarrEvent::ToggleSeasonMonitoring((1, 1)).resource()
        )
        .as_str(),
      )
@@ -5162,72 +5162,7 @@ mod test {
    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());

    assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(None))
-      .await
-      .is_ok());
-
-    async_details_server.assert_async().await;
-    async_toggle_server.assert_async().await;
-  }
-
-  #[tokio::test]
-  async fn test_handle_toggle_season_monitoring_event_uses_provided_series_id_and_season_number() {
-    let mut detailed_response: Value = serde_json::from_str(SERIES_JSON).unwrap();
-    *detailed_response
-      .get_mut("seasons")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|season| season["seasonNumber"] == 1)
-      .unwrap()
-      .get_mut("seasonNumber")
-      .unwrap() = json!(2);
-    let mut expected_body: Value = detailed_response.clone();
-    *expected_body
-      .get_mut("seasons")
-      .unwrap()
-      .as_array_mut()
-      .unwrap()
-      .iter_mut()
-      .find(|season| season["seasonNumber"] == 2)
-      .unwrap()
-      .get_mut("monitored")
-      .unwrap() = json!(false);
-
-    let (async_details_server, app_arc, mut server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(detailed_response),
-      None,
-      SonarrEvent::GetSeriesDetails(2),
-      Some("/2"),
-      None,
-    )
-    .await;
-    let async_toggle_server = server
-      .mock(
-        "PUT",
-        format!(
-          "/api/v3{}/2",
-          SonarrEvent::ToggleSeasonMonitoring(Some((2, 2))).resource()
-        )
-        .as_str(),
-      )
-      .with_status(202)
-      .match_header("X-Api-Key", "test1234")
-      .match_body(Matcher::Json(expected_body))
-      .create_async()
-      .await;
-    {
-      let mut app = app_arc.lock().await;
-      app.data.sonarr_data.series.set_items(vec![series()]);
-      app.data.sonarr_data.seasons.set_items(vec![season()]);
-    }
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    assert!(network
-      .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(Some((2, 2))))
+      .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring((1, 1)))
      .await
      .is_ok());