[PM-31894] remove storage reconciliation job and flags (#7424)

src/Billing/Controllers/JobsController.cs

@@ -1,36 +0,0 @@
-using Bit.Billing.Jobs;
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Bit.Billing.Controllers;
-
-[Route("jobs")]
-[SelfHosted(NotSelfHostedOnly = true)]
-[RequireLowerEnvironment]
-public class JobsController(
-    JobsHostedService jobsHostedService) : Controller
-{
-    [HttpPost("run/{jobName}")]
-    public async Task<IActionResult> RunJobAsync(string jobName)
-    {
-        if (jobName == nameof(ReconcileAdditionalStorageJob))
-        {
-            await jobsHostedService.RunJobAdHocAsync<ReconcileAdditionalStorageJob>();
-            return Ok(new { message = $"Job {jobName} scheduled successfully" });
-        }
-
-        return BadRequest(new { error = $"Unknown job name: {jobName}" });
-    }
-
-    [HttpPost("stop/{jobName}")]
-    public async Task<IActionResult> StopJobAsync(string jobName)
-    {
-        if (jobName == nameof(ReconcileAdditionalStorageJob))
-        {
-            await jobsHostedService.InterruptAdHocJobAsync<ReconcileAdditionalStorageJob>();
-            return Ok(new { message = $"Job {jobName} queued for cancellation" });
-        }
-
-        return BadRequest(new { error = $"Unknown job name: {jobName}" });
-    }
-}

src/Billing/Jobs/JobsHostedService.cs

@@ -20,8 +20,7 @@ public class JobsHostedService(
     {
         Jobs = new List<Tuple<Type, ITrigger>>
         {
-            new(typeof(AliveJob), AliveJob.GetTrigger()),
-            new(typeof(ReconcileAdditionalStorageJob), ReconcileAdditionalStorageJob.GetTrigger())
+            new(typeof(AliveJob), AliveJob.GetTrigger())
         };
 
         await base.StartAsync(cancellationToken);
@@ -31,7 +30,6 @@ public class JobsHostedService(
     {
         services.AddTransient<AliveJob>();
         services.AddTransient<SubscriptionCancellationJob>();
-        services.AddTransient<ReconcileAdditionalStorageJob>();
         // add this service as a singleton so we can inject it where needed
         services.AddSingleton<JobsHostedService>();
         services.AddHostedService(sp => sp.GetRequiredService<JobsHostedService>());

src/Billing/Jobs/ReconcileAdditionalStorageJob.cs

@@ -1,369 +0,0 @@
-using System.Globalization;
-using System.Text.Json;
-using Bit.Billing.Services;
-using Bit.Core;
-using Bit.Core.Billing.Constants;
-using Bit.Core.Jobs;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using Quartz;
-using Stripe;
-
-namespace Bit.Billing.Jobs;
-
-public class ReconcileAdditionalStorageJob(
-    IStripeFacade stripeFacade,
-    ILogger<ReconcileAdditionalStorageJob> logger,
-    IFeatureService featureService,
-    IUserRepository userRepository,
-    IOrganizationRepository organizationRepository,
-    IStripeEventUtilityService stripeEventUtilityService) : BaseJob(logger)
-{
-    private const string _storageGbMonthlyPriceId = "storage-gb-monthly";
-    private const string _storageGbAnnuallyPriceId = "storage-gb-annually";
-    private const string _personalStorageGbAnnuallyPriceId = "personal-storage-gb-annually";
-    private const int _storageGbToRemove = 4;
-    private const short _includedStorageGb = 5;
-
-    public enum SubscriptionPlanTier
-    {
-        Personal,
-        Organization,
-        Unknown
-    }
-
-    protected override async Task ExecuteJobAsync(IJobExecutionContext context)
-    {
-        if (!featureService.IsEnabled(FeatureFlagKeys.PM28265_EnableReconcileAdditionalStorageJob))
-        {
-            logger.LogInformation("Skipping ReconcileAdditionalStorageJob, feature flag off.");
-            return;
-        }
-
-        var liveMode = featureService.IsEnabled(FeatureFlagKeys.PM28265_ReconcileAdditionalStorageJobEnableLiveMode);
-
-        // Execution tracking
-        var subscriptionsFound = 0;
-        var subscriptionsUpdated = 0;
-        var subscriptionsWithErrors = 0;
-        var databaseUpdatesFailed = 0;
-        var failures = new List<string>();
-
-        logger.LogInformation("Starting ReconcileAdditionalStorageJob (live mode: {LiveMode})", liveMode);
-
-        var priceIds = new[] { _storageGbMonthlyPriceId, _storageGbAnnuallyPriceId, _personalStorageGbAnnuallyPriceId };
-        var stripeStatusesToProcess = new[] { StripeConstants.SubscriptionStatus.Active, StripeConstants.SubscriptionStatus.Trialing, StripeConstants.SubscriptionStatus.PastDue };
-
-        foreach (var priceId in priceIds)
-        {
-            var options = new SubscriptionListOptions { Limit = 100, Price = priceId };
-
-            await foreach (var subscription in stripeFacade.ListSubscriptionsAutoPagingAsync(options))
-            {
-                if (context.CancellationToken.IsCancellationRequested)
-                {
-                    logger.LogWarning(
-                        "Job cancelled!! Exiting. Progress at time of cancellation: Subscriptions found: {SubscriptionsFound}, " +
-                        "Stripe updates: {StripeUpdates}, Database updates: {DatabaseFailed} failed, " +
-                        "Errors: {SubscriptionsWithErrors}{Failures}",
-                        subscriptionsFound,
-                        liveMode
-                            ? subscriptionsUpdated
-                            : $"(In live mode, would have updated) {subscriptionsUpdated}",
-                        databaseUpdatesFailed,
-                        subscriptionsWithErrors,
-                        failures.Count > 0
-                            ? $", Failures: {Environment.NewLine}{string.Join(Environment.NewLine, failures)}"
-                            : string.Empty
-                    );
-                    return;
-                }
-
-                if (subscription == null)
-                {
-                    continue;
-                }
-
-                if (!stripeStatusesToProcess.Contains(subscription.Status))
-                {
-                    logger.LogInformation("Skipping subscription with unsupported status: {SubscriptionId} - {Status}", subscription.Id, subscription.Status);
-                    continue;
-                }
-
-                logger.LogInformation("Processing subscription: {SubscriptionId}", subscription.Id);
-                subscriptionsFound++;
-
-                if (subscription.Metadata?.TryGetValue(StripeConstants.MetadataKeys.StorageReconciled2025, out var dateString) == true)
-                {
-                    if (DateTime.TryParse(dateString, null, DateTimeStyles.RoundtripKind, out var dateProcessed))
-                    {
-                        logger.LogInformation("Skipping subscription {SubscriptionId} - already processed on {Date}",
-                            subscription.Id,
-                            dateProcessed.ToString("f"));
-                        continue;
-                    }
-                }
-
-                var updateOptions = BuildSubscriptionUpdateOptions(subscription, priceId);
-
-                if (updateOptions == null)
-                {
-                    logger.LogInformation("Skipping subscription {SubscriptionId} - no updates needed", subscription.Id);
-                    continue;
-                }
-
-                subscriptionsUpdated++;
-
-                // Now, prepare the database update so we can log details out if not in live mode
-                var (organizationId, userId, _) = stripeEventUtilityService.GetIdsFromMetadata(subscription.Metadata ?? new Dictionary<string, string>());
-                var subscriptionPlanTier = DetermineSubscriptionPlanTier(userId, organizationId);
-
-                if (subscriptionPlanTier == SubscriptionPlanTier.Unknown)
-                {
-                    logger.LogError(
-                        "Cannot determine subscription plan tier for {SubscriptionId}. Skipping subscription. ",
-                        subscription.Id);
-                    subscriptionsWithErrors++;
-                    continue;
-                }
-
-                var entityId =
-                    subscriptionPlanTier switch
-                    {
-                        SubscriptionPlanTier.Personal => userId!.Value,
-                        SubscriptionPlanTier.Organization => organizationId!.Value,
-                        _ => throw new ArgumentOutOfRangeException(nameof(subscriptionPlanTier), subscriptionPlanTier, null)
-                    };
-
-                // Calculate new MaxStorageGb
-                var currentStorageQuantity = GetCurrentStorageQuantityFromSubscription(subscription, priceId);
-                var newMaxStorageGb = CalculateNewMaxStorageGb(currentStorageQuantity, updateOptions);
-
-                if (!liveMode)
-                {
-                    logger.LogInformation(
-                        "Not live mode (dry-run): Would have updated subscription {SubscriptionId} with item changes: {NewLine}{UpdateOptions}" +
-                        "{NewLine2}And would have updated database record tier: {Tier} to new MaxStorageGb: {MaxStorageGb}",
-                        subscription.Id,
-                        Environment.NewLine,
-                        JsonSerializer.Serialize(updateOptions),
-                        Environment.NewLine,
-                        subscriptionPlanTier,
-                        newMaxStorageGb);
-                    continue;
-                }
-
-                // Live mode enabled - continue with updates to stripe and database
-                try
-                {
-                    await stripeFacade.UpdateSubscription(subscription.Id, updateOptions);
-                    logger.LogInformation("Successfully updated Stripe subscription: {SubscriptionId}", subscription.Id);
-
-                    logger.LogInformation(
-                        "Updating MaxStorageGb in database for subscription {SubscriptionId} ({Type}): New MaxStorageGb: {MaxStorage}",
-                        subscription.Id,
-                        subscriptionPlanTier,
-                        newMaxStorageGb);
-
-                    var dbUpdateSuccess = await UpdateDatabaseMaxStorageAsync(
-                        subscriptionPlanTier,
-                        entityId,
-                        newMaxStorageGb,
-                        subscription.Id);
-
-                    if (!dbUpdateSuccess)
-                    {
-                        databaseUpdatesFailed++;
-                        failures.Add($"Subscription {subscription.Id}: Database update failed");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    subscriptionsWithErrors++;
-                    failures.Add($"Subscription {subscription.Id}: {ex.Message}");
-                    logger.LogError(ex, "Failed to update subscription {SubscriptionId}: {ErrorMessage}",
-                        subscription.Id, ex.Message);
-                }
-            }
-        }
-
-        logger.LogInformation(
-            "ReconcileAdditionalStorageJob FINISHED. Subscriptions found: {SubscriptionsFound}, " +
-            "Subscriptions updated: {SubscriptionsUpdated}, Database failures: {DatabaseFailed}, " +
-            "Total Subscriptions With Errors: {SubscriptionsWithErrors}{Failures}",
-            subscriptionsFound,
-            liveMode
-                ? subscriptionsUpdated
-                : $"(In live mode, would have updated) {subscriptionsUpdated}",
-            databaseUpdatesFailed,
-            subscriptionsWithErrors,
-            failures.Count > 0
-                ? $", Failures: {Environment.NewLine}{string.Join(Environment.NewLine, failures)}"
-                : string.Empty
-        );
-    }
-
-    private SubscriptionUpdateOptions? BuildSubscriptionUpdateOptions(
-        Subscription subscription,
-        string targetPriceId)
-    {
-        if (subscription.Items?.Data == null)
-        {
-            return null;
-        }
-
-        var updateOptions = new SubscriptionUpdateOptions { ProrationBehavior = StripeConstants.ProrationBehavior.CreateProrations, Metadata = new Dictionary<string, string> { [StripeConstants.MetadataKeys.StorageReconciled2025] = DateTime.UtcNow.ToString("o") }, Items = [] };
-
-        var hasUpdates = false;
-
-        foreach (var item in subscription.Items.Data.Where(item => item?.Price?.Id == targetPriceId))
-        {
-            hasUpdates = true;
-            var currentQuantity = item.Quantity;
-
-            if (currentQuantity > _storageGbToRemove)
-            {
-                var newQuantity = currentQuantity - _storageGbToRemove;
-                logger.LogInformation(
-                    "Subscription {SubscriptionId}: reducing quantity from {CurrentQuantity} to {NewQuantity} for price {PriceId}",
-                    subscription.Id,
-                    currentQuantity,
-                    newQuantity,
-                    item.Price.Id);
-
-                updateOptions.Items.Add(new SubscriptionItemOptions { Id = item.Id, Quantity = newQuantity });
-            }
-            else
-            {
-                logger.LogInformation("Subscription {SubscriptionId}: deleting storage item with quantity {CurrentQuantity} for price {PriceId}",
-                    subscription.Id,
-                    currentQuantity,
-                    item.Price.Id);
-
-                updateOptions.Items.Add(new SubscriptionItemOptions { Id = item.Id, Deleted = true });
-            }
-        }
-
-        return hasUpdates ? updateOptions : null;
-    }
-
-    public SubscriptionPlanTier DetermineSubscriptionPlanTier(
-        Guid? userId,
-        Guid? organizationId)
-    {
-        return userId.HasValue
-            ? SubscriptionPlanTier.Personal
-            : organizationId.HasValue
-                ? SubscriptionPlanTier.Organization
-                : SubscriptionPlanTier.Unknown;
-    }
-
-    public long GetCurrentStorageQuantityFromSubscription(
-        Subscription subscription,
-        string storagePriceId)
-    {
-        return subscription.Items?.Data?.FirstOrDefault(item => item?.Price?.Id == storagePriceId)?.Quantity ?? 0;
-    }
-
-    public short CalculateNewMaxStorageGb(
-        long currentQuantity,
-        SubscriptionUpdateOptions? updateOptions)
-    {
-        if (updateOptions?.Items == null)
-        {
-            return (short)(_includedStorageGb + currentQuantity);
-        }
-
-        // If the update marks item as deleted, new quantity is whatever the base storage gb
-        if (updateOptions.Items.Any(i => i.Deleted == true))
-        {
-            return _includedStorageGb;
-        }
-
-        // If the update has a new quantity, use it to calculate the new max
-        var updatedItem = updateOptions.Items.FirstOrDefault(i => i.Quantity.HasValue);
-        if (updatedItem?.Quantity != null)
-        {
-            return (short)(_includedStorageGb + updatedItem.Quantity.Value);
-        }
-
-        // Otherwise, no change
-        return (short)(_includedStorageGb + currentQuantity);
-    }
-
-    public async Task<bool> UpdateDatabaseMaxStorageAsync(
-        SubscriptionPlanTier subscriptionPlanTier,
-        Guid entityId,
-        short newMaxStorageGb,
-        string subscriptionId)
-    {
-        try
-        {
-            switch (subscriptionPlanTier)
-            {
-                case SubscriptionPlanTier.Personal:
-                    {
-                        var user = await userRepository.GetByIdAsync(entityId);
-                        if (user == null)
-                        {
-                            logger.LogError(
-                                "User not found for subscription {SubscriptionId}. Database not updated.",
-                                subscriptionId);
-                            return false;
-                        }
-
-                        user.MaxStorageGb = newMaxStorageGb;
-                        await userRepository.ReplaceAsync(user);
-
-                        logger.LogInformation(
-                            "Successfully updated User {UserId} MaxStorageGb to {MaxStorageGb} for subscription {SubscriptionId}",
-                            user.Id,
-                            newMaxStorageGb,
-                            subscriptionId);
-                        return true;
-                    }
-                case SubscriptionPlanTier.Organization:
-                    {
-                        var organization = await organizationRepository.GetByIdAsync(entityId);
-                        if (organization == null)
-                        {
-                            logger.LogError(
-                                "Organization not found for subscription {SubscriptionId}. Database not updated.",
-                                subscriptionId);
-                            return false;
-                        }
-
-                        organization.MaxStorageGb = newMaxStorageGb;
-                        await organizationRepository.ReplaceAsync(organization);
-
-                        logger.LogInformation(
-                            "Successfully updated Organization {OrganizationId} MaxStorageGb to {MaxStorageGb} for subscription {SubscriptionId}",
-                            organization.Id,
-                            newMaxStorageGb,
-                            subscriptionId);
-                        return true;
-                    }
-                case SubscriptionPlanTier.Unknown:
-                default:
-                    return false;
-            }
-        }
-        catch (Exception ex)
-        {
-            logger.LogError(ex,
-                "Failed to update database MaxStorageGb for subscription {SubscriptionId} (Plan Tier: {SubscriptionType})",
-                subscriptionId,
-                subscriptionPlanTier);
-            return false;
-        }
-    }
-
-    public static ITrigger GetTrigger()
-    {
-        return TriggerBuilder.Create()
-            .WithIdentity("EveryMorningTrigger")
-            .StartNow()
-            .WithCronSchedule("0 0 16 * * ?") // 10am CST daily; the pods execute in UTC time
-            .Build();
-    }
-}

src/Core/Constants.cs

@@ -201,8 +201,6 @@ public static class FeatureFlagKeys
     public const string PM26793_FetchPremiumPriceFromPricingService = "pm-26793-fetch-premium-price-from-pricing-service";
 
     public const string PM26462_Milestone_3 = "pm-26462-milestone-3";
-    public const string PM28265_EnableReconcileAdditionalStorageJob = "pm-28265-enable-reconcile-additional-storage-job";
-    public const string PM28265_ReconcileAdditionalStorageJobEnableLiveMode = "pm-28265-reconcile-additional-storage-job-enable-live-mode";
     public const string PM29594_UpdateIndividualSubscriptionPage = "pm-29594-update-individual-subscription-page";
     public const string PM29108_EnablePersonalDiscounts = "pm-29108-enable-personal-discounts";
     public const string PM29593_PremiumToOrganizationUpgrade = "pm-29593-premium-to-organization-upgrade";