Some initial work on organizations, nothing works yet

src/db/models/org/collection.rs

@@ -0,0 +1,73 @@
+use chrono::{NaiveDateTime, Utc};
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+use super::Organization;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
+#[table_name = "collections"]
+#[belongs_to(Organization, foreign_key = "org_uuid")]
+#[primary_key(uuid)]
+pub struct Collection {
+    pub uuid: String,
+    pub org_uuid: String,
+    pub name: String,
+}
+
+/// Local methods
+impl Collection {
+    pub fn new(org_uuid: String, name: String) -> Self {
+        let now = Utc::now().naive_utc();
+
+        Self {
+            uuid: Uuid::new_v4().to_string(),
+
+            org_uuid,
+            name,
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        json!({
+            "Id": self.uuid,
+            "OrganizationId": self.org_uuid,
+            "Name": self.name,
+            "Object": "collection",
+        })
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::collections;
+
+/// Database methods
+impl Collection {
+    pub fn save(&mut self, conn: &DbConn) -> bool {
+        self.updated_at = Utc::now().naive_utc();
+
+        match diesel::replace_into(collections::table)
+            .values(&*self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(collections::table.filter(
+            collections::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {
+        collections::table
+            .filter(collections::uuid.eq(uuid))
+            .first::<Self>(&**conn).ok()
+    }
+}

src/db/models/org/organization.rs

@@ -0,0 +1,116 @@
+use chrono::{NaiveDateTime, Utc};
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+#[derive(Debug, Identifiable, Queryable, Insertable)]
+#[table_name = "organizations"]
+#[primary_key(uuid)]
+pub struct Organization {
+    pub uuid: String,
+    pub name: String,
+    pub billing_email: String,
+
+    pub key: String,
+}
+
+/// Local methods
+impl Organization {
+    pub fn new(name: String, billing_email: String, key: String) -> Self {
+        let now = Utc::now().naive_utc();
+
+        Self {
+            uuid: Uuid::new_v4().to_string(),
+
+            name,
+            billing_email,
+            key,
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        json!({
+            "Id": self.uuid,
+            "Name": self.name,
+
+            "BusinessName": null,
+            "BusinessAddress1":	null,
+            "BusinessAddress2":	null,
+            "BusinessAddress3":	null,
+            "BusinessCountry": null,
+            "BusinessTaxNumber": null,
+            "BillingEmail":self.billing_email,
+            "Plan": "Free",
+            "PlanType": 0, // Free plan
+
+            "Seats": 10,
+            "MaxCollections": 10,
+
+            "UseGroups": false,
+            "UseDirectory": false,
+            "UseEvents": false,
+            "UseTotp": false,
+
+            "Object": "organization",
+        })
+    }
+
+    pub fn to_json_profile(&self) -> JsonValue {
+        json!({
+            "Id": self.uuid,
+            "Name": self.name,
+
+            "Seats": 10,
+            "MaxCollections": 10,
+
+            "UseGroups": false,
+            "UseDirectory": false,
+            "UseEvents": false,
+            "UseTotp": false,
+
+            "MaxStorageGb": null,
+
+            // These are probably per user
+            "Key": self.key,
+            "Status": 2, // Confirmed
+            "Type": 0, // Owner
+            "Enabled": true,
+
+            "Object": "profileOrganization",
+        })
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::organizations;
+
+/// Database methods
+impl Organization {
+    pub fn save(&mut self, conn: &DbConn) -> bool {
+        self.updated_at = Utc::now().naive_utc();
+
+        match diesel::replace_into(organizations::table)
+            .values(&*self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(organizations::table.filter(
+            organizations::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {
+        organizations::table
+            .filter(organizations::uuid.eq(uuid))
+            .first::<Self>(&**conn).ok()
+    }
+}

src/db/schema.rs

@@ -22,6 +22,14 @@ table! {
     }
 }
 
+table! {
+    collections (uuid) {
+        uuid -> Text,
+        org_uuid -> Text,
+        name -> Text,
+    }
+}
+
 table! {
     devices (uuid) {
         uuid -> Text,
@@ -46,6 +54,14 @@ table! {
     }
 }
 
+table! {
+    organizations (uuid) {
+        uuid -> Text,
+        name -> Text,
+        billing_email -> Text,
+    }
+}
+
 table! {
     users (uuid) {
         uuid -> Text,
@@ -68,16 +84,43 @@ table! {
     }
 }
 
+table! {
+    users_collections (user_uuid, collection_uuid) {
+        user_uuid -> Text,
+        collection_uuid -> Text,
+    }
+}
+
+table! {
+    users_organizations (user_uuid, org_uuid) {
+        user_uuid -> Text,
+        org_uuid -> Text,
+        key -> Text,
+        status -> Integer,
+        #[sql_name = "type"]
+        type_ -> Integer,
+    }
+}
+
 joinable!(attachments -> ciphers (cipher_uuid));
 joinable!(ciphers -> folders (folder_uuid));
 joinable!(ciphers -> users (user_uuid));
+joinable!(collections -> organizations (org_uuid));
 joinable!(devices -> users (user_uuid));
 joinable!(folders -> users (user_uuid));
+joinable!(users_collections -> collections (collection_uuid));
+joinable!(users_collections -> users (user_uuid));
+joinable!(users_organizations -> organizations (org_uuid));
+joinable!(users_organizations -> users (user_uuid));
 
 allow_tables_to_appear_in_same_query!(
     attachments,
     ciphers,
+    collections,
     devices,
     folders,
+    organizations,
     users,
+    users_collections,
+    users_organizations,
 );