From 319984034a5079e594bd51690db22dc1c425593c Mon Sep 17 00:00:00 2001
From: dal <dallin@buster.so>
Date: Fri, 4 Apr 2025 14:16:14 -0600
Subject: [PATCH] update sharing with public_expiry_date

---
 .../src/dashboards/sharing/update_sharing_handler.rs |  6 +++---
 .../src/metrics/sharing/update_sharing_handler.rs    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/libs/handlers/src/dashboards/sharing/update_sharing_handler.rs b/api/libs/handlers/src/dashboards/sharing/update_sharing_handler.rs
index 6d73589ff..b75d32347 100644
--- a/api/libs/handlers/src/dashboards/sharing/update_sharing_handler.rs
+++ b/api/libs/handlers/src/dashboards/sharing/update_sharing_handler.rs
@@ -33,7 +33,7 @@ pub struct UpdateDashboardSharingRequest {
     /// Password for public access (if null, will clear existing password)
     pub public_password: Option<Option<String>>,
     /// Expiration date for public access (if null, will clear existing expiration)
-    pub public_expiration: Option<Option<DateTime<Utc>>>,
+    pub public_expiry_date: Option<Option<DateTime<Utc>>>,
 }
 
 /// Updates sharing permissions for a dashboard
@@ -123,7 +123,7 @@ pub async fn update_dashboard_sharing_handler(
 
     // Update public access settings if provided
     if request.publicly_accessible.is_some() || 
-       request.public_expiration.is_some() {
+       request.public_expiry_date.is_some() {
         
         let dashboard_file = dashboard_with_permission.dashboard_file;
         let pool = database::pool::get_pg_pool();
@@ -141,7 +141,7 @@ pub async fn update_dashboard_sharing_handler(
         };
         
         // Set public_expiry_date if provided, otherwise keep the current value
-        let public_expiry_date = request.public_expiration.unwrap_or(dashboard_file.public_expiry_date);
+        let public_expiry_date = request.public_expiry_date.unwrap_or(dashboard_file.public_expiry_date);
         
         // Set publicly_accessible if provided, otherwise keep the current value
         let publicly_accessible = request.publicly_accessible.unwrap_or(dashboard_file.publicly_accessible);
diff --git a/api/libs/handlers/src/metrics/sharing/update_sharing_handler.rs b/api/libs/handlers/src/metrics/sharing/update_sharing_handler.rs
index 839891ac6..7f99126a1 100644
--- a/api/libs/handlers/src/metrics/sharing/update_sharing_handler.rs
+++ b/api/libs/handlers/src/metrics/sharing/update_sharing_handler.rs
@@ -31,7 +31,7 @@ pub struct UpdateMetricSharingRequest {
     /// Password for public access (if null, will clear existing password)
     pub public_password: Option<Option<String>>,
     /// Expiration date for public access (if null, will clear existing expiration)
-    pub public_expiration: Option<Option<DateTime<Utc>>>,
+    pub public_expiry_date: Option<Option<DateTime<Utc>>>,
 }
 
 /// Handler to update sharing permissions for a metric
@@ -115,7 +115,7 @@ pub async fn update_metric_sharing_handler(
     }
 
     // 4. Update public access settings if provided
-    if request.publicly_accessible.is_some() || request.public_expiration.is_some() {
+    if request.publicly_accessible.is_some() || request.public_expiry_date.is_some() {
         // No need to get a new connection as we already have one
 
         // Create a mutable metric record to update using the metric we already have
@@ -140,7 +140,7 @@ pub async fn update_metric_sharing_handler(
         }
 
         // Update public_expiry_date if provided
-        if let Some(public_expiration) = &request.public_expiration {
+        if let Some(public_expiration) = &request.public_expiry_date {
             info!(
                 metric_id = %metric_id,
                 "Updating public expiration for metric"
@@ -194,7 +194,7 @@ mod tests {
             }]),
             publicly_accessible: None,
             public_password: None,
-            public_expiration: None,
+            public_expiry_date: None,
         };
 
         let result = update_metric_sharing_handler(&metric_id, &user, request).await;
@@ -224,7 +224,7 @@ mod tests {
             users: None,
             publicly_accessible: Some(true),
             public_password: None,
-            public_expiration: Some(Some(Utc::now())),
+            public_expiry_date: Some(Some(Utc::now())),
         };
 
         let result = update_metric_sharing_handler(&metric_id, &user, request).await;
@@ -256,7 +256,7 @@ mod tests {
             users: None,
             publicly_accessible: Some(true),
             public_password: None,
-            public_expiration: Some(Some(Utc::now())),
+            public_expiry_date: Some(Some(Utc::now())),
         };
 
         // This test will fail in isolation as we can't easily mock the database