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

content_not_starts_with #88

Merged
merged 1 commit into from
Jul 4, 2024
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
2 changes: 2 additions & 0 deletions zomes/trust_atom/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ pub fn query(input: QueryInput) -> ExternResult<Vec<TrustAtom>> {
input.target,
input.content_full,
input.content_starts_with,
input.content_not_starts_with,
input.value_starts_with,
)
}
Expand All @@ -96,6 +97,7 @@ pub fn query_mine(input: QueryMineInput) -> ExternResult<Vec<TrustAtom>> {
input.target,
input.content_full,
input.content_starts_with,
input.content_not_starts_with,
input.value_starts_with,
)
}
Expand Down
48 changes: 40 additions & 8 deletions zomes/trust_atom/src/trust_atom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ pub fn query_mine(
target: Option<AnyLinkableHash>,
content_full: Option<String>,
content_starts_with: Option<String>,
content_not_starts_with: Option<String>,
value_starts_with: Option<String>,
) -> ExternResult<Vec<TrustAtom>> {
let agent_address = AnyLinkableHash::from(agent_info()?.agent_initial_pubkey);
Expand All @@ -189,6 +190,7 @@ pub fn query_mine(
target,
content_full,
content_starts_with,
content_not_starts_with,
value_starts_with,
)?;

Expand All @@ -204,6 +206,7 @@ pub fn query(
target: Option<AnyLinkableHash>,
content_full: Option<String>,
content_starts_with: Option<String>,
content_not_starts_with: Option<String>,
value_starts_with: Option<String>,
) -> ExternResult<Vec<TrustAtom>> {
let (link_direction, link_base) = match (source, target) {
Expand All @@ -217,27 +220,56 @@ pub fn query(
}
};

if let Some(content_not_starts_with_string) = content_not_starts_with {
if content_full.is_some() || content_starts_with.is_some() || value_starts_with.is_some() {
return Err(wasm_error!(
"Passing content_not_starts_with means content_full, content_starts_with, and value_starts_with must all be None"
));
}
let links = get_links(link_base.clone(), LinkTypes::TrustAtom, None)?;
let trust_atoms = convert_links_to_trust_atoms(links, &link_direction, link_base)?;
let filtered_trust_atoms = trust_atoms
.into_iter()
.filter(|trust_atom| {
let content_option = trust_atom.content.clone();
if let Some(content) = content_option {
if content.starts_with(content_not_starts_with_string.as_str()) {
return false;
}
}
true
})
.collect();
return Ok(filtered_trust_atoms);
}

let link_tag = match (content_full, content_starts_with, value_starts_with) {
(Some(_content_full), Some(_content_starts_with), _) => {
return Err(wasm_error!("Only one of `content_full` or `content_starts_with` can be used"))
},
return Err(wasm_error!(
"Only one of `content_full` or `content_starts_with` can be used"
))
}
(_, Some(_content_starts_with), Some(_value_starts_with)) => {
return Err(wasm_error!(
"Cannot use `value_starts_with` and `content_starts_with` arguments together; maybe try `content_full` instead?",
))
},
));
}
(Some(content_full), None, Some(value_starts_with)) => Some(create_link_tag(
&link_direction,
&[Some(content_full), Some(value_starts_with)],
)),
(Some(content_full), None, None) => {
Some(create_link_tag_metal(&link_direction, vec![content_full, UNICODE_NUL_STR.to_string()]))
},
(Some(content_full), None, None) => Some(create_link_tag_metal(
&link_direction,
vec![content_full, UNICODE_NUL_STR.to_string()],
)),
(None, Some(content_starts_with), None) => Some(create_link_tag(
&link_direction,
&[Some(content_starts_with)],
)),
(None, None, Some(value_starts_with)) => Some(create_link_tag(&link_direction, &[Some(value_starts_with)])),
(None, None, Some(value_starts_with)) => Some(create_link_tag(
&link_direction,
&[None, Some(value_starts_with)],
)),
(None, None, None) => None,
};
let links = get_links(link_base.clone(), LinkTypes::TrustAtom, link_tag)?;
Expand Down
Loading
Loading