[AC-1449] Secrets Manager subscription Stripe Integration #72

lizard-boy · 2024-10-19T09:11:02Z

Type of change

- [ ] Bug fix
- [X] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

Adding Secrets Manager price during the subscription if an organization wants to add a secrets manager.

Code changes

src/Api/Controllers/OrganizationsController.cs: This file was changed to call the _organizationUpgradePlanCommand that handles the validation and subscription
src/Core/Models/Business/SubscriptionCreateOptions.cs: This file was changed to handles secrets manager seats and service account during subscription

Before you submit

Please check for formatting errors (dotnet format --verify-no-changes) (required)
If making database changes - make sure you also update Entity Framework queries and/or migrations
Please add unit tests where it makes sense to do so (encouraged but not required)
If this change requires a documentation update - notify the documentation team
If this change has particular deployment requirements - notify the DevOps team

Greptile Summary

Integrated Secrets Manager pricing into subscription process, focusing on organization management and billing.

Added support for Secrets Manager seats and service accounts in organization creation and upgrade models
Introduced new validation strategies for Password Manager and Secrets Manager sign-ups
Updated plan retrieval methods to specifically use Password Manager plans where appropriate
Created new commands and queries for handling organization upgrades with Secrets Manager integration
Modified StripeController to consider both Password Manager and Secrets Manager plans in subscription processing

…ager

greptile-apps

_{30 file(s) reviewed, 62 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

greptile-apps · 2024-10-19T09:11:23Z

src/Api/Controllers/OrganizationsController.cs

+        var result = !_featureService.IsEnabled(FeatureFlagKeys.SecretManagerGaBilling, _currentContext) &&
+                     !model.UseSecretsManager
+            ? await _organizationService.SignUpAsync(organizationSignup)
+            : await _organizationSignUpCommand.SignUpAsync(organizationSignup);


style: Consider extracting this condition into a separate method for better readability and reusability

greptile-apps · 2024-10-19T09:11:24Z

src/Api/Controllers/OrganizationsController.cs

+        var result = !_featureService.IsEnabled(FeatureFlagKeys.SecretManagerGaBilling, _currentContext) &&
+                     !model.UseSecretsManager
+            ? await _organizationService.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade())
+            : await _organizationUpgradePlanCommand.UpgradePlanAsync(orgIdGuid, model.ToOrganizationUpgrade());


style: This condition is identical to the one in the Post method. Consider extracting it to avoid duplication

greptile-apps · 2024-10-19T09:11:58Z

src/Api/Controllers/PlansController.cs

    public ListResponseModel<PlanResponseModel> Get()
+    {
+        var data = StaticStore.PasswordManagerPlans;
+        var responses = data.Select(plan => new PlanResponseModel(plan));
+        return new ListResponseModel<PlanResponseModel>(responses);
+    }


logic: The default Get() method now returns only PasswordManagerPlans instead of all Plans. This change might affect existing clients expecting all plans. Consider adding a comment explaining this change or updating documentation.

greptile-apps · 2024-10-19T09:11:59Z

src/Api/Controllers/PlansController.cs

+    [AllowAnonymous]
+    public ListResponseModel<PlanResponseModel> GetSecretsManagerPlans()
+    {
+        var data = StaticStore.SecretManagerPlans;


syntax: SecretManagerPlans is misspelled. It should be SecretsManagerPlans to maintain consistency with the method name.

greptile-apps · 2024-10-19T09:12:34Z

src/Api/Models/Request/Organizations/OrganizationCreateRequestModel.cs

+            AdditionalSmSeats = AdditionalSmSeats.GetValueOrDefault(0),
+            AdditionalServiceAccount = AdditionalServiceAccount.GetValueOrDefault(0),
+            UseSecretsManager = UseSecretsManager,


style: Use null-coalescing operator (??) instead of GetValueOrDefault for consistency with other properties

greptile-apps · 2024-10-19T09:22:12Z

...tionFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs

        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductType;
        if (requiredSponsoredProductType == null ||
            sponsoredOrganization == null ||
-            StaticStore.GetPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)
+            StaticStore.GetPasswordManagerPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)


logic: The change from GetPlan to GetPasswordManagerPlan might affect how plan types are validated. Ensure this doesn't unintentionally exclude valid plan types.

greptile-apps · 2024-10-19T09:22:13Z

...tionFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/SetUpSponsorshipCommand.cs

@@ -51,7 +51,7 @@ public async Task SetUpSponsorshipAsync(OrganizationSponsorship sponsorship,
        var requiredSponsoredProductType = StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value)?.SponsoredProductType;
        if (requiredSponsoredProductType == null ||
            sponsoredOrganization == null ||
-            StaticStore.GetPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)
+            StaticStore.GetPasswordManagerPlan(sponsoredOrganization.PlanType).Product != requiredSponsoredProductType.Value)
        {
            throw new BadRequestException("Can only redeem sponsorship offer on families organizations.");


style: The error message 'Can only redeem sponsorship offer on families organizations' may need to be updated if Secrets Manager plans are now included.

greptile-apps · 2024-10-19T09:22:55Z

...anizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/CreateSponsorshipCommand.cs

        var requiredSponsoringProductType = StaticStore.GetSponsoredPlan(sponsorshipType)?.SponsoringProductType;
        if (requiredSponsoringProductType == null ||
            sponsoringOrg == null ||
-            StaticStore.GetPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)
+            StaticStore.GetPasswordManagerPlan(sponsoringOrg.PlanType).Product != requiredSponsoringProductType.Value)


