World's first open-source enterprise world model.
Rust agent-memorybitemporalgraphragknowledge-baseknowledge-graphllmontologypgvectorpostgresqlragrustself-hostedsemantic-searchtemporal-knowledge-graphworld-model
Apply the creation name limits before updating a rule (#812)
Maya Kid70308586e93a
diff --git a/crates/utopia-store/src/business_rules.rs b/crates/utopia-store/src/business_rules.rsindex 1d9bbf65..ddf71bf1 100644--- a/crates/utopia-store/src/business_rules.rs+++ b/crates/utopia-store/src/business_rules.rs@@ -93,6 +93,17 @@ pub struct ConditionInput {pub operand: Option<serde_json::Value>,}+fn validate_name(name: &str) -> AppResult<&str> {+ let name = name.trim();+ if name.is_empty() || name.chars().count() > 80 {+ return Err(AppError::invalid(+ "bad_rule_name",+ "A rule needs a name of 1-80 characters.",+ ));+ }+ Ok(name)+}+/// 建一条规则。**校验在这里做完**:条件的 op 与操作数形状、谓词必须是属性、/// 结论的两种形状各自完整——库里的 CHECK 是最后一道,报错信息却是给人看的。#[allow(clippy::too_many_arguments)]@@ -110,13 +121,7 @@ pub async fn create(conclude_expr: Option<serde_json::Value>,conditions: &[ConditionInput],) -> AppResult<Uuid> {- let name = name.trim();- if name.is_empty() || name.chars().count() > 80 {- return Err(AppError::invalid(- "bad_rule_name",- "A rule needs a name of 1-80 characters.",- ));- }+ let name = validate_name(name)?;if conditions.is_empty() {// 空合取恒真,会把整个类归进去——挡在入口比在求值器里默默不推更早return Err(AppError::invalid(@@ -207,6 +212,7 @@ pub async fn update(conditions: Option<&[ConditionInput]>,conclusion: Option<&ConclusionInput>,) -> AppResult<()> {+ let name = name.map(validate_name).transpose()?;if let Some(cs) = conditions {if cs.is_empty() {return Err(AppError::invalid(@@ -238,7 +244,7 @@ pub async fn update().bind(kb_id).bind(rule_id)- .bind(name.map(str::trim))+ .bind(name).bind(description.map(str::trim)).bind(enabled).bind(conclusion.map(|c| c.kind.as_str()))diff --git a/crates/utopia-store/tests/a_rule_concludes_a_type.rs b/crates/utopia-store/tests/a_rule_concludes_a_type.rsindex 0fdc47a6..2af1087b 100644--- a/crates/utopia-store/tests/a_rule_concludes_a_type.rs+++ b/crates/utopia-store/tests/a_rule_concludes_a_type.rs@@ -853,3 +853,117 @@ async fn a_rule_that_says_not_one_of_is_not_silently_skipped() -> anyhow::Result.await?;run}++#[tokio::test]+async fn renaming_a_rule_uses_the_creation_name_limits_before_any_write() -> anyhow::Result<()> {+ use utopia_store::business_rules::{self, ConclusionInput, ConditionInput};+ let Some(url) = utopia_store::test_db::url() else {+ return Ok(());+ };+ let pool = PgPool::connect(&url).await?;+ utopia_store::db::migrate(&pool).await?;+ let f = seed(&pool).await?;+ let conditions = [ConditionInput {+ group: 0,+ predicate_id: f.thc,+ op: "gt".into(),+ operand: Some(serde_json::json!(5)),+ }];+ let id = business_rules::create(+ &pool,+ f.kb,+ "original",+ "",+ f.well,+ "typing",+ Some(f.gas_bearing),+ None,+ None,+ None,+ &conditions,+ )+ .await?;+ let changed = [ConditionInput {+ group: 9,+ predicate_id: f.thc,+ op: "lt".into(),+ operand: Some(serde_json::json!(10)),+ }];+ let conclusion = ConclusionInput {+ kind: "attribute".into(),+ type_id: None,+ predicate_id: Some(f.category),+ value: Some(serde_json::json!({"value":"changed"})),+ expr: None,+ };+ for invalid in [+ String::new(),+ " \t\n ".into(),+ "a".repeat(81),+ "界".repeat(81),+ ] {+ let before = business_rules::list(&pool, f.kb).await?;+ let result = business_rules::update(+ &pool,+ f.kb,+ id,+ Some(&invalid),+ Some("changed"),+ Some(false),+ Some(&changed),+ Some(&conclusion),+ )+ .await;+ assert!(+ matches!(+ result,+ Err(utopia_core::AppError::Invalid {+ code: "bad_rule_name",+ ..+ })+ ),+ "invalid name {:?}: {:?}",+ invalid,+ result+ );+ assert_eq!(+ business_rules::list(&pool, f.kb).await?,+ before,+ "a rejected combined update must leave name, conditions and conclusion unchanged"+ );+ }+ for valid in ["a".repeat(80), "界".repeat(80), " trimmed ".into()] {+ business_rules::update(&pool, f.kb, id, Some(&valid), None, None, None, None).await?;+ let rows = business_rules::list(&pool, f.kb).await?;+ assert_eq!(rows[0]["name"], valid.trim());+ // Saving the same name remains valid.+ business_rules::update(&pool, f.kb, id, Some(&valid), None, None, None, None).await?;+ }+ business_rules::update(+ &pool,+ f.kb,+ id,+ None,+ Some("changed"),+ Some(false),+ Some(&changed),+ Some(&conclusion),+ )+ .await?;+ let rows = business_rules::list(&pool, f.kb).await?;+ assert_eq!(rows[0]["name"], "trimmed");+ assert_eq!(rows[0]["description"], "changed");+ assert_eq!(rows[0]["enabled"], false);+ assert_eq!(rows[0]["conditions"][0]["group"], 9);+ assert_eq!(rows[0]["conditions"][0]["op"], "lt");+ assert_eq!(rows[0]["conclusion"], "attribute");+ assert_eq!(+ rows[0]["conclude_value"],+ serde_json::json!({"value":"changed"})+ );+ sqlx::query("DELETE FROM organizations WHERE id=$1")+ .bind(f.org)+ .execute(&pool)+ .await?;+ Ok(())+}