@forklaunch/implementation-billing-stripe 0.2.7 → 0.3.0

package/lib/services/index.mjs

@@ -1,10 +1,5 @@
 // services/billingPortal.service.ts
 import { BaseBillingPortalService } from '@forklaunch/implementation-billing-base/services';
-import {
-  IdentityRequestMapper,
-  IdentityResponseMapper,
-  transformIntoInternalMapper
-} from '@forklaunch/internal';
 var StripeBillingPortalService = class {
   constructor(
     stripeClient,
@@ -22,64 +17,49 @@ var StripeBillingPortalService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper(mappers, schemaValidator);
     this.baseBillingPortalService = new BaseBillingPortalService(
       em,
       cache,
       openTelemetryCollector,
       schemaValidator,
-      {
-        BillingPortalMapper: IdentityResponseMapper,
-        CreateBillingPortalMapper: IdentityRequestMapper,
-        UpdateBillingPortalMapper: IdentityRequestMapper
-      },
+      mappers,
       options
     );
   }
-  billingPortalSessionExpiryDurationMs = 5 * 60 * 1e3;
   baseBillingPortalService;
-  _mappers;
   stripeClient;
   em;
   cache;
   openTelemetryCollector;
   schemaValidator;
+  billingPortalSessionExpiryDurationMs = 5 * 60 * 1e3;
   mappers;
-  async createBillingPortalSession(billingPortalDto) {
+  async createBillingPortalSession(billingPortalDto, ...args) {
     const session = await this.stripeClient.billingPortal.sessions.create({
       ...billingPortalDto.stripeFields,
       customer: billingPortalDto.customerId
     });
-    const billingPortalEntity =
-      await this.baseBillingPortalService.createBillingPortalSession(
-        await this._mappers.CreateBillingPortalMapper.deserializeDtoToEntity(
-          {
-            ...billingPortalDto,
-            id: session.id,
-            uri: session.url,
-            expiresAt: new Date(
-              Date.now() + this.billingPortalSessionExpiryDurationMs
-            )
-          },
-          this.em,
-          session
+    return await this.baseBillingPortalService.createBillingPortalSession(
+      {
+        ...billingPortalDto,
+        id: session.id,
+        uri: session.url,
+        expiresAt: new Date(
+          Date.now() + this.billingPortalSessionExpiryDurationMs
         )
-      );
-    return this._mappers.BillingPortalMapper.serializeEntityToDto(
-      billingPortalEntity
+      },
+      this.em,
+      session,
+      ...args
     );
   }
   async getBillingPortalSession(idDto) {
-    const billingPortalEntity =
-      await this.baseBillingPortalService.getBillingPortalSession(idDto);
-    return this._mappers.BillingPortalMapper.serializeEntityToDto(
-      billingPortalEntity
-    );
+    return await this.baseBillingPortalService.getBillingPortalSession(idDto);
   }
   async expireBillingPortalSession(idDto) {
     return this.baseBillingPortalService.expireBillingPortalSession(idDto);
   }
-  async updateBillingPortalSession(billingPortalDto) {
+  async updateBillingPortalSession(billingPortalDto, ...args) {
     const existingSession =
       await this.baseBillingPortalService.getBillingPortalSession({
         id: billingPortalDto.id
@@ -88,34 +68,24 @@ var StripeBillingPortalService = class {
       ...billingPortalDto.stripeFields,
       customer: existingSession.customerId
     });
-    const baseBillingPortalDto =
-      await this.baseBillingPortalService.updateBillingPortalSession(
-        await this._mappers.UpdateBillingPortalMapper.deserializeDtoToEntity(
-          {
-            ...billingPortalDto,
-            id: session.id,
-            uri: session.url,
-            expiresAt: new Date(
-              Date.now() + this.billingPortalSessionExpiryDurationMs
-            )
-          },
-          this.em,
-          session
+    return await this.baseBillingPortalService.updateBillingPortalSession(
+      {
+        ...billingPortalDto,
+        id: session.id,
+        uri: session.url,
+        expiresAt: new Date(
+          Date.now() + this.billingPortalSessionExpiryDurationMs
         )
-      );
-    return this._mappers.BillingPortalMapper.serializeEntityToDto(
-      baseBillingPortalDto
+      },
+      this.em,
+      session,
+      ...args
     );
   }
 };
 
 // services/checkoutSession.service.ts
 import { BaseCheckoutSessionService } from '@forklaunch/implementation-billing-base/services';
-import {
-  IdentityRequestMapper as IdentityRequestMapper2,
-  IdentityResponseMapper as IdentityResponseMapper2,
-  transformIntoInternalMapper as transformIntoInternalMapper2
-} from '@forklaunch/internal';
 var StripeCheckoutSessionService = class {
   constructor(
     stripeClient,
@@ -133,29 +103,23 @@ var StripeCheckoutSessionService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper2(mappers, schemaValidator);
     this.baseCheckoutSessionService = new BaseCheckoutSessionService(
       em,
       cache,
       openTelemetryCollector,
       schemaValidator,
-      {
-        CheckoutSessionMapper: IdentityResponseMapper2,
-        CreateCheckoutSessionMapper: IdentityRequestMapper2,
-        UpdateCheckoutSessionMapper: IdentityRequestMapper2
-      },
+      mappers,
       options
     );
   }
   baseCheckoutSessionService;
-  _mappers;
   stripeClient;
   em;
   cache;
   openTelemetryCollector;
   schemaValidator;
   mappers;
-  async createCheckoutSession(checkoutSessionDto) {
+  async createCheckoutSession(checkoutSessionDto, ...args) {
     const session = await this.stripeClient.checkout.sessions.create({
       ...checkoutSessionDto.stripeFields,
       payment_method_types: checkoutSessionDto.paymentMethods,
@@ -163,33 +127,27 @@ var StripeCheckoutSessionService = class {
       success_url: checkoutSessionDto.successRedirectUri,
       cancel_url: checkoutSessionDto.cancelRedirectUri
     });
-    const checkoutSessionEntity =
-      await this.baseCheckoutSessionService.createCheckoutSession(
-        await this._mappers.CreateCheckoutSessionMapper.deserializeDtoToEntity(
-          {
-            ...checkoutSessionDto,
-            id: session.id,
-            uri: session.url,
-            expiresAt: new Date(Date.now() + 5 * 60 * 1e3),
-            providerFields: session
-          },
-          this.em,
-          session
-        )
-      );
-    return this._mappers.CheckoutSessionMapper.serializeEntityToDto(
-      checkoutSessionEntity
+    return await this.baseCheckoutSessionService.createCheckoutSession(
+      {
+        ...checkoutSessionDto,
+        id: session.id,
+        uri: session.url ?? void 0,
+        expiresAt: new Date(Date.now() + 5 * 60 * 1e3),
+        providerFields: session
+      },
+      this.em,
+      session,
+      ...args
     );
   }
-  async getCheckoutSession({ id }) {
+  async getCheckoutSession(idDto) {
+    const session = await this.stripeClient.checkout.sessions.retrieve(
+      idDto.id
+    );
     const databaseCheckoutSession =
-      await this.baseCheckoutSessionService.getCheckoutSession({ id });
-    return {
-      ...this._mappers.CheckoutSessionMapper.serializeEntityToDto(
-        databaseCheckoutSession
-      ),
-      stripeFields: await this.stripeClient.checkout.sessions.retrieve(id)
-    };
+      await this.baseCheckoutSessionService.getCheckoutSession(idDto);
+    databaseCheckoutSession.stripeFields = session;
+    return databaseCheckoutSession;
   }
   async expireCheckoutSession({ id }) {
     await this.stripeClient.checkout.sessions.expire(id);
@@ -215,11 +173,6 @@ var StripeCheckoutSessionService = class {
 
 // services/paymentLink.service.ts
 import { BasePaymentLinkService } from '@forklaunch/implementation-billing-base/services';
-import {
-  IdentityRequestMapper as IdentityRequestMapper3,
-  IdentityResponseMapper as IdentityResponseMapper3,
-  transformIntoInternalMapper as transformIntoInternalMapper3
-} from '@forklaunch/internal';
 var StripePaymentLinkService = class {
   constructor(
     stripeClient,
@@ -237,55 +190,46 @@ var StripePaymentLinkService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper3(mappers, schemaValidator);
     this.basePaymentLinkService = new BasePaymentLinkService(
       em,
       cache,
       openTelemetryCollector,
       schemaValidator,
-      {
-        PaymentLinkMapper: IdentityResponseMapper3,
-        CreatePaymentLinkMapper: IdentityRequestMapper3,
-        UpdatePaymentLinkMapper: IdentityRequestMapper3
-      },
+      mappers,
       options
     );
   }
   basePaymentLinkService;
-  _mappers;
   stripeClient;
   em;
   cache;
   openTelemetryCollector;
   schemaValidator;
   mappers;
-  async createPaymentLink(paymentLinkDto) {
+  async createPaymentLink(paymentLinkDto, ...args) {
     const session = await this.stripeClient.paymentLinks.create({
       ...paymentLinkDto.stripeFields,
       payment_method_types: paymentLinkDto.paymentMethods,
       currency: paymentLinkDto.currency
     });
-    const paymentLinkEntity =
-      await this.basePaymentLinkService.createPaymentLink(
-        await this._mappers.CreatePaymentLinkMapper.deserializeDtoToEntity(
-          {
-            ...paymentLinkDto,
-            id: session.id,
-            amount:
-              session.line_items?.data.reduce(
-                (total, item) => total + item.amount_total,
-                0
-              ) ?? 0
-          },
-          this.em,
-          session
-        )
-      );
-    return this._mappers.PaymentLinkMapper.serializeEntityToDto(
-      paymentLinkEntity
+    const paymentLink = await this.basePaymentLinkService.createPaymentLink(
+      {
+        ...paymentLinkDto,
+        id: session.id,
+        amount:
+          session.line_items?.data.reduce(
+            (total, item) => total + item.amount_total,
+            0
+          ) ?? 0
+      },
+      this.em,
+      session,
+      ...args
     );
+    paymentLink.stripeFields = session;
+    return paymentLink;
   }
-  async updatePaymentLink(paymentLinkDto) {
+  async updatePaymentLink(paymentLinkDto, ...args) {
     const session = await this.stripeClient.paymentLinks.update(
       paymentLinkDto.id,
       {
@@ -293,35 +237,31 @@ var StripePaymentLinkService = class {
         payment_method_types: paymentLinkDto.paymentMethods
       }
     );
-    const paymentLinkEntity =
-      await this.basePaymentLinkService.updatePaymentLink(
-        await this._mappers.UpdatePaymentLinkMapper.deserializeDtoToEntity(
-          {
-            ...paymentLinkDto,
-            id: session.id,
-            amount:
-              session.line_items?.data.reduce(
-                (total, item) => total + item.amount_total,
-                0
-              ) ?? 0
-          },
-          this.em,
-          session
-        )
-      );
-    return this._mappers.PaymentLinkMapper.serializeEntityToDto(
-      paymentLinkEntity
+    const paymentLink = await this.basePaymentLinkService.updatePaymentLink(
+      await this.mappers.UpdatePaymentLinkMapper.toEntity(
+        {
+          ...paymentLinkDto,
+          id: session.id,
+          amount:
+            session.line_items?.data.reduce(
+              (total, item) => total + item.amount_total,
+              0
+            ) ?? 0
+        },
+        this.em,
+        session
+      ),
+      ...args
     );
+    paymentLink.stripeFields = session;
+    return paymentLink;
   }
   async getPaymentLink({ id }) {
+    const stripePaymentLink = await this.stripeClient.paymentLinks.retrieve(id);
     const databasePaymentLink =
       await this.basePaymentLinkService.getPaymentLink({ id });
-    return {
-      ...this._mappers.PaymentLinkMapper.serializeEntityToDto(
-        databasePaymentLink
-      ),
-      stripeFields: await this.stripeClient.paymentLinks.retrieve(id)
-    };
+    databasePaymentLink.stripeFields = stripePaymentLink;
+    return databasePaymentLink;
   }
   async expirePaymentLink({ id }) {
     await this.stripeClient.paymentLinks.update(id, {
@@ -348,31 +288,30 @@ var StripePaymentLinkService = class {
     await this.basePaymentLinkService.handlePaymentFailure({ id });
   }
   async listPaymentLinks(idsDto) {
-    const paymentLinks = await this.stripeClient.paymentLinks.list({
+    const stripePaymentLinks = await this.stripeClient.paymentLinks.list({
       active: true
     });
+    const databasePaymentLinks =
+      await this.basePaymentLinkService.listPaymentLinks(idsDto);
     return await Promise.all(
-      (await this.basePaymentLinkService.listPaymentLinks(idsDto)).map(
-        async (paymentLink) => ({
-          ...(await this._mappers.PaymentLinkMapper.serializeEntityToDto(
-            paymentLink
-          )),
-          stripeFields: paymentLinks.data.find(
-            (paymentLink2) => paymentLink2.id === paymentLink2.id
-          )
-        })
-      )
+      databasePaymentLinks.map(async (paymentLink) => {
+        const stripePaymentLink = stripePaymentLinks.data.find(
+          (sp) => sp.id === paymentLink.id
+        );
+        if (!stripePaymentLink) {
+          throw new Error(
+            `Stripe payment link not found for id: ${paymentLink.id}`
+          );
+        }
+        paymentLink.stripeFields = stripePaymentLink;
+        return paymentLink;
+      })
     );
   }
 };
 
 // services/plan.service.ts
 import { BasePlanService } from '@forklaunch/implementation-billing-base/services';
-import {
-  IdentityRequestMapper as IdentityRequestMapper4,
-  IdentityResponseMapper as IdentityResponseMapper4,
-  transformIntoInternalMapper as transformIntoInternalMapper4
-} from '@forklaunch/internal';
 var StripePlanService = class {
   constructor(
     stripeClient,
@@ -388,46 +327,37 @@ var StripePlanService = class {
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper4(mappers, schemaValidator);
     this.basePlanService = new BasePlanService(
       em,
       openTelemetryCollector,
       schemaValidator,
-      {
-        PlanMapper: IdentityResponseMapper4,
-        CreatePlanMapper: IdentityRequestMapper4,
-        UpdatePlanMapper: IdentityRequestMapper4
-      },
+      mappers,
       options
     );
   }
   basePlanService;
-  _mappers;
   stripeClient;
   em;
   openTelemetryCollector;
   schemaValidator;
   mappers;
   async createPlan(planDto, em) {
-    const plan = await this.stripeClient.plans.create({
+    const stripePlan = await this.stripeClient.plans.create({
       ...planDto.stripeFields,
       interval: planDto.cadence,
       product: planDto.name,
       currency: planDto.currency
     });
-    const planEntity = await this.basePlanService.createPlan(
-      await this._mappers.CreatePlanMapper.deserializeDtoToEntity(
-        {
-          ...planDto,
-          externalId: plan.id,
-          billingProvider: 'stripe'
-        },
-        em ?? this.em,
-        plan
-      ),
-      em
+    const plan = await this.basePlanService.createPlan(
+      {
+        ...planDto,
+        externalId: stripePlan.id,
+        billingProvider: 'stripe'
+      },
+      em ?? this.em,
+      stripePlan
     );
-    return this._mappers.PlanMapper.serializeEntityToDto(planEntity);
+    return plan;
   }
   async getPlan(idDto, em) {
     const plan = await this.stripeClient.plans.retrieve(idDto.id);
@@ -439,12 +369,9 @@ var StripePlanService = class {
     if (!id) {
       throw new Error('Plan not found');
     }
-    return {
-      ...(await this._mappers.PlanMapper.serializeEntityToDto(
-        await this.basePlanService.getPlan({ id }, em)
-      )),
-      stripeFields: plan
-    };
+    const planEntity = await this.basePlanService.getPlan({ id }, em);
+    planEntity.stripeFields = plan;
+    return planEntity;
   }
   async updatePlan(planDto, em) {
     const existingPlan = await this.stripeClient.plans.retrieve(planDto.id);
@@ -457,7 +384,7 @@ var StripePlanService = class {
       })
     );
     const planEntity = await this.basePlanService.updatePlan(
-      await this._mappers.UpdatePlanMapper.deserializeDtoToEntity(
+      await this.mappers.UpdatePlanMapper.toEntity(
         {
           ...planDto,
           externalId: plan.id,
@@ -468,7 +395,8 @@ var StripePlanService = class {
       ),
       em
     );
-    return this._mappers.PlanMapper.serializeEntityToDto(planEntity);
+    planEntity.stripeFields = plan;
+    return planEntity;
   }
   async deletePlan(idDto, em) {
     await this.stripeClient.plans.del(idDto.id);
@@ -478,37 +406,34 @@ var StripePlanService = class {
     const plans = await this.stripeClient.plans.list({
       active: true
     });
-    const ids = (
+    const planIds = (
       await em?.findAll(this.options?.databaseTableName ?? 'plan', {
         where: { externalId: { $in: plans.data.map((plan) => plan.id) } }
       })
     )
       ?.filter((s) => idsDto?.ids?.includes(s.id))
       ?.map((s) => s.id);
-    if (!ids) {
+    if (!planIds) {
       throw new Error('Plans not found');
     }
     return await Promise.all(
-      (await this.basePlanService.listPlans({ ids }, em)).map(async (plan) => ({
-        ...(await this._mappers.PlanMapper.serializeEntityToDto(plan)),
-        stripeFields: plans.data.find(
-          (stripePlan) => stripePlan.id === plan.externalId
-        )
-      }))
+      (await this.basePlanService.listPlans({ ids: planIds }, em)).map(
+        async (plan) => ({
+          ...plan,
+          stripeFields: plans.data.find(
+            (stripePlan) => stripePlan.id === plan.externalId
+          )
+        })
+      )
     );
   }
 };
 
 // services/subscription.service.ts
 import { BaseSubscriptionService } from '@forklaunch/implementation-billing-base/services';
-import {
-  IdentityRequestMapper as IdentityRequestMapper5,
-  IdentityResponseMapper as IdentityResponseMapper5,
-  transformIntoInternalMapper as transformIntoInternalMapper5
-} from '@forklaunch/internal';
 var StripeSubscriptionService = class {
   constructor(
-    stripe,
+    stripeClient,
     em,
     openTelemetryCollector,
     schemaValidator,
@@ -516,33 +441,27 @@ var StripeSubscriptionService = class {
     options
   ) {
     this.options = options;
-    this.stripe = stripe;
+    this.stripeClient = stripeClient;
     this.em = em;
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
     this.mappers = mappers;
-    this._mappers = transformIntoInternalMapper5(mappers, schemaValidator);
     this.baseSubscriptionService = new BaseSubscriptionService(
       em,
       openTelemetryCollector,
       schemaValidator,
-      {
-        SubscriptionMapper: IdentityResponseMapper5,
-        CreateSubscriptionMapper: IdentityRequestMapper5,
-        UpdateSubscriptionMapper: IdentityRequestMapper5
-      },
+      mappers,
       options
     );
   }
   baseSubscriptionService;
-  _mappers;
-  stripe;
+  stripeClient;
   em;
   openTelemetryCollector;
   schemaValidator;
   mappers;
   async createSubscription(subscriptionDto, em) {
-    const subscription = await this.stripe.subscriptions.create({
+    const subscription = await this.stripeClient.subscriptions.create({
       ...subscriptionDto.stripeFields,
       customer: subscriptionDto.partyId,
       items: [
@@ -551,38 +470,33 @@ var StripeSubscriptionService = class {
         }
       ]
     });
-    const subscriptionEntity =
-      await this.baseSubscriptionService.createSubscription(
-        await this._mappers.CreateSubscriptionMapper.deserializeDtoToEntity(
-          {
-            ...subscriptionDto,
-            externalId: subscription.id,
-            billingProvider: 'stripe'
-          },
-          em ?? this.em,
-          subscription
-        ),
-        em
-      );
-    return this._mappers.SubscriptionMapper.serializeEntityToDto(
-      subscriptionEntity
+    return await this.baseSubscriptionService.createSubscription(
+      {
+        ...subscriptionDto,
+        externalId: subscription.id,
+        billingProvider: 'stripe'
+      },
+      em ?? this.em,
+      subscription
     );
   }
   async getSubscription(idDto, em) {
-    return {
-      ...(await this._mappers.SubscriptionMapper.serializeEntityToDto(
-        await this.baseSubscriptionService.getSubscription(idDto, em)
-      )),
-      stripeFields: await this.stripe.subscriptions.retrieve(idDto.id)
-    };
+    const subscriptionEntity =
+      await this.baseSubscriptionService.getSubscription(idDto, em);
+    const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
+      idDto.id
+    );
+    subscriptionEntity.stripeFields = stripeSubscription;
+    return subscriptionEntity;
   }
   async getUserSubscription(idDto, em) {
-    return {
-      ...(await this._mappers.SubscriptionMapper.serializeEntityToDto(
-        await this.baseSubscriptionService.getUserSubscription(idDto, em)
-      )),
-      stripeFields: await this.stripe.subscriptions.retrieve(idDto.id)
-    };
+    const subscriptionEntity =
+      await this.baseSubscriptionService.getUserSubscription(idDto, em);
+    const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
+      idDto.id
+    );
+    subscriptionEntity.stripeFields = stripeSubscription;
+    return subscriptionEntity;
   }
   async getOrganizationSubscription(idDto, em) {
     const id = (
@@ -593,18 +507,19 @@ var StripeSubscriptionService = class {
     if (!id) {
       throw new Error('Subscription not found');
     }
-    return {
-      ...(await this._mappers.SubscriptionMapper.serializeEntityToDto(
-        await this.baseSubscriptionService.getOrganizationSubscription(
-          { id },
-          em
-        )
-      )),
-      stripeFields: await this.stripe.subscriptions.retrieve(idDto.id)
-    };
+    const subscriptionEntity =
+      await this.baseSubscriptionService.getOrganizationSubscription(
+        { id },
+        em
+      );
+    const stripeSubscription = await this.stripeClient.subscriptions.retrieve(
+      idDto.id
+    );
+    subscriptionEntity.stripeFields = stripeSubscription;
+    return subscriptionEntity;
   }
   async updateSubscription(subscriptionDto, em) {
-    const subscription = await this.stripe.subscriptions.update(
+    const subscription = await this.stripeClient.subscriptions.update(
       subscriptionDto.id,
       {
         ...subscriptionDto.stripeFields,
@@ -615,31 +530,24 @@ var StripeSubscriptionService = class {
         ]
       }
     );
-    const subscriptionEntity =
-      await this.baseSubscriptionService.updateSubscription(
-        await this._mappers.UpdateSubscriptionMapper.deserializeDtoToEntity(
-          {
-            ...subscriptionDto,
-            externalId: subscription.id,
-            billingProvider: 'stripe',
-            providerFields: subscription
-          },
-          em ?? this.em,
-          subscription
-        ),
-        em
-      );
-    return this._mappers.SubscriptionMapper.serializeEntityToDto(
-      subscriptionEntity
+    return await this.baseSubscriptionService.updateSubscription(
+      {
+        ...subscriptionDto,
+        externalId: subscription.id,
+        billingProvider: 'stripe',
+        providerFields: subscription
+      },
+      em ?? this.em,
+      subscription
     );
   }
   async deleteSubscription(idDto, em) {
-    await this.stripe.subscriptions.cancel(idDto.id);
+    await this.stripeClient.subscriptions.cancel(idDto.id);
     await this.baseSubscriptionService.deleteSubscription(idDto, em);
   }
   async listSubscriptions(idsDto, em) {
     const subscriptions = (
-      await this.stripe.subscriptions.list({
+      await this.stripeClient.subscriptions.list({
         status: 'active'
       })
     ).data.filter((s) => idsDto.ids?.includes(s.id));
@@ -654,24 +562,21 @@ var StripeSubscriptionService = class {
     return await Promise.all(
       (await this.baseSubscriptionService.listSubscriptions({ ids }, em)).map(
         async (subscription) => {
-          return {
-            ...(await this._mappers.SubscriptionMapper.serializeEntityToDto(
-              subscription
-            )),
-            stripeFields: subscriptions.find(
-              (s) => s.id === subscription.externalId
-            )
-          };
+          const stripeSubscription = subscriptions.find(
+            (s) => s.id === subscription.externalId
+          );
+          subscription.stripeFields = stripeSubscription;
+          return subscription;
         }
       )
     );
   }
   async cancelSubscription(idDto, em) {
-    await this.stripe.subscriptions.cancel(idDto.id);
+    await this.stripeClient.subscriptions.cancel(idDto.id);
     await this.baseSubscriptionService.cancelSubscription(idDto, em);
   }
   async resumeSubscription(idDto, em) {
-    await this.stripe.subscriptions.resume(idDto.id);
+    await this.stripeClient.subscriptions.resume(idDto.id);
     await this.baseSubscriptionService.resumeSubscription(idDto, em);
   }
 };
@@ -725,8 +630,7 @@ var StripeWebhookService = class {
             id: event.data.object.id,
             customerId: event.data.object.customer,
             expiresAt: new Date(event.data.object.created + 5 * 60 * 1e3),
-            uri: event.data.object.url,
-            providerFields: event.data.object
+            uri: event.data.object.url
           }
         );
         break;
@@ -754,8 +658,7 @@ var StripeWebhookService = class {
               ) ?? 0,
             paymentMethods: event.data.object.payment_method_types,
             status: 'CREATED',
-            currency: event.data.object.currency,
-            providerFields: event.data.object
+            currency: event.data.object.currency
           });
         }
         break;
@@ -769,8 +672,7 @@ var StripeWebhookService = class {
             ) ?? 0,
           paymentMethods: event.data.object.payment_method_types,
           status: 'UPDATED',
-          currency: event.data.object.currency,
-          providerFields: event.data.object
+          currency: event.data.object.currency
         });
         break;
       }
@@ -791,8 +693,7 @@ var StripeWebhookService = class {
                 ? event.data.object.product
                 : event.data.object.product?.id,
             price: event.data.object.amount,
-            externalId: event.data.object.id,
-            providerFields: event.data.object
+            externalId: event.data.object.id
           });
         } else {
           throw new Error('Invalid plan');
@@ -816,8 +717,7 @@ var StripeWebhookService = class {
                 ? event.data.object.product
                 : event.data.object.product?.id,
             price: event.data.object.amount,
-            externalId: event.data.object.id,
-            providerFields: event.data.object
+            externalId: event.data.object.id
           });
         } else {
           throw new Error('Invalid plan');
@@ -841,7 +741,6 @@ var StripeWebhookService = class {
           description: event.data.object.description ?? void 0,
           active: true,
           productId: event.data.object.items.data[0].plan.id,
-          providerFields: event.data.object,
           externalId: event.data.object.id,
           billingProvider: BillingProviderEnum.STRIPE,
           startDate: new Date(event.data.object.created),
@@ -862,7 +761,6 @@ var StripeWebhookService = class {
           partyType: 'USER',
           description: event.data.object.description ?? void 0,
           active: true,
-          providerFields: event.data.object,
           externalId: event.data.object.id,
           billingProvider: BillingProviderEnum.STRIPE,
           startDate: new Date(event.data.object.created),