@forklaunch/implementation-billing-base 0.8.23 → 0.9.0

package/lib/eject/services/subscription.service.ts

@@ -11,22 +11,23 @@ import {
   UpdateSubscriptionDto
 } from '@forklaunch/interfaces-billing/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BaseSubscriptionDtos } from '../domain/types/baseBillingDto.types';
 import { BaseSubscriptionEntities } from '../domain/types/baseBillingEntity.types';
 import { SubscriptionMappers } from '../domain/types/subscription.mapper.types';
+import { Subscription } from '../persistence/entities';
 
 export class BaseSubscriptionService<
   SchemaValidator extends AnySchemaValidator,
   PartyType,
   BillingProviderType,
-  Entities extends BaseSubscriptionEntities<PartyType, BillingProviderType>,
-  Dto extends BaseSubscriptionDtos<
+  MapperEntities extends BaseSubscriptionEntities<
     PartyType,
     BillingProviderType
-  > = BaseSubscriptionDtos<PartyType, BillingProviderType>
-> implements SubscriptionService<PartyType, BillingProviderType>
-{
+  >,
+  Dto extends BaseSubscriptionDtos<PartyType, BillingProviderType> =
+    BaseSubscriptionDtos<PartyType, BillingProviderType>
+> implements SubscriptionService<PartyType, BillingProviderType> {
   protected evaluatedTelemetryOptions: {
     logging?: boolean;
     metrics?: boolean;
@@ -38,7 +39,7 @@ export class BaseSubscriptionService<
   protected readonly mappers: SubscriptionMappers<
     PartyType,
     BillingProviderType,
-    Entities,
+    MapperEntities,
     Dto
   >;
 
@@ -46,7 +47,12 @@ export class BaseSubscriptionService<
     em: EntityManager,
     openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>,
     schemaValidator: SchemaValidator,
-    mappers: SubscriptionMappers<PartyType, BillingProviderType, Entities, Dto>,
+    mappers: SubscriptionMappers<
+      PartyType,
+      BillingProviderType,
+      MapperEntities,
+      Dto
+    >,
     readonly options?: {
       telemetry?: TelemetryOptions;
     }
@@ -96,11 +102,11 @@ export class BaseSubscriptionService<
       this.openTelemetryCollector.info('Getting subscription', idDto);
     }
     const subscription = await (em ?? this.em).findOneOrFail(
-      'Subscription',
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
       idDto
     );
     return this.mappers.SubscriptionMapper.toDto(
-      subscription as Entities['SubscriptionMapper']
+      subscription as InferEntity<MapperEntities['SubscriptionMapper']>
     );
   }
 
@@ -111,14 +117,17 @@ export class BaseSubscriptionService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting user subscription', id);
     }
-    const subscription = await (em ?? this.em).findOneOrFail('Subscription', {
-      partyId: id,
-      partyType: 'USER',
-      active: true
-    });
+    const subscription = await (em ?? this.em).findOneOrFail(
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
+      {
+        partyId: id,
+        partyType: 'USER',
+        active: true
+      }
+    );
 
     return this.mappers.SubscriptionMapper.toDto(
-      subscription as Entities['SubscriptionMapper']
+      subscription as InferEntity<MapperEntities['SubscriptionMapper']>
     );
   }
 
@@ -129,13 +138,16 @@ export class BaseSubscriptionService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting organization subscription', id);
     }
-    const subscription = await (em ?? this.em).findOneOrFail('Subscription', {
-      partyId: id,
-      partyType: 'ORGANIZATION',
-      active: true
-    });
+    const subscription = await (em ?? this.em).findOneOrFail(
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
+      {
+        partyId: id,
+        partyType: 'ORGANIZATION',
+        active: true
+      }
+    );
     return this.mappers.SubscriptionMapper.toDto(
-      subscription as Entities['SubscriptionMapper']
+      subscription as InferEntity<MapperEntities['SubscriptionMapper']>
     );
   }
 
@@ -172,11 +184,14 @@ export class BaseSubscriptionService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Deleting subscription', idDto);
     }
-    const subscription = await (em ?? this.em).findOne('Subscription', idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
+      idDto
+    );
     if (!subscription) {
       throw new Error('Subscription not found');
     }
-    await (em ?? this.em).removeAndFlush(subscription);
+    await (em ?? this.em).remove(subscription).flush();
   }
 
   async listSubscriptions(
@@ -188,12 +203,15 @@ export class BaseSubscriptionService<
     }
     return Promise.all(
       (
-        await (em ?? this.em).findAll('Subscription', {
-          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
-        })
+        await (em ?? this.em).findAll(
+          this.mappers.SubscriptionMapper.entity as typeof Subscription,
+          {
+            where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
+          }
+        )
       ).map((subscription) =>
         this.mappers.SubscriptionMapper.toDto(
-          subscription as Entities['SubscriptionMapper']
+          subscription as InferEntity<MapperEntities['SubscriptionMapper']>
         )
       )
     );
