add data path to dataset update and fix camel case in getting dataset data path

Author: michaelmattig

services/src/api/handlers/datasets.rs

@@ -670,6 +670,11 @@ pub async fn update_dataset_handler<C: ApplicationContext>(
         })
         .context(CannotLoadDatasetForUpdate)?;
 
+    // TODO: if the data_path is changed, validate that
+    // - it exists
+    // - it is accessible
+    // - all files referenced by the dataset still exist?
+
     session_ctx
         .update_dataset(dataset_id, update.into_inner())
         .await
@@ -1807,7 +1812,10 @@ mod tests {
         },
         raster::{GridShape2D, TilingSpecification},
         spatial_reference::SpatialReferenceOption,
-        util::{assert_image_equals, test::assert_eq_two_list_of_tiles},
+        util::{
+            assert_image_equals,
+            test::{TestDefault, assert_eq_two_list_of_tiles},
+        },
     };
     use geoengine_operators::{
         engine::{
@@ -3250,6 +3258,7 @@ mod tests {
             display_name: "new display name".to_string(),
             description: "new description".to_string(),
             tags: vec!["foo".to_string(), "bar".to_string()],
+            data_path: Some(DataPath::test_default()),
         };
 
         let req = actix_web::test::TestRequest::post()
@@ -3268,6 +3277,7 @@ mod tests {
         assert_eq!(dataset.display_name, update.display_name);
         assert_eq!(dataset.description, update.description);
         assert_eq!(dataset.tags, Some(update.tags));
+        assert_eq!(dataset.data_path, update.data_path);
 
         Ok(())
     }

services/src/api/model/services.rs

@@ -156,7 +156,7 @@ pub struct CreateDataset {
     pub definition: DatasetDefinition,
 }
 
-#[derive(Deserialize, Serialize, Debug, Clone, ToSchema)]
+#[derive(Deserialize, Serialize, Debug, Clone, ToSchema, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub enum DataPath {
     Volume(VolumeName),
@@ -170,14 +170,15 @@ impl TestDefault for DataPath {
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone, ToSchema, Validate)]
+#[serde(rename_all = "camelCase")]
 pub struct UpdateDataset {
     pub name: DatasetName,
     #[validate(length(min = 1))]
     pub display_name: String,
     pub description: String,
     #[validate(custom(function = "validate_tags"))]
     pub tags: Vec<String>,
-    // TODO: result descriptor update? or change the model so that the result descriptor is only part of the metadata
+    pub data_path: Option<DataPath>, // TODO: make mandatory
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Eq, Debug, Clone, ToSchema, Validate)]

services/src/datasets/postgres.rs

@@ -1171,13 +1171,14 @@ where
             .boxed_context(crate::error::PermissionDb)?;
 
         tx.execute(
-            "UPDATE datasets SET name = $2, display_name = $3, description = $4, tags = $5 WHERE id = $1;",
+            "UPDATE datasets SET name = $2, display_name = $3, description = $4, tags = $5, data_path = $6 WHERE id = $1;",
             &[
                 &dataset,
                 &update.name,
                 &update.display_name,
                 &update.description,
                 &update.tags,
+                &update.data_path,
             ],
         )
         .await?;