From 141c6862ca35e2183236f02b5da52435cb9e21d0 Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Mon, 10 Apr 2023 14:40:04 +0100 Subject: [PATCH] [AC 482]automatically apply discounts to provider portal orgs (#2801) * Adding discount coupon on provider org creation * Change the provider discount Id * Fixing the whitespace format * Remove discount at subscription and apply to customer * resolving a failing test * Remove white spaces --- src/Core/Services/IPaymentService.cs | 2 +- .../Implementations/OrganizationService.cs | 2 +- .../Implementations/StripePaymentService.cs | 5 +- .../Services/StripePaymentServiceTests.cs | 50 +++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/Core/Services/IPaymentService.cs b/src/Core/Services/IPaymentService.cs index a9091808d2..95c6f25908 100644 --- a/src/Core/Services/IPaymentService.cs +++ b/src/Core/Services/IPaymentService.cs @@ -10,7 +10,7 @@ public interface IPaymentService Task CancelAndRecoverChargesAsync(ISubscriber subscriber); Task PurchaseOrganizationAsync(Organization org, PaymentMethodType paymentMethodType, string paymentToken, Plan plan, short additionalStorageGb, int additionalSeats, - bool premiumAccessAddon, TaxInfo taxInfo); + bool premiumAccessAddon, TaxInfo taxInfo, bool provider = false); Task SponsorOrganizationAsync(Organization org, OrganizationSponsorship sponsorship); Task RemoveOrganizationSponsorshipAsync(Organization org, OrganizationSponsorship sponsorship); Task UpgradeFreeOrganizationAsync(Organization org, Plan plan, diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 9c428b614e..9e7ba842ca 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -664,7 +664,7 @@ public class OrganizationService : IOrganizationService { await _paymentService.PurchaseOrganizationAsync(organization, signup.PaymentMethodType.Value, signup.PaymentToken, plan, signup.AdditionalStorageGb, signup.AdditionalSeats, - signup.PremiumAccessAddon, signup.TaxInfo); + signup.PremiumAccessAddon, signup.TaxInfo, provider); } var ownerId = provider ? default : signup.Owner.Id; diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs index 1784133c95..8bb861cc27 100644 --- a/src/Core/Services/Implementations/StripePaymentService.cs +++ b/src/Core/Services/Implementations/StripePaymentService.cs @@ -16,6 +16,7 @@ public class StripePaymentService : IPaymentService private const string PremiumPlanAppleIapId = "premium-annually-appleiap"; private const decimal PremiumPlanAppleIapPrice = 14.99M; private const string StoragePlanId = "storage-gb-annually"; + private const string ProviderDiscountId = "msp-discount-35"; private readonly ITransactionRepository _transactionRepository; private readonly IUserRepository _userRepository; @@ -45,7 +46,7 @@ public class StripePaymentService : IPaymentService public async Task PurchaseOrganizationAsync(Organization org, PaymentMethodType paymentMethodType, string paymentToken, StaticStore.Plan plan, short additionalStorageGb, - int additionalSeats, bool premiumAccessAddon, TaxInfo taxInfo) + int additionalSeats, bool premiumAccessAddon, TaxInfo taxInfo, bool provider = false) { Braintree.Customer braintreeCustomer = null; string stipeCustomerSourceToken = null; @@ -134,7 +135,7 @@ public class StripePaymentService : IPaymentService }, }, }, - + Coupon = provider ? ProviderDiscountId : null, Address = new Stripe.AddressOptions { Country = taxInfo.BillingAddressCountry, diff --git a/test/Core.Test/Services/StripePaymentServiceTests.cs b/test/Core.Test/Services/StripePaymentServiceTests.cs index b4e2c81978..9240ca31d0 100644 --- a/test/Core.Test/Services/StripePaymentServiceTests.cs +++ b/test/Core.Test/Services/StripePaymentServiceTests.cs @@ -36,6 +36,56 @@ public class StripePaymentServiceTests Assert.Equal("Payment method is not supported at this time.", exception.Message); } + [Theory, BitAutoData] + public async void PurchaseOrganizationAsync_Stripe_ProviderOrg_Coupon_Add(SutProvider sutProvider, Organization organization, string paymentToken, TaxInfo taxInfo, bool provider = true) + { + var plan = StaticStore.Plans.First(p => p.Type == PlanType.EnterpriseAnnually); + + var stripeAdapter = sutProvider.GetDependency(); + stripeAdapter.CustomerCreateAsync(default).ReturnsForAnyArgs(new Stripe.Customer + { + Id = "C-1", + }); + stripeAdapter.SubscriptionCreateAsync(default).ReturnsForAnyArgs(new Stripe.Subscription + { + Id = "S-1", + CurrentPeriodEnd = DateTime.Today.AddDays(10), + }); + + var result = await sutProvider.Sut.PurchaseOrganizationAsync(organization, PaymentMethodType.Card, paymentToken, plan, 0, 0, false, taxInfo, provider); + + Assert.Null(result); + Assert.Equal(GatewayType.Stripe, organization.Gateway); + Assert.Equal("C-1", organization.GatewayCustomerId); + Assert.Equal("S-1", organization.GatewaySubscriptionId); + Assert.True(organization.Enabled); + Assert.Equal(DateTime.Today.AddDays(10), organization.ExpirationDate); + + await stripeAdapter.Received().CustomerCreateAsync(Arg.Is(c => + c.Description == organization.BusinessName && + c.Email == organization.BillingEmail && + c.Source == paymentToken && + c.PaymentMethod == null && + c.Coupon == "msp-discount-35" && + !c.Metadata.Any() && + c.InvoiceSettings.DefaultPaymentMethod == null && + c.Address.Country == taxInfo.BillingAddressCountry && + c.Address.PostalCode == taxInfo.BillingAddressPostalCode && + c.Address.Line1 == taxInfo.BillingAddressLine1 && + c.Address.Line2 == taxInfo.BillingAddressLine2 && + c.Address.City == taxInfo.BillingAddressCity && + c.Address.State == taxInfo.BillingAddressState && + c.TaxIdData == null + )); + + await stripeAdapter.Received().SubscriptionCreateAsync(Arg.Is(s => + s.Customer == "C-1" && + s.Expand[0] == "latest_invoice.payment_intent" && + s.Metadata[organization.GatewayIdField()] == organization.Id.ToString() && + s.Items.Count == 0 + )); + } + [Theory, BitAutoData] public async void PurchaseOrganizationAsync_Stripe(SutProvider sutProvider, Organization organization, string paymentToken, TaxInfo taxInfo) {