logic: The change from GetPlan to GetPasswordManagerPlan suggests a separation of Password Manager and Secrets Manager plans. Ensure this change is consistent across the codebase and that it doesn't unintentionally exclude Secrets Manager plans from sponsorship eligibility.

greptile-apps · 2024-10-19T09:23:14Z

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -40,4 +40,6 @@ Task<OrganizationUserOrganizationDetails> GetDetailsByUserAsync(Guid userId, Gui
    Task RevokeAsync(Guid id);
    Task RestoreAsync(Guid id, OrganizationUserStatusType status);
    Task<IEnumerable<OrganizationUserPolicyDetails>> GetByUserIdWithPolicyDetailsAsync(Guid userId, PolicyType policyType);
+    Task<int> GetOccupiedSmSeatCountByOrganizationIdAsync(Guid organizationId);


style: Consider adding XML documentation for this new method to explain its purpose and usage

greptile-apps · 2024-10-19T09:23:15Z

src/Core/Repositories/IOrganizationUserRepository.cs

@@ -40,4 +40,6 @@ Task<OrganizationUserOrganizationDetails> GetDetailsByUserAsync(Guid userId, Gui
    Task RevokeAsync(Guid id);
    Task RestoreAsync(Guid id, OrganizationUserStatusType status);
    Task<IEnumerable<OrganizationUserPolicyDetails>> GetByUserIdWithPolicyDetailsAsync(Guid userId, PolicyType policyType);
+    Task<int> GetOccupiedSmSeatCountByOrganizationIdAsync(Guid organizationId);
+    Task<int> GetOccupiedServiceAccountCountByOrganizationIdAsync(Guid organizationId);


style: Consider adding XML documentation for this new method to explain its purpose and usage

cyprain-okeke added 30 commits May 16, 2023 15:34

Adding the Secret manager to the Plan List

4c68a03

Adding the unit test for the StaticStoreTests class

eeca1d5

Fix whitespace formatting

d00934c

Fix whitespace formatting

52f44be

Price update

0bd73e6

Merge branch 'master' into ac-1408/update_plan_to_include_secrets_man…

b8b0bf1

…ager

Resolving the PR comments

169809b

Resolving PR comments

9722ae5

Fixing the whitespace

de0d0dd

only password manager plans are return for now

c5b0e58

format whitespace

06cfa66

Resolve the test issue

110ee1d

Fixing the failing test

cc695b2

Refactoring the Plan separation

ca38d32

add a unit test for SingleOrDefault

8a00550

Merge branch 'master' into ac-1408/update_plan_to_include_secrets_man…

ae3fa3c

…ager

Fix the whitespace format

43bb9d2

Separate the PM and SM plans

2b5c9a1

Fixing the whitespace

9ae74a1

Remove unnecessary directive

c6e821c

Fix imports ordering

cbfd49c

Fix imports ordering

10cc837

Resolve imports ordering

a607a05

Fixing imports ordering

1403d28

Merge branch 'master' into ac-1408/update_plan_to_include_secrets_man…

81a72a4

…ager

Merge branch 'master' into ac-1408/update_plan_to_include_secrets_man…

52c1067

…ager

Changes for the purchase organization

8413ba9

Changes to include sm to signup

9721826

changes to add secrets manager on signup

0e13348

Add the Upgrade Plan changes

906b0c5

cyprain-okeke added 11 commits June 14, 2023 12:25

Add the Upgrade Plan changes

15076a3

Add store procedure changes

d487a8f

format whitespace

44a7f82

Fix using directive is unnecessary

7fcbf9b

Fix imports ordering

8483484

Fix the failing test

b8261db

Fix imports ordering on upgrade plan

c71cb5a

Fix imports ordering

4f456ac

Fix imports ordering

aa6cdb4

Fix imports ordering

e78e482

Fix the failed test after dotnet format

cdc2e94

greptile-apps bot reviewed Oct 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AC-1449] Secrets Manager subscription Stripe Integration #72

[AC-1449] Secrets Manager subscription Stripe Integration #72

lizard-boy commented Oct 19, 2024 •

edited by greptile-apps bot

Loading

greptile-apps bot left a comment

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

greptile-apps bot Oct 19, 2024

[AC-1449] Secrets Manager subscription Stripe Integration #72

Are you sure you want to change the base?

[AC-1449] Secrets Manager subscription Stripe Integration #72

Conversation

lizard-boy commented Oct 19, 2024 • edited by greptile-apps bot Loading

Type of change

Objective

Code changes

Before you submit

Greptile Summary

greptile-apps bot left a comment

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

greptile-apps bot Oct 19, 2024

Choose a reason for hiding this comment

lizard-boy commented Oct 19, 2024 •

edited by greptile-apps bot

Loading