user tenant_id

backend/src/bin/admin.rs

@@ -20,7 +20,7 @@ use backend::{
 
 static QUICKWIT_INDEX_TEMPLATE: Lazy<serde_json::Value> = Lazy::new(|| {
     json!({
-      "version": 0.8,
+      "version": "0.8",
       "index_id": "documents",
       "doc_mapping": {
         "tokenizers": [
@@ -56,7 +56,7 @@ enum Command {
 
 impl Command {
     fn usage() -> &'static str {
-        "Usage: maintenance <list-tenants|delete-assets <slug>|quickwit-create-index <slug>|quickwit-delete-index <slug>>"
+        "Usage: admin <list-tenants|delete-assets <slug>|quickwit-create-index <slug>|quickwit-delete-index <slug>>"
     }
 
     fn parse() -> Result<Self> {
@@ -81,7 +81,7 @@ impl Command {
 async fn main() -> Result<()> {
     init_tracing("info");
     let command = Command::parse()?;
-    let config = AppConfig::load_and_log("maintenance")?;
+    let config = AppConfig::load_and_log("admin")?;
     let pool = db::init_pool_with_size(&config.database_url, config.database_max_pool_size)?;
 
     match command {

backend/src/models.rs

@@ -48,7 +48,6 @@ pub struct User {
     pub password_hash: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub tenant_id: Uuid,
 }
 
 #[derive(Debug, Insertable)]
@@ -57,7 +56,6 @@ pub struct NewUser {
     pub id: Uuid,
     pub username: String,
     pub password_hash: String,
-    pub tenant_id: Uuid,
 }
 
 #[derive(Debug, Clone, Queryable, Identifiable)]

backend/src/schema.rs

@@ -183,7 +183,6 @@ diesel::table! {
         password_hash -> Varchar,
         created_at -> Timestamptz,
         updated_at -> Timestamptz,
-        tenant_id -> Uuid,
     }
 }
 
@@ -210,7 +209,6 @@ diesel::joinable!(refresh_tokens -> users (user_id));
 diesel::joinable!(tags -> tenants (tenant_id));
 diesel::joinable!(user_memberships -> tenants (tenant_id));
 diesel::joinable!(user_memberships -> users (user_id));
-diesel::joinable!(users -> tenants (tenant_id));
 
 diesel::allow_tables_to_appear_in_same_query!(
     correspondents,

backend/src/state.rs

@@ -62,12 +62,13 @@ impl AppState {
     }
 
     pub fn db_for_tenant(&self, tenant_id: Uuid) -> AppResult<PgPooledConnection> {
+        debug_assert!(!tenant_id.is_nil(), "nil tenant_id passed to db_for_tenant");
         let mut conn = self.db_unscoped()?;
         apply_tenant_guc(&mut conn, tenant_id)?;
         Ok(conn)
     }
 
-    pub fn db_unscoped(&self) -> AppResult<PgPooledConnection> {
+    pub(crate) fn db_unscoped(&self) -> AppResult<PgPooledConnection> {
         self.pool
             .get()
             .map_err(|err| AppError::internal(format!("database pool error: {err}")))