@@ -203,11 +221,14 @@ export class BaseSubscriptionService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Canceling subscription', idDto);
     }
-    const subscription = await (em ?? this.em).findOne('Subscription', idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
+      idDto
+    );
     if (!subscription) {
       throw new Error('Subscription not found');
     }
-    (subscription as Entities['SubscriptionMapper']).active = false;
+    subscription.active = false;
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(subscription);
     });
@@ -217,11 +238,14 @@ export class BaseSubscriptionService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Resuming subscription', idDto);
     }
-    const subscription = await (em ?? this.em).findOne('Subscription', idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity as typeof Subscription,
+      idDto
+    );
     if (!subscription) {
       throw new Error('Subscription not found');
     }
-    (subscription as Entities['SubscriptionMapper']).active = true;
+    subscription.active = true;
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(subscription);
     });

package/lib/services/index.d.mts

@@ -89,7 +89,7 @@ declare class BasePlanService<SchemaValidator extends AnySchemaValidator, PlanCa
     }, em?: EntityManager): Promise<void>;
 }
 
-declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator, PartyType, BillingProviderType, Entities extends BaseSubscriptionEntities<PartyType, BillingProviderType>, Dto extends BaseSubscriptionDtos<PartyType, BillingProviderType> = BaseSubscriptionDtos<PartyType, BillingProviderType>> implements SubscriptionService<PartyType, BillingProviderType> {
+declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator, PartyType, BillingProviderType, MapperEntities extends BaseSubscriptionEntities<PartyType, BillingProviderType>, Dto extends BaseSubscriptionDtos<PartyType, BillingProviderType> = BaseSubscriptionDtos<PartyType, BillingProviderType>> implements SubscriptionService<PartyType, BillingProviderType> {
     readonly options?: {
         telemetry?: TelemetryOptions;
     } | undefined;
@@ -101,8 +101,8 @@ declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator
     protected em: EntityManager;
     protected readonly openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
     protected readonly schemaValidator: SchemaValidator;
-    protected readonly mappers: SubscriptionMappers<PartyType, BillingProviderType, Entities, Dto>;
-    constructor(em: EntityManager, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: SubscriptionMappers<PartyType, BillingProviderType, Entities, Dto>, options?: {
+    protected readonly mappers: SubscriptionMappers<PartyType, BillingProviderType, MapperEntities, Dto>;
+    constructor(em: EntityManager, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: SubscriptionMappers<PartyType, BillingProviderType, MapperEntities, Dto>, options?: {
         telemetry?: TelemetryOptions;
     } | undefined);
     createSubscription(subscriptionDto: CreateSubscriptionDto<PartyType, BillingProviderType>, em?: EntityManager, ...args: unknown[]): Promise<Dto['SubscriptionMapper']>;

package/lib/services/index.d.ts

@@ -89,7 +89,7 @@ declare class BasePlanService<SchemaValidator extends AnySchemaValidator, PlanCa
     }, em?: EntityManager): Promise<void>;
 }
 
-declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator, PartyType, BillingProviderType, Entities extends BaseSubscriptionEntities<PartyType, BillingProviderType>, Dto extends BaseSubscriptionDtos<PartyType, BillingProviderType> = BaseSubscriptionDtos<PartyType, BillingProviderType>> implements SubscriptionService<PartyType, BillingProviderType> {
+declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator, PartyType, BillingProviderType, MapperEntities extends BaseSubscriptionEntities<PartyType, BillingProviderType>, Dto extends BaseSubscriptionDtos<PartyType, BillingProviderType> = BaseSubscriptionDtos<PartyType, BillingProviderType>> implements SubscriptionService<PartyType, BillingProviderType> {
     readonly options?: {
         telemetry?: TelemetryOptions;
     } | undefined;
@@ -101,8 +101,8 @@ declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator
     protected em: EntityManager;
     protected readonly openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>;
     protected readonly schemaValidator: SchemaValidator;
-    protected readonly mappers: SubscriptionMappers<PartyType, BillingProviderType, Entities, Dto>;
-    constructor(em: EntityManager, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: SubscriptionMappers<PartyType, BillingProviderType, Entities, Dto>, options?: {
+    protected readonly mappers: SubscriptionMappers<PartyType, BillingProviderType, MapperEntities, Dto>;
+    constructor(em: EntityManager, openTelemetryCollector: OpenTelemetryCollector<MetricsDefinition>, schemaValidator: SchemaValidator, mappers: SubscriptionMappers<PartyType, BillingProviderType, MapperEntities, Dto>, options?: {
         telemetry?: TelemetryOptions;
     } | undefined);
     createSubscription(subscriptionDto: CreateSubscriptionDto<PartyType, BillingProviderType>, em?: EntityManager, ...args: unknown[]): Promise<Dto['SubscriptionMapper']>;

package/lib/services/index.js

@@ -68,7 +68,7 @@ var BaseBillingPortalService = class {
       ...args[0] instanceof import_core.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(billingPortal);
+      await this.em.persist(billingPortal).flush();
     }
     const createdBillingPortalDto = await this.mappers.BillingPortalMapper.toDto(billingPortal);
     await this.cache.putRecord({
@@ -112,9 +112,9 @@ var BaseBillingPortalService = class {
       ...args[0] instanceof import_core.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush({
+      await this.em.persist({
         billingPortal
-      });
+      }).flush();
     }
     const updatedBillingPortalDto = {
       ...existingBillingPortal,
@@ -189,7 +189,7 @@ var BaseCheckoutSessionService = class {
     );
     const createdCheckoutSessionDto = await this.mappers.CheckoutSessionMapper.toDto(checkoutSession);
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(checkoutSession);
+      await this.em.persist(checkoutSession).flush();
     }
     await this.cache.putRecord({
       key: this.createCacheKey(createdCheckoutSessionDto.id),
@@ -226,11 +226,14 @@ var BaseCheckoutSessionService = class {
       this.openTelemetryCollector.info("Checkout success", { id });
     }
     if (this.enableDatabaseBackup) {
-      const checkoutSession = await this.em.upsert("CheckoutSession", {
-        id,
-        status: "SUCCESS"
-      });
-      await this.em.persistAndFlush(checkoutSession);
+      const checkoutSession = await this.em.upsert(
+        this.mappers.CheckoutSessionMapper.entity,
+        {
+          id,
+          status: "SUCCESS"
+        }
+      );
+      await this.em.persist(checkoutSession).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
@@ -239,11 +242,14 @@ var BaseCheckoutSessionService = class {
       this.openTelemetryCollector.info("Checkout failure", { id });
     }
     if (this.enableDatabaseBackup) {
-      const checkoutSession = await this.em.upsert("CheckoutSession", {
-        id,
-        status: "FAILED"
-      });
-      await this.em.persistAndFlush(checkoutSession);
+      const checkoutSession = await this.em.upsert(
+        this.mappers.CheckoutSessionMapper.entity,
+        {
+          id,
+          status: "FAILED"
+        }
+      );
+      await this.em.persist(checkoutSession).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
@@ -286,7 +292,7 @@ var BasePaymentLinkService = class {
       ...args[0] instanceof import_core3.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(paymentLink);
+      await this.em.persist(paymentLink).flush();
     }
     const createdPaymentLinkDto = await this.mappers.PaymentLinkMapper.toDto(paymentLink);
     await this.cache.putRecord({
@@ -311,7 +317,7 @@ var BasePaymentLinkService = class {
       ...args[0] instanceof import_core3.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(paymentLink);
+      await this.em.persist(paymentLink).flush();
     }
     const updatedLinkDto = {
       ...existingLink,
@@ -340,33 +346,42 @@ var BasePaymentLinkService = class {
   async expirePaymentLink({ id }) {
     this.openTelemetryCollector.info("Payment link expired", { id });
     if (this.enableDatabaseBackup) {
-      const paymentLink = await this.em.upsert("PaymentLink", {
-        id,
-        status: "EXPIRED"
-      });
-      await this.em.removeAndFlush(paymentLink);
+      const paymentLink = await this.em.upsert(
+        this.mappers.PaymentLinkMapper.entity,
+        {
+          id,
+          status: "EXPIRED"
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
   async handlePaymentSuccess({ id }) {
     this.openTelemetryCollector.info("Payment link success", { id });
     if (this.enableDatabaseBackup) {
-      const paymentLink = await this.em.upsert("PaymentLink", {
-        id,
-        status: "COMPLETED"
-      });
-      await this.em.removeAndFlush(paymentLink);
+      const paymentLink = await this.em.upsert(
+        this.mappers.PaymentLinkMapper.entity,
+        {
+          id,
+          status: "COMPLETED"
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
   async handlePaymentFailure({ id }) {
     this.openTelemetryCollector.info("Payment link failure", { id });
     if (this.enableDatabaseBackup) {
-      const paymentLink = await this.em.upsert("PaymentLink", {
-        id,
-        status: "FAILED"
-      });
-      await this.em.removeAndFlush(paymentLink);
+      const paymentLink = await this.em.upsert(
+        this.mappers.PaymentLinkMapper.entity,
+        {
+          id,
+          status: "FAILED"
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
@@ -406,10 +421,15 @@ var BasePlanService = class {
       this.openTelemetryCollector.info("Listing plans", idsDto);
     }
     return Promise.all(
-      (await (em ?? this.em).findAll("Plan", {
-        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
-      })).map(
-        (plan) => this.mappers.PlanMapper.toDto(plan)
+      (await (em ?? this.em).findAll(
+        this.mappers.PlanMapper.entity,
+        {
+          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
+        }
+      )).map(
+        (plan) => this.mappers.PlanMapper.toDto(
+          plan
+        )
       )
     );
   }
@@ -431,8 +451,13 @@ var BasePlanService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting plan", idDto);
     }
-    const plan = await (em ?? this.em).findOneOrFail("Plan", idDto);
-    return this.mappers.PlanMapper.toDto(plan);
+    const plan = await (em ?? this.em).findOneOrFail(
+      this.mappers.PlanMapper.entity,
+      idDto
+    );
+    return this.mappers.PlanMapper.toDto(
+      plan
+    );
   }
   async updatePlan(planDto, em, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -454,7 +479,10 @@ var BasePlanService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting plan", idDto);
     }
-    await (em ?? this.em).nativeDelete("Plan", idDto);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.PlanMapper.entity,
+      idDto
+    );
   }
 };
 
@@ -502,7 +530,7 @@ var BaseSubscriptionService = class {
       this.openTelemetryCollector.info("Getting subscription", idDto);
     }
     const subscription = await (em ?? this.em).findOneOrFail(
-      "Subscription",
+      this.mappers.SubscriptionMapper.entity,
       idDto
     );
     return this.mappers.SubscriptionMapper.toDto(
@@ -513,11 +541,14 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting user subscription", id);
     }
-    const subscription = await (em ?? this.em).findOneOrFail("Subscription", {
-      partyId: id,
-      partyType: "USER",
-      active: true
-    });
+    const subscription = await (em ?? this.em).findOneOrFail(
+      this.mappers.SubscriptionMapper.entity,
+      {
+        partyId: id,
+        partyType: "USER",
+        active: true
+      }
+    );
     return this.mappers.SubscriptionMapper.toDto(
       subscription
     );
@@ -526,11 +557,14 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Getting organization subscription", id);
     }
-    const subscription = await (em ?? this.em).findOneOrFail("Subscription", {
-      partyId: id,
-      partyType: "ORGANIZATION",
-      active: true
-    });
+    const subscription = await (em ?? this.em).findOneOrFail(
+      this.mappers.SubscriptionMapper.entity,
+      {
+        partyId: id,
+        partyType: "ORGANIZATION",
+        active: true
+      }
+    );
     return this.mappers.SubscriptionMapper.toDto(
       subscription
     );
@@ -558,20 +592,26 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Deleting subscription", idDto);
     }
-    const subscription = await (em ?? this.em).findOne("Subscription", idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity,
+      idDto
+    );
     if (!subscription) {
       throw new Error("Subscription not found");
     }
-    await (em ?? this.em).removeAndFlush(subscription);
+    await (em ?? this.em).remove(subscription).flush();
   }
   async listSubscriptions(idsDto, em) {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Listing subscriptions", idsDto);
     }
     return Promise.all(
-      (await (em ?? this.em).findAll("Subscription", {
-        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
-      })).map(
+      (await (em ?? this.em).findAll(
+        this.mappers.SubscriptionMapper.entity,
+        {
+          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
+        }
+      )).map(
         (subscription) => this.mappers.SubscriptionMapper.toDto(
           subscription
         )
@@ -582,7 +622,10 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Canceling subscription", idDto);
     }
-    const subscription = await (em ?? this.em).findOne("Subscription", idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity,
+      idDto
+    );
     if (!subscription) {
       throw new Error("Subscription not found");
     }
@@ -595,7 +638,10 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Resuming subscription", idDto);
     }
-    const subscription = await (em ?? this.em).findOne("Subscription", idDto);
+    const subscription = await (em ?? this.em).findOne(
+      this.mappers.SubscriptionMapper.entity,
+      idDto
+    );
     if (!subscription) {
       throw new Error("Subscription not found");
     }