Update revision for users on collection save

This commit is contained in:
Miroslav Prasil 2018-10-01 16:52:36 +01:00
parent 015bd28cc2
commit 54f54ee845
2 changed files with 28 additions and 7 deletions

View File

@ -42,13 +42,18 @@ use db::schema::*;
/// Database methods /// Database methods
impl Collection { impl Collection {
pub fn save(&mut self, conn: &DbConn) -> bool { pub fn save(&mut self, conn: &DbConn) -> QueryResult<()> {
match diesel::replace_into(collections::table) // Update affected users revision
.values(&*self) UserOrganization::find_by_collection_and_org(&self.uuid, &self.org_uuid, conn)
.execute(&**conn) { .iter()
Ok(1) => true, // One row inserted .for_each(|user_org| {
_ => false, 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<()> { pub fn delete(self, conn: &DbConn) -> QueryResult<()> {

View File

@ -331,6 +331,22 @@ impl UserOrganization {
.select(users_organizations::all_columns) .select(users_organizations::all_columns)
.load::<Self>(&**conn).expect("Error loading user organizations") .load::<Self>(&**conn).expect("Error loading user organizations")
} }
pub fn find_by_collection_and_org(collection_uuid: &str, org_uuid: &str, conn: &DbConn) -> Vec<Self> {
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::<Self>(&**conn).expect("Error loading user organizations")
}
} }