github-starred/komodo
2
0
Fork 1
mirror of https://github.com/moghtech/komodo.git synced 2026-03-11 17:44:19 -05:00
Code Issues 258 Packages Projects Releases 10 Wiki Activity

ResourceQuery.names supports names or ids

Browse Source
This commit is contained in:
mbecker20
2025-10-23 11:23:37 -07:00
parent 5a3621b02e
commit 0bd15fc442
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
client/core/rs/src/entities/resource.rs
View File

@@ -1,4 +1,6 @@
use bson::{Document, doc};
use std::str::FromStr;
use bson::{Document, doc, oid::ObjectId};
use clap::ValueEnum;
use derive_builder::Builder;
use derive_default_builder::DefaultBuilder;
@@ -166,8 +168,12 @@ impl AddFilters for () {}
impl<T: AddFilters + Default> AddFilters for ResourceQuery<T> {
fn add_filters(&self, filters: &mut Document) {
if !self.names.is_empty() {
filters.insert("name", doc! { "$in": &self.names });
let (ids, names) = split_names(&self.names);
if !ids.is_empty() {
filters.insert("_id", doc! { "$in": ids });
}
if !names.is_empty() {
filters.insert("name", doc! { "$in": names });
}
match self.templates {
TemplatesQueryBehavior::Exclude => {
@@ -198,3 +204,18 @@ impl<T: AddFilters + Default> AddFilters for ResourceQuery<T> {
self.specific.add_filters(filters);
}
}
/// Returns (ids, names)
fn split_names(
names_or_ids: &[String],
) -> (Vec<ObjectId>, Vec<&String>) {
let mut ids = Vec::new();
let mut names = Vec::new();
for name in names_or_ids {
match ObjectId::from_str(name) {
Ok(id) => ids.push(id),
Err(_) => names.push(name),
}
}
(ids, names)
}