diff --git a/src/db/models/group.rs b/src/db/models/group.rs index 43393ddd..0a69aa98 100644 --- a/src/db/models/group.rs +++ b/src/db/models/group.rs @@ -488,27 +488,19 @@ impl GroupUser { }} } - pub async fn find_by_collection(collection_uuid: &str, conn: &mut DbConn) -> Vec { + pub async fn get_collection_group_users_uuid(collection_uuid: &str, conn: &mut DbConn) -> HashSet { db_run! { conn: { groups_users::table .inner_join(collections_groups::table.on( collections_groups::groups_uuid.eq(groups_users::groups_uuid) )) .filter(collections_groups::collections_uuid.eq(collection_uuid)) - .select(groups_users::all_columns) - .load::(conn) + .select(groups_users::users_organizations_uuid) + .load::(conn) .expect("Error loading group users for collection") - .from_db() }} - } - - /// returns uuid of members of collection groups - pub async fn get_collection_group_users_uuid(collection_uuid: &str, conn: &mut DbConn) -> HashSet { - GroupUser::find_by_collection(collection_uuid, conn) - .await - .iter() - .map(|u| u.users_organizations_uuid.clone()) - .collect() + .into_iter() + .collect() } pub async fn update_user_revision(&self, conn: &mut DbConn) {