diff --git a/src/connectors/user_service/client.rs b/src/connectors/user_service/client.rs index 4147e48..70d808f 100644 --- a/src/connectors/user_service/client.rs +++ b/src/connectors/user_service/client.rs @@ -9,7 +9,7 @@ use super::connector::UserServiceConnector; use super::types::{ CategoryInfo, PlanDefinition, ProductInfo, StackResponse, UserPlanInfo, UserProfile, }; -use super::utils::is_plan_upgrade; +use super::utils::is_plan_higher_tier; /// HTTP-based User Service client pub struct UserServiceClient { @@ -260,7 +260,7 @@ impl UserServiceConnector for UserServiceClient { return user_plan == required_plan_name; } user_plan == required_plan_name - || is_plan_upgrade(&user_plan, required_plan_name) + || is_plan_higher_tier(&user_plan, required_plan_name) }) .map_err(|_| ConnectorError::InvalidResponse(text)) } diff --git a/src/connectors/user_service/tests.rs b/src/connectors/user_service/tests.rs index 7ce739a..b9525f7 100644 --- a/src/connectors/user_service/tests.rs +++ b/src/connectors/user_service/tests.rs @@ -2,7 +2,7 @@ use serde_json::json; use uuid::Uuid; use super::mock; -use super::utils::is_plan_upgrade; +use super::utils::is_plan_higher_tier; use super::{CategoryInfo, ProductInfo, UserProfile, UserServiceConnector}; /// Test that get_user_profile returns user with products list @@ -221,24 +221,24 @@ async fn test_mock_list_stacks() { /// Test plan hierarchy comparison #[test] -fn test_is_plan_upgrade_hierarchy() { +fn test_is_plan_higher_tier_hierarchy() { // Enterprise user can access professional tier - assert!(is_plan_upgrade("enterprise", "professional")); + assert!(is_plan_higher_tier("enterprise", "professional")); // Enterprise user can access basic tier - assert!(is_plan_upgrade("enterprise", "basic")); + assert!(is_plan_higher_tier("enterprise", "basic")); // Professional user can access basic tier - assert!(is_plan_upgrade("professional", "basic")); + assert!(is_plan_higher_tier("professional", "basic")); // Basic user cannot access professional - assert!(!is_plan_upgrade("basic", "professional")); + assert!(!is_plan_higher_tier("basic", "professional")); // Basic user cannot access enterprise - assert!(!is_plan_upgrade("basic", "enterprise")); + assert!(!is_plan_higher_tier("basic", "enterprise")); - // Same plan should not be considered upgrade - assert!(!is_plan_upgrade("professional", "professional")); + // Same plan should not be considered higher tier + assert!(!is_plan_higher_tier("professional", "professional")); } /// Test UserProfile deserialization with all fields diff --git a/src/connectors/user_service/utils.rs b/src/connectors/user_service/utils.rs index 0d5cef9..d7f3248 100644 --- a/src/connectors/user_service/utils.rs +++ b/src/connectors/user_service/utils.rs @@ -1,6 +1,6 @@ /// Helper function to determine if a plan tier can access a required plan /// Basic idea: enterprise >= professional >= basic -pub(crate) fn is_plan_upgrade(user_plan: &str, required_plan: &str) -> bool { +pub(crate) fn is_plan_higher_tier(user_plan: &str, required_plan: &str) -> bool { let plan_hierarchy = vec!["basic", "professional", "enterprise"]; let user_level = plan_hierarchy