Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api): all roundtripping entitydef regex pattens #358

Merged
merged 2 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased
- Fix a typo in get datasets docs
- Allow for round tripping regex pattens in entity defs
- Don't round trip field ids due to new server side matching logic

# v0.36.2
Expand Down
33 changes: 33 additions & 0 deletions api/src/resources/entity_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,37 @@ pub struct EntityDef {
#[serde(default)]
#[serde(rename = "_entity_def_flags")]
pub entity_def_flags: Vec<EntityDefFlag>,
#[serde(skip_serializing_if = "Option::is_none")]
pub rules: Option<EntityDefRuleSet>,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
pub struct EntityDefRuleSet {
#[serde(skip_serializing_if = "Option::is_none")]
regex: Option<RegexPattern>,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
#[serde(untagged)]
pub enum RegexPattern {
EntityTemplatesProperty(EntityTemplatesProperty),
LegacyEntityPatten(LegacyEntityPattern),
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
pub struct LegacyEntityPattern {
pub pattern: String,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
pub struct EntityTemplatesProperty {
templates: Vec<EntityTemplateProperty>,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
pub struct EntityTemplateProperty {
template: String,
pattern: String,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
Expand All @@ -34,6 +65,8 @@ pub struct NewEntityDef {
#[serde(rename = "_entity_def_flags")]
#[serde(default)]
pub entity_def_flags: Vec<EntityDefFlag>,
#[serde(skip_serializing_if = "Option::is_none")]
pub rules: Option<EntityDefRuleSet>,
}

#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq)]
Expand Down
Loading