fix(radarr): Pass in the movie ID alongside the GetMovieHistory event when publishing to the networking channel

src/app/radarr/mod.rs

@@ -113,7 +113,7 @@ impl<'a> App<'a> {
       }
       ActiveRadarrBlock::MovieHistory => {
         self
-          .dispatch_network_event(RadarrEvent::GetMovieHistory(None).into())
+          .dispatch_network_event(RadarrEvent::GetMovieHistory(self.extract_movie_id().await).into())
           .await;
       }
       ActiveRadarrBlock::Cast | ActiveRadarrBlock::Crew => {

src/app/radarr/radarr_tests.rs

@@ -358,6 +358,7 @@ mod tests {
     #[tokio::test]
     async fn test_dispatch_by_movie_history_block() {
       let (mut app, mut sync_network_rx) = construct_app_unit();
+      app.data.radarr_data.movies.set_items(vec![Movie { id: 1, ..Movie::default() }]);
 
       app
         .dispatch_by_radarr_block(&ActiveRadarrBlock::MovieHistory)
@@ -366,7 +367,7 @@ mod tests {
       assert!(app.is_loading);
       assert_eq!(
         sync_network_rx.recv().await.unwrap(),
-        RadarrEvent::GetMovieHistory(None).into()
+        RadarrEvent::GetMovieHistory(1).into()
       );
       assert!(!app.data.radarr_data.prompt_confirm);
       assert_eq!(app.tick_count, 0);

src/cli/radarr/get_command_handler.rs

@@ -97,7 +97,7 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrGetCommand> for RadarrGetCommandHan
       RadarrGetCommand::MovieHistory { movie_id } => {
         let resp = self
           .network
-          .handle_network_event(RadarrEvent::GetMovieHistory(Some(movie_id)).into())
+          .handle_network_event(RadarrEvent::GetMovieHistory(movie_id).into())
           .await?;
         serde_json::to_string_pretty(&resp)?
       }

src/cli/radarr/get_command_handler_tests.rs

@@ -208,7 +208,7 @@ mod tests {
       mock_network
         .expect_handle_network_event()
         .with(eq::<NetworkEvent>(
-          RadarrEvent::GetMovieHistory(Some(expected_movie_id)).into(),
+          RadarrEvent::GetMovieHistory(expected_movie_id).into(),
         ))
         .times(1)
         .returning(|_| {

src/network/radarr_network.rs

@@ -57,7 +57,7 @@ pub enum RadarrEvent {
   GetLogs(u64),
   GetMovieCredits(i64),
   GetMovieDetails(i64),
-  GetMovieHistory(Option<i64>),
+  GetMovieHistory(i64),
   GetMovies,
   GetDiskSpace,
   GetQualityProfiles,
@@ -1319,18 +1319,17 @@ impl<'a, 'b> Network<'a, 'b> {
       .await
   }
 
-  async fn get_movie_history(&mut self, movie_id: Option<i64>) -> Result<Vec<MovieHistoryItem>> {
+  async fn get_movie_history(&mut self, movie_id: i64) -> Result<Vec<MovieHistoryItem>> {
     info!("Fetching Radarr movie history");
-    let event = RadarrEvent::GetMovieHistory(None);
+    let event = RadarrEvent::GetMovieHistory(movie_id);
 
-    let (_, movie_id_param) = self.extract_movie_id(movie_id).await;
     let request_props = self
       .request_props_from(
         event,
         RequestMethod::Get,
         None::<()>,
         None,
-        Some(movie_id_param),
+        Some(format!("movieId={movie_id}")),
       )
       .await;
 

src/network/radarr_network_tests.rs

@@ -222,7 +222,7 @@ mod test {
   #[case(RadarrEvent::GetLogs(500), "/log")]
   #[case(RadarrEvent::SearchNewMovie(None), "/movie/lookup")]
   #[case(RadarrEvent::GetMovieCredits(0), "/credit")]
-  #[case(RadarrEvent::GetMovieHistory(None), "/history/movie")]
+  #[case(RadarrEvent::GetMovieHistory(0), "/history/movie")]
   #[case(RadarrEvent::GetDiskSpace, "/diskspace")]
   #[case(RadarrEvent::GetQualityProfiles, "/qualityprofile")]
   #[case(RadarrEvent::GetStatus, "/system/status")]
@@ -1532,23 +1532,16 @@ mod test {
       None,
       Some(movie_history_item_json),
       None,
-      RadarrEvent::GetMovieHistory(None),
+      RadarrEvent::GetMovieHistory(1),
       None,
       Some("movieId=1"),
     )
     .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .movies
-      .set_items(vec![movie()]);
     app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     if let RadarrSerdeable::MovieHistoryItems(history) = network
-      .handle_radarr_event(RadarrEvent::GetMovieHistory(None))
+      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
       .await
       .unwrap()
     {
@@ -1570,39 +1563,6 @@ mod test {
     }
   }
 
-  #[tokio::test]
-  async fn test_handle_get_movie_history_event_uses_provided_id() {
-    let movie_history_item_json = json!([{
-      "sourceTitle": "Test",
-      "quality": { "quality": { "name": "HD - 1080p" }},
-      "languages": [ { "id": 1, "name": "English" } ],
-      "date": "2022-12-30T07:37:56Z",
-      "eventType": "grabbed"
-    }]);
-    let response: Vec<MovieHistoryItem> =
-      serde_json::from_value(movie_history_item_json.clone()).unwrap();
-    let (async_server, app_arc, _server) = mock_servarr_api(
-      RequestMethod::Get,
-      None,
-      Some(movie_history_item_json),
-      None,
-      RadarrEvent::GetMovieHistory(None),
-      None,
-      Some("movieId=1"),
-    )
-    .await;
-    let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
-
-    if let RadarrSerdeable::MovieHistoryItems(history) = network
-      .handle_radarr_event(RadarrEvent::GetMovieHistory(Some(1)))
-      .await
-      .unwrap()
-    {
-      async_server.assert_async().await;
-      assert_eq!(history, response);
-    }
-  }
-
   #[tokio::test]
   async fn test_handle_get_movie_history_event_empty_movie_details_modal() {
     let movie_history_item_json = json!([{
@@ -1617,22 +1577,15 @@ mod test {
       None,
       Some(movie_history_item_json),
       None,
-      RadarrEvent::GetMovieHistory(None),
+      RadarrEvent::GetMovieHistory(1),
       None,
       Some("movieId=1"),
     )
     .await;
-    app_arc
-      .lock()
-      .await
-      .data
-      .radarr_data
-      .movies
-      .set_items(vec![movie()]);
     let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
 
     assert!(network
-      .handle_radarr_event(RadarrEvent::GetMovieHistory(None))
+      .handle_radarr_event(RadarrEvent::GetMovieHistory(1))
       .await
       .is_ok());