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.

Sign up for GitHub

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

Jump to bottom

enhance testing around cyclonedx ingestion #937

Closed
wants to merge 1 commit into from
Closed

enhance testing around cyclonedx ingestion #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 54 additions & 7 deletions common/src/db/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use chrono::{Local, NaiveDateTime};
use human_date_parser::{from_human_time, ParseResult};
use regex::Regex;
use sea_orm::entity::ColumnDef;
Expand Down Expand Up @@ -105,6 +106,7 @@ impl Query {
..
} => context
.values()
.filter(|v| matches!(v, Value::String(_)))
.any(|field| vs.iter().any(|v| field.contains(v))),
_ => false,
}
Expand Down Expand Up @@ -245,6 +247,7 @@ impl Value<'_> {
pub fn contains(&self, pat: &str) -> bool {
match self {
Self::String(s) => s.contains(pat),
Self::Date(d) => d.to_string().contains(pat),
_ => false,
}
}
Expand All @@ -262,7 +265,25 @@ impl PartialEq<String> for Value<'_> {
Ok(i) => v.eq(&i),
_ => false,
},
Self::Date(_) => false, // impractical, given the granularity
Self::Date(v) => match from_human_time(&v.to_string()) {
Ok(ParseResult::DateTime(field)) => match from_human_time(rhs) {
Ok(ParseResult::DateTime(other)) => field.eq(&other),
Ok(ParseResult::Date(d)) => {
let other = NaiveDateTime::new(d, field.time())
.and_local_timezone(Local)
.unwrap();
field.eq(&other)
}
Ok(ParseResult::Time(t)) => {
let other = NaiveDateTime::new(field.date_naive(), t)
.and_local_timezone(Local)
.unwrap();
field.eq(&other)
}
_ => false,
},
_ => false,
},
}
}
}
Expand All @@ -280,13 +301,22 @@ impl PartialOrd<String> for Value<'_> {
_ => None,
},
Self::Date(v) => match from_human_time(&v.to_string()) {
Ok(ParseResult::DateTime(field)) => {
if let Ok(ParseResult::DateTime(other)) = from_human_time(rhs) {
Ok(ParseResult::DateTime(field)) => match from_human_time(rhs) {
Ok(ParseResult::DateTime(other)) => field.partial_cmp(&other),
Ok(ParseResult::Date(d)) => {
let other = NaiveDateTime::new(d, field.time())
.and_local_timezone(Local)
.unwrap();
field.partial_cmp(&other)
} else {
None
}
}
Ok(ParseResult::Time(t)) => {
let other = NaiveDateTime::new(field.date_naive(), t)
.and_local_timezone(Local)
.unwrap();
field.partial_cmp(&other)
}
_ => None,
},
_ => None,
},
}
Expand Down Expand Up @@ -1132,20 +1162,37 @@ mod tests {

#[test(tokio::test)]
async fn apply_to_context() -> Result<(), anyhow::Error> {
use time::format_description::well_known::Rfc2822;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused, should we use Rfc3339 instead ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for different reasons - I'm confused as well as my commit/PR did not contain this - I believe this was in @jcrossley3 previous PR ... not sure what git/github is doing here as I had updated my branch before raising this PR.

As for your specific question you will have to follow up with @jcrossley3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any ol' format will do. I just needed a hardcoded date. It's only used for creating a test fixture.

let now = time::OffsetDateTime::now_utc();
let then = OffsetDateTime::parse("Sat, 12 Jun 1993 13:25:19 GMT", &Rfc2822)?;
let context = HashMap::from([
("id", Value::String("foo")),
("count", Value::Int(42)),
("score", Value::Float(6.66)),
("detected", Value::Date(&then)),
("published", Value::Date(&now)),
]);
assert!(q("oo|aa|bb&count<100&count>10&id=foo").apply(&context));
assert!(q("score=6.66").apply(&context));
assert!(q("count>=42&count<=42").apply(&context));
assert!(q("published>2 days ago&published<in 1 week").apply(&context));
assert!(q("published>2 days ago&published<next week").apply(&context));

assert!(q("detected=1993-06-12").apply(&context));
assert!(q("detected>13:20:00").apply(&context));
assert!(q("detected~1993").apply(&context));
assert!(!q("1993").apply(&context));

assert!(q(&format!("published={}", now)).apply(&context));
assert!(q(&format!("published={}", now.date())).apply(&context));
assert!(q(&format!("published={}", now.time())).apply(&context));
assert!(q(&format!("published>=today {}", now.time())).apply(&context));
assert!(q(&format!("published>={}", now)).apply(&context));
assert!(q(&format!("published<={}", now.date())).apply(&context));
assert!(q(&format!("published~{}", now.time())).apply(&context));

Ok(())
}

/////////////////////////////////////////////////////////////////////////
// Test helpers
/////////////////////////////////////////////////////////////////////////
Expand Down
Loading