From 84f29cf72d46b2d60ece1013f89c04e1aa064102 Mon Sep 17 00:00:00 2001 From: Lu Yang Date: Sat, 12 Oct 2024 14:57:56 +0100 Subject: [PATCH] personal usage only account org that has workspace limit --- lapdev-enterprise/src/enterprise.rs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lapdev-enterprise/src/enterprise.rs b/lapdev-enterprise/src/enterprise.rs index 937c1d1..6c59898 100644 --- a/lapdev-enterprise/src/enterprise.rs +++ b/lapdev-enterprise/src/enterprise.rs @@ -89,17 +89,21 @@ impl Enterprise { let all_orgs = self.db.get_user_organizations(user_id).await?; if all_orgs.len() > 1 { let mut personal_usage = 0; - for org in all_orgs { - let usage = self - .usage - .get_monthly_cost( - org.organization_id, - Some(user_id), - Utc::now().into(), - None, - ) - .await?; - personal_usage += usage; + for member in all_orgs { + if let Ok(org) = self.db.get_organization(member.organization_id).await { + if org.running_workspace_limit > 0 { + let usage = self + .usage + .get_monthly_cost( + org.id, + Some(user_id), + Utc::now().into(), + None, + ) + .await?; + personal_usage += usage; + } + } } if personal_usage as i64 >= organization.usage_limit { return Err(ApiError::InvalidRequest(