Updates: Coderabbit suggestions and validations

Author: parmesant

src/alerts/mod.rs

@@ -535,10 +535,10 @@ pub struct AlertRequest {
 
 impl AlertRequest {
     pub async fn into(self) -> Result<AlertConfig, AlertError> {
-        // let mut targets = Vec::new();
-        // for id in self.targets {
-        //     targets.push(TARGETS.get_target_by_id(id).await?);
-        // }
+        // Validate that all target IDs exist
+        for id in &self.targets {
+            TARGETS.get_target_by_id(id).await?;
+        }
         let config = AlertConfig {
             version: AlertVerison::from(CURRENT_ALERTS_VERSION),
             id: Ulid::new(),
@@ -575,10 +575,10 @@ pub struct AlertConfig {
 
 impl AlertConfig {
     pub async fn modify(&mut self, alert: AlertRequest) -> Result<(), AlertError> {
-        // let mut targets = Vec::new();
-        // for id in alert.targets {
-        //     targets.push(id);
-        // }
+        // Validate that all target IDs exist
+        for id in &alert.targets {
+            TARGETS.get_target_by_id(id).await?;
+        }
         self.title = alert.title;
         self.stream = alert.stream;
         self.alert_type = alert.alert_type;
@@ -853,6 +853,8 @@ pub enum AlertError {
     FromStrError(#[from] FromStrError),
     #[error("Invalid Target ID- {0}")]
     InvalidTargetID(String),
+    #[error("Target already exists")]
+    DuplicateTargetConfig,
 }
 
 impl actix_web::ResponseError for AlertError {
@@ -871,6 +873,7 @@ impl actix_web::ResponseError for AlertError {
             Self::InvalidAlertModifyRequest => StatusCode::BAD_REQUEST,
             Self::FromStrError(_) => StatusCode::BAD_REQUEST,
             Self::InvalidTargetID(_) => StatusCode::BAD_REQUEST,
+            Self::DuplicateTargetConfig => StatusCode::BAD_REQUEST,
         }
     }
 

src/alerts/target.rs

@@ -98,7 +98,7 @@ impl TargetConfigs {
     }
 }
 
-#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, Copy, serde::Serialize, serde::Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 #[serde(untagged)]
 pub enum Retry {
@@ -125,9 +125,19 @@ pub struct Target {
 }
 
 impl Target {
-    pub async fn validate(&self) {
+    pub async fn validate(&self) -> Result<(), AlertError> {
         // just check for liveness
         // what if the target is not live yet but is added by the user?
+        let targets = TARGETS.list().await?;
+        for target in targets {
+            if target.target == self.target
+                && target.timeout.interval == self.timeout.interval
+                && target.timeout.times == self.timeout.times
+            {
+                return Err(AlertError::DuplicateTargetConfig);
+            }
+        }
+        Ok(())
     }
 
     pub fn call(&self, context: Context) {

src/handlers/http/targets.rs

@@ -20,7 +20,7 @@ pub async fn post(
     Json(target): Json<Target>,
 ) -> Result<impl Responder, AlertError> {
     // should check for duplicacy and liveness (??)
-    target.validate().await;
+    target.validate().await?;
 
     let path = target_json_path(target.id);
 
@@ -64,8 +64,9 @@ pub async fn update(
 
     // esnure that the supplied target id is assigned to the target config
     target.id = target_id;
+
     // should check for duplicacy and liveness (??)
-    target.validate().await;
+    target.validate().await?;
 
     let path = target_json_path(target.id);
 
@@ -88,5 +89,10 @@ pub async fn delete(
 
     let target = TARGETS.delete(&target_id).await?;
 
+    let path = target_json_path(target.id);
+
+    let store = PARSEABLE.storage.get_object_store();
+    store.delete_object(&path).await?;
+
     Ok(web::Json(target))
 }