refactor(workspace): pass workspace object instead of id to service methods
- Replace workspace_id parameter with Workspace object reference in all workspace service methods - Remove redundant find_workspace_by_id calls that were duplicated in each method - Update all method signatures across approval, audit, billing, branding, core, settings and stats modules - Modify SQL queries to bind ws.id instead of separate workspace_id parameter - Add Workspace import to all affected modules - Adjust method calls in API handlers to pass workspace object instead of id - Consolidate workspace retrieval logic to single location per operation flow
This commit is contained in:
zhenyi
@@ -3,7 +3,7 @@ use uuid::Uuid;
|
||||
|
||||
use crate::error::AppError;
|
||||
use crate::models::common::Role;
|
||||
use crate::models::workspaces::WorkspaceDomain;
|
||||
use crate::models::workspaces::{Workspace, WorkspaceDomain};
|
||||
use crate::service::WorkspaceService;
|
||||
use crate::session::Session;
|
||||
|
||||
@@ -18,12 +18,11 @@ impl WorkspaceService {
|
||||
pub async fn workspace_domains(
|
||||
&self,
|
||||
ctx: &Session,
|
||||
workspace_id: Uuid,
|
||||
ws: &Workspace,
|
||||
limit: i64,
|
||||
offset: i64,
|
||||
) -> Result<Vec<WorkspaceDomain>, AppError> {
|
||||
let user_uid = ctx.user().ok_or(AppError::Unauthorized)?;
|
||||
let ws = self.find_workspace_by_id(workspace_id).await?;
|
||||
self.ensure_workspace_role_at_least(user_uid, &ws, Role::Admin)
|
||||
.await?;
|
||||
let (limit, offset) = clamp_limit_offset(limit, offset);
|
||||
@@ -32,7 +31,7 @@ impl WorkspaceService {
|
||||
verified_at, created_at, updated_at FROM workspace_domain \
|
||||
WHERE workspace_id = $1 ORDER BY is_primary DESC, created_at ASC LIMIT $2 OFFSET $3",
|
||||
)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.bind(limit)
|
||||
.bind(offset)
|
||||
.fetch_all(self.ctx.db.reader())
|
||||
@@ -43,11 +42,10 @@ impl WorkspaceService {
|
||||
pub async fn workspace_add_domain(
|
||||
&self,
|
||||
ctx: &Session,
|
||||
workspace_id: Uuid,
|
||||
ws: &Workspace,
|
||||
params: AddDomainParams,
|
||||
) -> Result<WorkspaceDomain, AppError> {
|
||||
let user_uid = ctx.user().ok_or(AppError::Unauthorized)?;
|
||||
let ws = self.find_workspace_by_id(workspace_id).await?;
|
||||
self.ensure_workspace_role_at_least(user_uid, &ws, Role::Admin)
|
||||
.await?;
|
||||
let domain = required_text(params.domain, "domain")?.to_lowercase();
|
||||
@@ -55,7 +53,7 @@ impl WorkspaceService {
|
||||
let is_first = sqlx::query_scalar::<_, i64>(
|
||||
"SELECT COUNT(*) FROM workspace_domain WHERE workspace_id = $1",
|
||||
)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.fetch_one(self.ctx.db.reader())
|
||||
.await
|
||||
.map_err(AppError::Database)?
|
||||
@@ -84,7 +82,7 @@ impl WorkspaceService {
|
||||
RETURNING id, workspace_id, domain, verification_token_hash, is_primary, is_verified, verified_at, created_at, updated_at",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.bind(&domain)
|
||||
.bind(&token_hash)
|
||||
.bind(is_first)
|
||||
@@ -100,11 +98,10 @@ impl WorkspaceService {
|
||||
pub async fn workspace_verify_domain(
|
||||
&self,
|
||||
ctx: &Session,
|
||||
workspace_id: Uuid,
|
||||
ws: &Workspace,
|
||||
domain_id: Uuid,
|
||||
) -> Result<(), AppError> {
|
||||
let user_uid = ctx.user().ok_or(AppError::Unauthorized)?;
|
||||
let ws = self.find_workspace_by_id(workspace_id).await?;
|
||||
self.ensure_workspace_role_at_least(user_uid, &ws, Role::Admin)
|
||||
.await?;
|
||||
let now = chrono::Utc::now();
|
||||
@@ -128,7 +125,7 @@ impl WorkspaceService {
|
||||
)
|
||||
.bind(now)
|
||||
.bind(domain_id)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.execute(&mut *txn)
|
||||
.await
|
||||
.map_err(AppError::Database)?;
|
||||
@@ -144,11 +141,10 @@ impl WorkspaceService {
|
||||
pub async fn workspace_set_primary_domain(
|
||||
&self,
|
||||
ctx: &Session,
|
||||
workspace_id: Uuid,
|
||||
ws: &Workspace,
|
||||
domain_id: Uuid,
|
||||
) -> Result<(), AppError> {
|
||||
let user_uid = ctx.user().ok_or(AppError::Unauthorized)?;
|
||||
let ws = self.find_workspace_by_id(workspace_id).await?;
|
||||
self.ensure_workspace_role_at_least(user_uid, &ws, Role::Owner)
|
||||
.await?;
|
||||
let now = chrono::Utc::now();
|
||||
@@ -172,7 +168,7 @@ impl WorkspaceService {
|
||||
WHERE id = $1 AND workspace_id = $2",
|
||||
)
|
||||
.bind(domain_id)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.fetch_optional(&mut *txn)
|
||||
.await
|
||||
.map_err(AppError::Database)?
|
||||
@@ -186,7 +182,7 @@ impl WorkspaceService {
|
||||
|
||||
sqlx::query("UPDATE workspace_domain SET is_primary = false, updated_at = $1 WHERE workspace_id = $2 AND is_primary = true")
|
||||
.bind(now)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.execute(&mut *txn)
|
||||
.await
|
||||
.map_err(AppError::Database)?;
|
||||
@@ -205,11 +201,10 @@ impl WorkspaceService {
|
||||
pub async fn workspace_delete_domain(
|
||||
&self,
|
||||
ctx: &Session,
|
||||
workspace_id: Uuid,
|
||||
ws: &Workspace,
|
||||
domain_id: Uuid,
|
||||
) -> Result<(), AppError> {
|
||||
let user_uid = ctx.user().ok_or(AppError::Unauthorized)?;
|
||||
let ws = self.find_workspace_by_id(workspace_id).await?;
|
||||
self.ensure_workspace_role_at_least(user_uid, &ws, Role::Admin)
|
||||
.await?;
|
||||
|
||||
@@ -217,7 +212,7 @@ impl WorkspaceService {
|
||||
"SELECT is_primary FROM workspace_domain WHERE id = $1 AND workspace_id = $2",
|
||||
)
|
||||
.bind(domain_id)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.fetch_optional(self.ctx.db.reader())
|
||||
.await
|
||||
.map_err(AppError::Database)?
|
||||
@@ -243,7 +238,7 @@ impl WorkspaceService {
|
||||
let result =
|
||||
sqlx::query("DELETE FROM workspace_domain WHERE id = $1 AND workspace_id = $2")
|
||||
.bind(domain_id)
|
||||
.bind(workspace_id)
|
||||
.bind(ws.id)
|
||||
.execute(&mut *txn)
|
||||
.await
|
||||
.map_err(AppError::Database)?;
|
||||
|
||||
Reference in New Issue
Block a user