refactor(billing): remove unused promo code fields and simplify payment amount calculation logic

Author: Dobrunia

src/resolvers/billingNew.ts

@@ -177,11 +177,8 @@ export default {
           paymentAmount = pricing.finalAmount;
           paymentPromoChecksum = buildPaymentPromoData(pricing.promoCode._id.toString(), promoUtm);
           composePaymentPromo = {
-            id: pricing.promoCode._id.toString(),
-            benefitType: pricing.benefitType,
             originalAmount: pricing.originalAmount,
             finalAmount: pricing.finalAmount,
-            discountAmount: pricing.discountAmount,
           };
         } catch (error) {
           throwPromoCodeGraphQLError(error);
@@ -375,23 +372,6 @@ debug: ${Boolean(workspace.isDebug)}`
         throw new UserInputError('Wrong checksum data');
       }
 
-      let planPaymentAmount = plan.monthlyCharge;
-
-      if (paymentData.promo?.id) {
-        try {
-          const pricing = await new PromoCodeService(factories).getPricingForPromoCodeId(
-            paymentData.promo.id,
-            user.id,
-            paymentData.workspaceId,
-            plan
-          );
-
-          planPaymentAmount = pricing.finalAmount;
-        } catch (error) {
-          throwPromoCodeGraphQLError(error);
-        }
-      }
-
       const token = fullUserInfo.bankCards?.find(card => card.id === args.input.cardId)?.token;
 
       if (!token) {
@@ -425,7 +405,7 @@ debug: ${Boolean(workspace.isDebug)}`
         }
       }
 
-      let amount = planPaymentAmount;
+      let amount = plan.monthlyCharge;
 
       const isPaymentForCurrentTariffPlan = workspace.tariffPlanId.toString() === plan._id.toString();
 

src/typeDefs/billing.ts

@@ -311,16 +311,6 @@ type VerifyPromoCodeResponse {
 Promo data returned with composePayment
 """
 type ComposePaymentPromo {
-  """
-  Applied promo code id
-  """
-  id: ID!
-
-  """
-  Promo benefit type
-  """
-  benefitType: PromoCodeBenefitType!
-
   """
   Plan price before promo
   """
@@ -330,11 +320,6 @@ type ComposePaymentPromo {
   Plan price after promo
   """
   finalAmount: Int!
-
-  """
-  Actual discount amount in money
-  """
-  discountAmount: Int!
 }
 
 """

test/resolvers/billingNew.test.ts

@@ -356,11 +356,8 @@ describe('GraphQLBillingNew', () => {
       expect(result.plan.monthlyCharge).toBe(1000);
       expect(result.chargeAmount).toBe(750);
       expect(result.promo).toMatchObject({
-        id: promoCodeId.toString(),
-        benefitType: 'percent_discount',
         originalAmount: 1000,
         finalAmount: 750,
-        discountAmount: 250,
       });
 
       const checksumData = checksumService.parseAndVerifyChecksum(result.checksum);
@@ -566,8 +563,7 @@ describe('GraphQLBillingNew', () => {
       jest.clearAllMocks();
     });
 
-    it('should charge discounted amount and set full recurrent amount from checksum promo id', async () => {
-      const promoCodeId = new ObjectId();
+    it('should charge full plan amount for recurrent payment', async () => {
       const userId = new ObjectId().toString();
       const workspaceId = new ObjectId().toString();
       const cardId = 'card-1';
@@ -587,9 +583,6 @@ describe('GraphQLBillingNew', () => {
         tariffPlanId: newPlanId.toString(),
         shouldSaveCard: false,
         nextPaymentDate: new Date().toISOString(),
-        promo: {
-          id: promoCodeId.toString(),
-        },
       });
       const dueDate = new Date();
       dueDate.setMonth(dueDate.getMonth() + 1);
@@ -626,21 +619,8 @@ describe('GraphQLBillingNew', () => {
             getBusinessOperationByTransactionId: jest.fn().mockResolvedValue({ _id: new ObjectId() }),
           } as any,
           releasesFactory: {} as any,
-          promoCodesFactory: {
-            findOne: jest.fn().mockResolvedValue({
-              _id: promoCodeId,
-              value: 'SAVE25',
-              benefit: {
-                type: 'percent_discount',
-                percent: 25,
-              },
-            }),
-          } as any,
-          promoCodeUsagesFactory: {
-            countByPromoCodeId: jest.fn().mockResolvedValue(0),
-            findByPromoCodeAndUser: jest.fn().mockResolvedValue(null),
-            findByPromoCodeAndWorkspace: jest.fn().mockResolvedValue(null),
-          } as any,
+          promoCodesFactory: {} as any,
+          promoCodeUsagesFactory: {} as any,
         },
       };
 
@@ -664,7 +644,7 @@ describe('GraphQLBillingNew', () => {
 
       expect(cloudPaymentsApi.payByToken).toHaveBeenCalledWith(
         expect.objectContaining({
-          Amount: 750,
+          Amount: 1000,
           JsonData: expect.objectContaining({
             cloudPayments: expect.objectContaining({
               recurrent: expect.objectContaining({