Support listing and deleting users from collection

src/db/models/collection.rs

@@ -188,14 +188,26 @@ impl CollectionUser {
         )).execute(&**conn).and(Ok(()))
     }
 
-    pub fn delete(user_uuid: &str, collection_uuid: &str, conn: &DbConn) -> bool {
-        match diesel::delete(users_collections::table
-            .filter(users_collections::user_uuid.eq(user_uuid))
-            .filter(users_collections::collection_uuid.eq(collection_uuid)))
-            .execute(&**conn) {
-            Ok(1) => true, // One row deleted
-            _ => false,
-        }
+    pub fn delete(self, conn: &DbConn) -> QueryResult<()> {
+        diesel::delete(users_collections::table
+        .filter(users_collections::user_uuid.eq(&self.user_uuid))
+        .filter(users_collections::collection_uuid.eq(&self.collection_uuid)))
+        .execute(&**conn).and(Ok(()))
+    }
+
+    pub fn find_by_collection(collection_uuid: &str, conn: &DbConn) -> Vec<Self> {
+        users_collections::table
+        .filter(users_collections::collection_uuid.eq(collection_uuid))
+        .select(users_collections::all_columns)
+        .load::<Self>(&**conn).expect("Error loading users_collections")
+    }
+
+    pub fn find_by_collection_and_user(collection_uuid: &str, user_uuid: &str, conn: &DbConn) -> Option<Self> {
+        users_collections::table
+        .filter(users_collections::collection_uuid.eq(collection_uuid))
+        .filter(users_collections::user_uuid.eq(user_uuid))
+        .select(users_collections::all_columns)
+        .first::<Self>(&**conn).ok()
     }
 
     pub fn delete_all_by_collection(collection_uuid: &str, conn: &DbConn) -> QueryResult<()> {

src/db/models/organization.rs

@@ -189,6 +189,22 @@ impl UserOrganization {
         })
     }
 
+    pub fn to_json_collection_user_details(&self, read_only: &bool, conn: &DbConn) -> JsonValue {
+        use super::User;
+        let user = User::find_by_uuid(&self.user_uuid, conn).unwrap();
+
+        json!({
+            "OrganizationUserId": self.uuid,
+            "AccessAll": self.access_all,
+            "Name": user.name,
+            "Email": user.email,
+            "Type": self.type_,
+            "Status": self.status,
+            "ReadOnly": read_only,
+            "Object": "collectionUser",
+        })
+    }
+
     pub fn to_json_details(&self, conn: &DbConn) -> JsonValue {        
         let coll_uuids = if self.access_all { 
             vec![] // If we have complete access, no need to fill the array