@forklaunch/implementation-billing-base 0.8.23 → 0.9.0

package/lib/eject/domain/types/baseBillingEntity.types.ts

@@ -1,16 +1,22 @@
 import {
-  BillingPortalDto,
-  CheckoutSessionDto,
-  PaymentLinkDto,
-  PlanDto,
-  SubscriptionDto
-} from '@forklaunch/interfaces-billing/types';
+  BillingPortal,
+  CheckoutSession,
+  PaymentLink,
+  Plan,
+  Subscription
+} from '../../persistence/entities';
 
-// billing entity types
+// billing portal entity types
 export type BaseBillingEntities = {
-  BillingPortalMapper: BillingPortalDto;
-  CreateBillingPortalMapper: BillingPortalDto;
-  UpdateBillingPortalMapper: BillingPortalDto;
+  BillingPortalMapper: {
+    '~entity': (typeof BillingPortal)['~entity'];
+  };
+  CreateBillingPortalMapper: {
+    '~entity': (typeof BillingPortal)['~entity'];
+  };
+  UpdateBillingPortalMapper: {
+    '~entity': (typeof BillingPortal)['~entity'];
+  };
 };
 
 // checkout session entity types
@@ -19,21 +25,27 @@ export type BaseCheckoutSessionEntities<
   CurrencyEnum,
   StatusEnum
 > = {
-  CheckoutSessionMapper: CheckoutSessionDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
-  CreateCheckoutSessionMapper: CheckoutSessionDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
-  UpdateCheckoutSessionMapper: CheckoutSessionDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
+  CheckoutSessionMapper: {
+    '~entity': (typeof CheckoutSession)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
+  CreateCheckoutSessionMapper: {
+    '~entity': (typeof CheckoutSession)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
+  UpdateCheckoutSessionMapper: {
+    '~entity': (typeof CheckoutSession)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
 };
 
 // payment link entity types
@@ -42,21 +54,27 @@ export type BasePaymentLinkEntities<
   CurrencyEnum,
   StatusEnum
 > = {
-  PaymentLinkMapper: PaymentLinkDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
-  CreatePaymentLinkMapper: PaymentLinkDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
-  UpdatePaymentLinkMapper: PaymentLinkDto<
-    PaymentMethodEnum,
-    CurrencyEnum,
-    StatusEnum
-  >;
+  PaymentLinkMapper: {
+    '~entity': (typeof PaymentLink)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
+  CreatePaymentLinkMapper: {
+    '~entity': (typeof PaymentLink)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
+  UpdatePaymentLinkMapper: {
+    '~entity': (typeof PaymentLink)['~entity'] & {
+      paymentMethods: PaymentMethodEnum[keyof PaymentMethodEnum][];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      status: StatusEnum[keyof StatusEnum];
+    };
+  };
 };
 
 // plan entity types
@@ -65,14 +83,47 @@ export type BasePlanEntities<
   CurrencyEnum,
   BillingProviderEnum
 > = {
-  PlanMapper: PlanDto<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum>;
-  CreatePlanMapper: PlanDto<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum>;
-  UpdatePlanMapper: PlanDto<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum>;
+  PlanMapper: {
+    '~entity': (typeof Plan)['~entity'] & {
+      cadence: PlanCadenceEnum[keyof PlanCadenceEnum];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      billingProvider: BillingProviderEnum[keyof BillingProviderEnum] | null;
+    };
+  };
+  CreatePlanMapper: {
+    '~entity': (typeof Plan)['~entity'] & {
+      cadence: PlanCadenceEnum[keyof PlanCadenceEnum];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      billingProvider: BillingProviderEnum[keyof BillingProviderEnum] | null;
+    };
+  };
+  UpdatePlanMapper: {
+    '~entity': (typeof Plan)['~entity'] & {
+      cadence: PlanCadenceEnum[keyof PlanCadenceEnum];
+      currency: CurrencyEnum[keyof CurrencyEnum];
+      billingProvider: BillingProviderEnum[keyof BillingProviderEnum] | null;
+    };
+  };
 };
 
 // subscription entity types
 export type BaseSubscriptionEntities<PartyType, BillingProviderType> = {
-  SubscriptionMapper: SubscriptionDto<PartyType, BillingProviderType>;
-  CreateSubscriptionMapper: SubscriptionDto<PartyType, BillingProviderType>;
-  UpdateSubscriptionMapper: SubscriptionDto<PartyType, BillingProviderType>;
+  SubscriptionMapper: {
+    '~entity': (typeof Subscription)['~entity'] & {
+      partyType: PartyType[keyof PartyType];
+      billingProvider: BillingProviderType[keyof BillingProviderType] | null;
+    };
+  };
+  CreateSubscriptionMapper: {
+    '~entity': (typeof Subscription)['~entity'] & {
+      partyType: PartyType[keyof PartyType];
+      billingProvider: BillingProviderType[keyof BillingProviderType] | null;
+    };
+  };
+  UpdateSubscriptionMapper: {
+    '~entity': (typeof Subscription)['~entity'] & {
+      partyType: PartyType[keyof PartyType];
+      billingProvider: BillingProviderType[keyof BillingProviderType] | null;
+    };
+  };
 };

package/lib/eject/domain/types/billingPortal.mapper.types.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BaseBillingDtos } from './baseBillingDto.types';
 import { BaseBillingEntities } from './baseBillingEntity.types';
 
@@ -7,22 +7,25 @@ export type BillingPortalMappers<
   MapperDomains extends BaseBillingDtos
 > = {
   BillingPortalMapper: {
+    entity: MapperEntities['BillingPortalMapper'];
     toDto: (
-      entity: MapperEntities['BillingPortalMapper']
+      entity: InferEntity<MapperEntities['BillingPortalMapper']>
     ) => Promise<MapperDomains['BillingPortalMapper']>;
   };
   CreateBillingPortalMapper: {
+    entity: MapperEntities['CreateBillingPortalMapper'];
     toEntity: (
       dto: MapperDomains['CreateBillingPortalMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['CreateBillingPortalMapper']>;
+    ) => Promise<InferEntity<MapperEntities['CreateBillingPortalMapper']>>;
   };
   UpdateBillingPortalMapper: {
+    entity: MapperEntities['UpdateBillingPortalMapper'];
     toEntity: (
       dto: MapperDomains['UpdateBillingPortalMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['UpdateBillingPortalMapper']>;
+    ) => Promise<InferEntity<MapperEntities['UpdateBillingPortalMapper']>>;
   };
 };

package/lib/eject/domain/types/checkoutSession.mapper.types.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BaseCheckoutSessionDtos } from './baseBillingDto.types';
 import { BaseCheckoutSessionEntities } from './baseBillingEntity.types';
 
@@ -18,22 +18,25 @@ export type CheckoutSessionMappers<
   >
 > = {
   CheckoutSessionMapper: {
+    entity: MapperEntities['CheckoutSessionMapper'];
     toDto: (
-      entity: MapperEntities['CheckoutSessionMapper']
+      entity: InferEntity<MapperEntities['CheckoutSessionMapper']>
     ) => Promise<MapperDomains['CheckoutSessionMapper']>;
   };
   CreateCheckoutSessionMapper: {
+    entity: MapperEntities['CreateCheckoutSessionMapper'];
     toEntity: (
       dto: MapperDomains['CreateCheckoutSessionMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['CreateCheckoutSessionMapper']>;
+    ) => Promise<InferEntity<MapperEntities['CreateCheckoutSessionMapper']>>;
   };
   UpdateCheckoutSessionMapper: {
+    entity: MapperEntities['UpdateCheckoutSessionMapper'];
     toEntity: (
       dto: MapperDomains['UpdateCheckoutSessionMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['UpdateCheckoutSessionMapper']>;
+    ) => Promise<InferEntity<MapperEntities['UpdateCheckoutSessionMapper']>>;
   };
 };

package/lib/eject/domain/types/paymentLink.mapper.types.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BasePaymentLinkDtos } from './baseBillingDto.types';
 import { BasePaymentLinkEntities } from './baseBillingEntity.types';
 
@@ -18,22 +18,25 @@ export type PaymentLinkMappers<
   >
 > = {
   PaymentLinkMapper: {
+    entity: MapperEntities['PaymentLinkMapper'];
     toDto: (
-      entity: MapperEntities['PaymentLinkMapper']
+      entity: InferEntity<MapperEntities['PaymentLinkMapper']>
     ) => Promise<MapperDomains['PaymentLinkMapper']>;
   };
   CreatePaymentLinkMapper: {
+    entity: MapperEntities['CreatePaymentLinkMapper'];
     toEntity: (
       dto: MapperDomains['CreatePaymentLinkMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['CreatePaymentLinkMapper']>;
+    ) => Promise<InferEntity<MapperEntities['CreatePaymentLinkMapper']>>;
   };
   UpdatePaymentLinkMapper: {
+    entity: MapperEntities['UpdatePaymentLinkMapper'];
     toEntity: (
       dto: MapperDomains['UpdatePaymentLinkMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['UpdatePaymentLinkMapper']>;
+    ) => Promise<InferEntity<MapperEntities['UpdatePaymentLinkMapper']>>;
   };
 };

package/lib/eject/domain/types/plan.mapper.types.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BasePlanDtos } from './baseBillingDto.types';
 import { BasePlanEntities } from './baseBillingEntity.types';
 
@@ -18,22 +18,25 @@ export type PlanMappers<
   >
 > = {
   PlanMapper: {
+    entity: MapperEntities['PlanMapper'];
     toDto: (
-      entity: MapperEntities['PlanMapper']
+      entity: InferEntity<MapperEntities['PlanMapper']>
     ) => Promise<MapperDomains['PlanMapper']>;
   };
   CreatePlanMapper: {
+    entity: MapperEntities['CreatePlanMapper'];
     toEntity: (
       dto: MapperDomains['CreatePlanMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['CreatePlanMapper']>;
+    ) => Promise<InferEntity<MapperEntities['CreatePlanMapper']>>;
   };
   UpdatePlanMapper: {
+    entity: MapperEntities['UpdatePlanMapper'];
     toEntity: (
       dto: MapperDomains['UpdatePlanMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['UpdatePlanMapper']>;
+    ) => Promise<InferEntity<MapperEntities['UpdatePlanMapper']>>;
   };
 };

package/lib/eject/domain/types/subscription.mapper.types.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BaseSubscriptionDtos } from './baseBillingDto.types';
 import { BaseSubscriptionEntities } from './baseBillingEntity.types';
 
@@ -12,22 +12,25 @@ export type SubscriptionMappers<
   MapperDomains extends BaseSubscriptionDtos<PartyType, BillingProviderType>
 > = {
   SubscriptionMapper: {
+    entity: MapperEntities['SubscriptionMapper'];
     toDto: (
-      entity: MapperEntities['SubscriptionMapper']
+      entity: InferEntity<MapperEntities['SubscriptionMapper']>
     ) => Promise<MapperDomains['SubscriptionMapper']>;
   };
   CreateSubscriptionMapper: {
+    entity: MapperEntities['CreateSubscriptionMapper'];
     toEntity: (
       dto: MapperDomains['CreateSubscriptionMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['CreateSubscriptionMapper']>;
+    ) => Promise<InferEntity<MapperEntities['CreateSubscriptionMapper']>>;
   };
   UpdateSubscriptionMapper: {
+    entity: MapperEntities['UpdateSubscriptionMapper'];
     toEntity: (
       dto: MapperDomains['UpdateSubscriptionMapper'],
       em: EntityManager,
       ...args: unknown[]
-    ) => Promise<MapperEntities['UpdateSubscriptionMapper']>;
+    ) => Promise<InferEntity<MapperEntities['UpdateSubscriptionMapper']>>;
   };
 };

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

@@ -21,8 +21,7 @@ export class BaseBillingPortalService<
   SchemaValidator extends AnySchemaValidator,
   MapperEntities extends BaseBillingEntities,
   MapperDomains extends BaseBillingDtos = BaseBillingDtos
-> implements BillingPortalService
-{
+> implements BillingPortalService {
   private evaluatedTelemetryOptions: {
     logging?: boolean;
     metrics?: boolean;
@@ -81,7 +80,7 @@ export class BaseBillingPortalService<
     );
 
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(billingPortal);
+      await this.em.persist(billingPortal).flush();
     }
 
     const createdBillingPortalDto =
@@ -104,7 +103,7 @@ export class BaseBillingPortalService<
     }
 
     const billingPortalDetails = await this.cache.readRecord<
-      MapperEntities['BillingPortalMapper']
+      MapperDomains['BillingPortalMapper']
     >(this.createCacheKey(idDto.id));
 
     if (!billingPortalDetails) {
@@ -147,9 +146,11 @@ export class BaseBillingPortalService<
     );
 
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush({
-        billingPortal
-      });
+      await this.em
+        .persist({
+          billingPortal
+        })
+        .flush();
     }
 
     const updatedBillingPortalDto = {

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

@@ -10,6 +10,7 @@ import { CheckoutSessionService } from '@forklaunch/interfaces-billing/interface
 import { CreateCheckoutSessionDto } from '@forklaunch/interfaces-billing/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
+import { CheckoutSession } from '../persistence/entities';
 import { BaseCheckoutSessionDtos } from '../domain/types/baseBillingDto.types';
 import { BaseCheckoutSessionEntities } from '../domain/types/baseBillingEntity.types';
 import { CheckoutSessionMappers } from '../domain/types/checkoutSession.mapper.types';
@@ -29,8 +30,11 @@ export class BaseCheckoutSessionService<
     CurrencyEnum,
     StatusEnum
   > = BaseCheckoutSessionDtos<PaymentMethodEnum, CurrencyEnum, StatusEnum>
-> implements CheckoutSessionService<PaymentMethodEnum, CurrencyEnum, StatusEnum>
-{
+> implements CheckoutSessionService<
+  PaymentMethodEnum,
+  CurrencyEnum,
+  StatusEnum
+> {
   private evaluatedTelemetryOptions: {
     logging?: boolean;
     metrics?: boolean;
@@ -109,7 +113,7 @@ export class BaseCheckoutSessionService<
       await this.mappers.CheckoutSessionMapper.toDto(checkoutSession);
 
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(checkoutSession);
+      await this.em.persist(checkoutSession).flush();
     }
 
     await this.cache.putRecord({
@@ -125,7 +129,7 @@ export class BaseCheckoutSessionService<
     id
   }: IdDto): Promise<MapperDomains['CheckoutSessionMapper']> {
     const checkoutSessionDetails = await this.cache.readRecord<
-      MapperEntities['CheckoutSessionMapper']
+      MapperDomains['CheckoutSessionMapper']
     >(this.createCacheKey(id));
     if (!checkoutSessionDetails) {
       throw new Error('Session not found');
@@ -155,11 +159,14 @@ export class BaseCheckoutSessionService<
     }
 
     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 as typeof CheckoutSession,
+        {
+          id,
+          status: 'SUCCESS'
+        }
+      );
+      await this.em.persist(checkoutSession).flush();
     }
 
     await this.cache.deleteRecord(this.createCacheKey(id));
@@ -171,11 +178,14 @@ export class BaseCheckoutSessionService<
     }
 
     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 as typeof CheckoutSession,
+        {
+          id,
+          status: 'FAILED'
+        }
+      );
+      await this.em.persist(checkoutSession).flush();
     }
 
     await this.cache.deleteRecord(this.createCacheKey(id));

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

@@ -13,6 +13,7 @@ import {
 } from '@forklaunch/interfaces-billing/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
 import { EntityManager } from '@mikro-orm/core';
+import { PaymentLink } from '../persistence/entities';
 import { BasePaymentLinkDtos } from '../domain/types/baseBillingDto.types';
 import { BasePaymentLinkEntities } from '../domain/types/baseBillingEntity.types';
 import { PaymentLinkMappers } from '../domain/types/paymentLink.mapper.types';
@@ -32,8 +33,7 @@ export class BasePaymentLinkService<
     CurrencyEnum,
     StatusEnum
   > = BasePaymentLinkDtos<PaymentMethodEnum, CurrencyEnum, StatusEnum>
-> implements PaymentLinkService<PaymentMethodEnum, CurrencyEnum, StatusEnum>
-{
+> implements PaymentLinkService<PaymentMethodEnum, CurrencyEnum, StatusEnum> {
   private evaluatedTelemetryOptions: {
     logging?: boolean;
     metrics?: boolean;
@@ -106,7 +106,7 @@ export class BasePaymentLinkService<
     );
 
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(paymentLink);
+      await this.em.persist(paymentLink).flush();
     }
 
     const createdPaymentLinkDto =
@@ -147,7 +147,7 @@ export class BasePaymentLinkService<
     );
 
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(paymentLink);
+      await this.em.persist(paymentLink).flush();
     }
 
     const updatedLinkDto = {
@@ -185,11 +185,14 @@ export class BasePaymentLinkService<
     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 as typeof PaymentLink,
+        {
+          id,
+          status: 'EXPIRED'
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
@@ -197,11 +200,14 @@ export class BasePaymentLinkService<
   async handlePaymentSuccess({ id }: IdDto): Promise<void> {
     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 as typeof PaymentLink,
+        {
+          id,
+          status: 'COMPLETED'
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
@@ -209,11 +215,14 @@ export class BasePaymentLinkService<
   async handlePaymentFailure({ id }: IdDto): Promise<void> {
     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 as typeof PaymentLink,
+        {
+          id,
+          status: 'FAILED'
+        }
+      );
+      await this.em.remove(paymentLink).flush();
     }
     await this.cache.deleteRecord(this.createCacheKey(id));
   }

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

@@ -11,10 +11,11 @@ import {
   UpdatePlanDto
 } from '@forklaunch/interfaces-billing/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager } from '@mikro-orm/core';
+import { EntityManager, InferEntity } from '@mikro-orm/core';
 import { BasePlanDtos } from '../domain/types/baseBillingDto.types';
 import { BasePlanEntities } from '../domain/types/baseBillingEntity.types';
 import { PlanMappers } from '../domain/types/plan.mapper.types';
+import { Plan } from '../persistence/entities';
 
 export class BasePlanService<
   SchemaValidator extends AnySchemaValidator,
@@ -31,8 +32,7 @@ export class BasePlanService<
     CurrencyEnum,
     BillingProviderEnum
   > = BasePlanDtos<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum>
-> implements PlanService<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum>
-{
+> implements PlanService<PlanCadenceEnum, CurrencyEnum, BillingProviderEnum> {
   private evaluatedTelemetryOptions: {
     logging?: boolean;
     metrics?: boolean;
@@ -87,11 +87,16 @@ export class BasePlanService<
 
     return Promise.all(
       (
-        await (em ?? this.em).findAll('Plan', {
-          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
-        })
+        await (em ?? this.em).findAll(
+          this.mappers.PlanMapper.entity as typeof Plan,
+          {
+            where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
+          }
+        )
       ).map((plan) =>
-        this.mappers.PlanMapper.toDto(plan as MapperEntities['PlanMapper'])
+        this.mappers.PlanMapper.toDto(
+          plan as InferEntity<MapperEntities['PlanMapper']>
+        )
       )
     );
   }
@@ -122,8 +127,13 @@ export class BasePlanService<
     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 as MapperEntities['PlanMapper']);
+    const plan = await (em ?? this.em).findOneOrFail(
+      this.mappers.PlanMapper.entity as typeof Plan,
+      idDto
+    );
+    return this.mappers.PlanMapper.toDto(
+      plan as InferEntity<MapperEntities['PlanMapper']>
+    );
   }
 
   async updatePlan(
@@ -151,6 +161,9 @@ export class BasePlanService<
     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 as typeof Plan,
+      idDto
+    );
   }
 }