From 54f54ee8450acec8b3eb1e10532eff101823ac32 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Mon, 1 Oct 2018 16:52:36 +0100 Subject: [PATCH] Update revision for users on collection save --- src/db/models/collection.rs | 19 ++++++++++++------- src/db/models/organization.rs | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs index 2bf116c5..ddc4d2e9 100644 --- a/src/db/models/collection.rs +++ b/src/db/models/collection.rs @@ -42,13 +42,18 @@ use db::schema::*; /// Database methods impl Collection { - pub fn save(&mut self, conn: &DbConn) -> bool { - match diesel::replace_into(collections::table) - .values(&*self) - .execute(&**conn) { - Ok(1) => true, // One row inserted - _ => false, - } + pub fn save(&mut self, conn: &DbConn) -> QueryResult<()> { + // Update affected users revision + UserOrganization::find_by_collection_and_org(&self.uuid, &self.org_uuid, conn) + .iter() + .for_each(|user_org| { + User::update_uuid_revision(&user_org.user_uuid, conn); + }); + + diesel::replace_into(collections::table) + .values(&*self) + .execute(&**conn) + .and(Ok(())) } pub fn delete(self, conn: &DbConn) -> QueryResult<()> { diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs index 7f1d297b..9dd9cc99 100644 --- a/src/db/models/organization.rs +++ b/src/db/models/organization.rs @@ -331,6 +331,22 @@ impl UserOrganization { .select(users_organizations::all_columns) .load::(&**conn).expect("Error loading user organizations") } + + pub fn find_by_collection_and_org(collection_uuid: &str, org_uuid: &str, conn: &DbConn) -> Vec { + users_organizations::table + .filter(users_organizations::org_uuid.eq(org_uuid)) + .left_join(users_collections::table.on( + users_collections::user_uuid.eq(users_organizations::user_uuid) + )) + .filter( + users_organizations::access_all.eq(true).or( // AccessAll.. + users_collections::collection_uuid.eq(&collection_uuid) // ..or access to collection with cipher + ) + ) + .select(users_organizations::all_columns) + .load::(&**conn).expect("Error loading user organizations") + } + }