Make client send SnapshotDownloadMessage

Author: jpraynaud

mithril-client/src/aggregator_client/http_client.rs

@@ -159,7 +159,8 @@ impl AggregatorHTTPClient {
     /// Issue a POST HTTP request.
     #[async_recursion]
     async fn post(&self, url: &str, json: &str) -> Result<Response, AggregatorHTTPClientError> {
-        let request_builder = Client::new().post(url.to_owned()).json(json);
+        debug!("POST url='{url}' json='{json}'.");
+        let request_builder = Client::new().post(url.to_owned()).body(json.to_owned());
         let current_api_version = self
             .compute_current_api_version()
             .await
@@ -177,7 +178,7 @@ impl AggregatorHTTPClient {
         })?;
 
         match response.status() {
-            StatusCode::OK => Ok(response),
+            StatusCode::OK | StatusCode::CREATED => Ok(response),
             StatusCode::PRECONDITION_FAILED => {
                 if self.discard_current_api_version().await.is_some()
                     && !self.api_versions.read().await.is_empty()

mithril-client/src/aggregator_client/snapshot_client.rs

@@ -6,12 +6,14 @@ use thiserror::Error;
 
 use mithril_common::{
     entities::Snapshot,
-    messages::{SnapshotListItemMessage, SnapshotListMessage, SnapshotMessage},
+    messages::{SnapshotListItemMessage, SnapshotListMessage, SnapshotMessage, ToMessageAdapter},
     StdResult,
 };
 
-use crate::aggregator_client::AggregatorClient;
 use crate::utils::DownloadProgressReporter;
+use crate::{
+    aggregator_client::AggregatorClient, message_adapters::ToSnapshotDownloadMessageAdapter,
+};
 
 /// Error for the Snapshot client
 #[derive(Error, Debug)]
@@ -77,7 +79,9 @@ impl SnapshotClient {
                 {
                     Ok(()) => {
                         // the snapshot download does not fail if the statistic call fails.
-                        let _ = self.add_statistics(snapshot).await;
+                        if let Err(e) = self.add_statistics(snapshot).await {
+                            warn!("Could not POST snapshot download statistics: {e:?}");
+                        }
 
                         Ok(())
                     }
@@ -101,7 +105,8 @@ impl SnapshotClient {
     /// Increments Aggregator's download statistics
     pub async fn add_statistics(&self, snapshot: &Snapshot) -> StdResult<()> {
         let url = "statistics/snapshot";
-        let json = serde_json::to_string(snapshot)?;
+        let snapshot_download_message = ToSnapshotDownloadMessageAdapter::adapt(snapshot);
+        let json = serde_json::to_string(&snapshot_download_message)?;
         let _response = self.http_client.post_content(url, &json).await?;
 
         Ok(())