Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(billing): distinguish inapplicable team seat schedules (#7870)

Peter Chinmanfce4b3fa2f11
diff --git a/apps/web/src/features/settings/Team.tsx b/apps/web/src/features/settings/Team.tsx
index 716dc69fc6..240997d0c9 100644
--- a/apps/web/src/features/settings/Team.tsx
+++ b/apps/web/src/features/settings/Team.tsx
@@ -1494,9 +1494,11 @@ function TeamManagement(props: {
<Show
when={
+ teamQuery.isSuccess &&
showSeatPlans() &&
isAdminOrOwner() &&
!teamQuery.data?.team.enterprise &&
+ // A successful team response omits this field only on lookup failure.
teamQuery.data?.scheduled_seat_plans == null
}
>
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembers.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembers.ts
index cb1b428b93..3968913910 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembers.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembers.ts
@@ -16,7 +16,7 @@ export interface TeamWithMembers {
/** The members of the team */
members: TeamMember[];
/** Provider-confirmed pending seat changes, keyed by member user ID.
-Only available to paid-team admins and owners; empty means no pending changes. */
+Empty when no changes apply to this viewer; absent when the lookup fails. */
scheduled_seat_plans?: TeamWithMembersScheduledSeatPlans;
/** The team */
team: Team;
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlans.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlans.ts
index 48bf2933a7..fa6cf441c3 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlans.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlans.ts
@@ -8,7 +8,7 @@ import type { TeamWithMembersScheduledSeatPlansAnyOf } from './teamWithMembersSc
/**
* Provider-confirmed pending seat changes, keyed by member user ID.
-Only available to paid-team admins and owners; empty means no pending changes.
+Empty when no changes apply to this viewer; absent when the lookup fails.
*/
export type TeamWithMembersScheduledSeatPlans =
TeamWithMembersScheduledSeatPlansAnyOf | null;
diff --git a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlansAnyOf.ts b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlansAnyOf.ts
index 0fcebc5a35..44062a3b47 100644
--- a/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlansAnyOf.ts
+++ b/apps/web/src/lib/service-clients/service-auth/generated/schemas/teamWithMembersScheduledSeatPlansAnyOf.ts
@@ -8,7 +8,7 @@ import type { ScheduledSeatPlan } from './scheduledSeatPlan';
/**
* Provider-confirmed pending seat changes, keyed by member user ID.
-Only available to paid-team admins and owners; empty means no pending changes.
+Empty when no changes apply to this viewer; absent when the lookup fails.
*/
export type TeamWithMembersScheduledSeatPlansAnyOf = {
[key: string]: ScheduledSeatPlan;
diff --git a/apps/web/src/lib/service-clients/service-auth/openapi.json b/apps/web/src/lib/service-clients/service-auth/openapi.json
index 779b244b66..59a171129e 100644
--- a/apps/web/src/lib/service-clients/service-auth/openapi.json
+++ b/apps/web/src/lib/service-clients/service-auth/openapi.json
@@ -7192,7 +7192,7 @@
},
"scheduled_seat_plans": {
"type": ["object", "null"],
- "description": "Provider-confirmed pending seat changes, keyed by member user ID.\nOnly available to paid-team admins and owners; empty means no pending changes.",
+ "description": "Provider-confirmed pending seat changes, keyed by member user ID.\nEmpty when no changes apply to this viewer; absent when the lookup fails.",
"additionalProperties": {
"$ref": "#/components/schemas/ScheduledSeatPlan"
},
diff --git a/crates/teams/src/domain/model.rs b/crates/teams/src/domain/model.rs
index ae4b3c9391..72ee691fce 100644
--- a/crates/teams/src/domain/model.rs
+++ b/crates/teams/src/domain/model.rs
@@ -289,7 +289,7 @@ pub struct TeamWithMembers {
/// The members of the team
pub members: Vec<TeamMember<'static>>,
/// Provider-confirmed pending seat changes, keyed by member user ID.
- /// Only available to paid-team admins and owners; empty means no pending changes.
+ /// Empty when no changes apply to this viewer; absent when the lookup fails.
#[serde(skip_serializing_if = "Option::is_none")]
pub scheduled_seat_plans: Option<HashMap<String, ScheduledSeatPlan>>,
}
diff --git a/crates/teams/src/domain/team_service.rs b/crates/teams/src/domain/team_service.rs
index 42d61f0572..195b68c477 100644
--- a/crates/teams/src/domain/team_service.rs
+++ b/crates/teams/src/domain/team_service.rs
@@ -3,7 +3,10 @@
#[cfg(test)]
mod test;
-use std::{collections::HashSet, sync::Arc};
+use std::{
+ collections::{HashMap, HashSet},
+ sync::Arc,
+};
use channels::domain::{
models::{ChannelType, CreateChannelRequest, Sender},
@@ -2119,7 +2122,7 @@ where
let team_id =
macro_uuid::string_to_uuid(&entity_access_receipt.entity().entity_id).unwrap();
let mut team = self.team_repository.get_team_by_id(&team_id).await?;
- team.scheduled_seat_plans = None;
+ team.scheduled_seat_plans = Some(HashMap::new());
if !entity_access_receipt
.entity_permission()
.satisfies::<AdminTeamRole>()
@@ -2135,14 +2138,14 @@ where
.get_team_payment_status(&team_id)
.await?
{
- return Ok(None);
+ return Ok(HashMap::new());
}
let Some(subscription) = self
.team_repository
.get_team_subscription_id(&team_id)
.await?
else {
- return Ok(None);
+ return Ok(HashMap::new());
};
let mut changes = self
.customer_repository
@@ -2153,12 +2156,13 @@ where
.iter()
.any(|member| member.user_id.as_ref() == user)
});
- Ok(Some(changes))
+ Ok(changes)
}
.await;
match pending {
- Ok(changes) => team.scheduled_seat_plans = changes,
+ Ok(changes) => team.scheduled_seat_plans = Some(changes),
Err(error) => {
+ team.scheduled_seat_plans = None;
tracing::warn!(?error, %team_id, "unable to read pending team seat changes")
}
}
diff --git a/crates/teams/src/domain/team_service/test.rs b/crates/teams/src/domain/team_service/test.rs
index 6de1c109b3..54e7818854 100644
--- a/crates/teams/src/domain/team_service/test.rs
+++ b/crates/teams/src/domain/team_service/test.rs
@@ -3696,17 +3696,18 @@ async fn test_get_team_reports_crm_enabled() {
}
#[tokio::test]
-async fn get_team_exposes_confirmed_pending_plans_only_to_paid_team_billing_managers() {
+async fn get_team_distinguishes_inapplicable_seat_plans_from_lookup_failures() {
use entity_access::domain::models::{Entity, EntityPermission, TeamRole as AccessTeamRole};
- for (role, paying, enterprise, provider_failure, has_pending) in [
- (AccessTeamRole::Admin, true, false, false, true),
- (AccessTeamRole::Owner, true, false, false, true),
- (AccessTeamRole::Member, true, false, false, true),
- (AccessTeamRole::Admin, false, false, false, true),
- (AccessTeamRole::Admin, true, true, false, true),
- (AccessTeamRole::Admin, true, false, true, true),
- (AccessTeamRole::Admin, true, false, false, false),
+ for (role, paying, enterprise, has_subscription, provider_failure, has_pending) in [
+ (AccessTeamRole::Admin, true, false, true, false, true),
+ (AccessTeamRole::Owner, true, false, true, false, true),
+ (AccessTeamRole::Member, true, false, true, false, true),
+ (AccessTeamRole::Admin, false, false, true, false, true),
+ (AccessTeamRole::Admin, true, true, true, false, true),
+ (AccessTeamRole::Admin, true, false, false, false, true),
+ (AccessTeamRole::Admin, true, false, true, true, true),
+ (AccessTeamRole::Admin, true, false, true, false, false),
] {
let team_id = uuid::Uuid::from_u128(5501);
let owner = MacroUserIdStr::try_from("macro|[email protected]").unwrap();
@@ -3722,7 +3723,7 @@ async fn get_team_exposes_confirmed_pending_plans_only_to_paid_team_billing_mana
let mut repo = MockTeamRepository::new(Vec::new(), "Billing", Default::default())
.with_team(team)
.with_team_members(vec![member.clone()]);
- repo.team_subscription_id = Some("sub_team".parse().unwrap());
+ repo.team_subscription_id = has_subscription.then(|| "sub_team".parse().unwrap());
repo.team_payment_status = paying;
repo.enterprise = enterprise;
let pending = crate::domain::model::ScheduledSeatPlan {
@@ -3755,15 +3756,23 @@ async fn get_team_exposes_confirmed_pending_plans_only_to_paid_team_billing_mana
let result = service.get_team(receipt).await.unwrap();
assert_eq!(*result.team.id(), team_id);
assert_eq!(result.members.len(), 1);
- let may_query = role != AccessTeamRole::Member && paying && !enterprise;
+ let may_query = role != AccessTeamRole::Member && paying && !enterprise && has_subscription;
assert_eq!(calls.lock().unwrap().len(), usize::from(may_query));
- let expected = (may_query && !provider_failure).then(|| {
- if has_pending {
+ let expected = (!(may_query && provider_failure)).then(|| {
+ if may_query && has_pending {
HashMap::from([(member.user_id.to_string(), pending)])
} else {
HashMap::new()
}
});
+ let json = serde_json::to_value(&result).unwrap();
+ assert_eq!(
+ json.get("scheduled_seat_plans").is_some(),
+ expected.is_some()
+ );
+ if expected.as_ref().is_some_and(HashMap::is_empty) {
+ assert_eq!(json["scheduled_seat_plans"], serde_json::json!({}));
+ }
assert_eq!(result.scheduled_seat_plans, expected);
}
}
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index bae1a6548d..9eda59539b 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -2553,7 +2553,8 @@ Team members who cannot manage billing see the notice without its action.
and admins/owners can move a seat between Pro and Max with the `Seat plan`
menu; Max upgrades are immediate and prorated, Pro downgrades start at renewal.
**Keep Max** appears only for a confirmed pending downgrade and cancels it;
-failed scheduled-plan reads offer **Try again**). CRM (enable/disable; once enabled, a `Deal stages` section
+failed scheduled-plan reads offer **Try again**, while teams without applicable
+scheduled plans show no retry notice). CRM (enable/disable; once enabled, a `Deal stages` section
with `Customize stages`, inline rename, reorder by drag handle or arrow keys (up/down
buttons on touch), delete, `Add stage`, `Reset to defaults`, and `Closed stages`
checkboxes, editable by the role set as `edit_stages_role`)
diff --git a/packages/sdk/generated/auth/types.gen.ts b/packages/sdk/generated/auth/types.gen.ts
index 0604515cf7..51efa324d2 100644
--- a/packages/sdk/generated/auth/types.gen.ts
+++ b/packages/sdk/generated/auth/types.gen.ts
@@ -1661,7 +1661,7 @@ export type TeamWithMembers = {
members: Array<TeamMember>;
/**
* Provider-confirmed pending seat changes, keyed by member user ID.
- * Only available to paid-team admins and owners; empty means no pending changes.
+ * Empty when no changes apply to this viewer; absent when the lookup fails.
*/
scheduled_seat_plans?: {
[key: string]: ScheduledSeatPlan;
diff --git a/packages/sdk/specs/auth.json b/packages/sdk/specs/auth.json
index 779b244b66..59a171129e 100644
--- a/packages/sdk/specs/auth.json
+++ b/packages/sdk/specs/auth.json
@@ -7192,7 +7192,7 @@
},
"scheduled_seat_plans": {
"type": ["object", "null"],
- "description": "Provider-confirmed pending seat changes, keyed by member user ID.\nOnly available to paid-team admins and owners; empty means no pending changes.",
+ "description": "Provider-confirmed pending seat changes, keyed by member user ID.\nEmpty when no changes apply to this viewer; absent when the lookup fails.",
"additionalProperties": {
"$ref": "#/components/schemas/ScheduledSeatPlan"
},