@forklaunch/implementation-billing-base 0.7.4 → 0.8.0

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

@@ -76,8 +76,8 @@ export class BaseBillingPortalService<
 
     const billingPortal = await this.mappers.CreateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
 
     if (this.enableDatabaseBackup) {
@@ -111,7 +111,12 @@ export class BaseBillingPortalService<
       throw new Error('Session not found');
     }
 
-    return billingPortalDetails.value;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortalDetails.value,
+        this.em
+      )
+    );
   }
 
   async updateBillingPortalSession(
@@ -137,8 +142,8 @@ export class BaseBillingPortalService<
 
     const billingPortal = await this.mappers.UpdateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
 
     if (this.enableDatabaseBackup) {
@@ -158,7 +163,12 @@ export class BaseBillingPortalService<
       ttlMilliseconds: this.cache.getTtlMilliseconds()
     });
 
-    return updatedBillingPortalDto;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortal,
+        this.em
+      )
+    );
   }
 
   async expireBillingPortalSession(idDto: IdDto): Promise<void> {

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

@@ -101,8 +101,8 @@ export class BaseCheckoutSessionService<
     const checkoutSession =
       await this.mappers.CreateCheckoutSessionMapper.toEntity(
         checkoutSessionDto,
-        this.em,
-        ...args
+        args[0] instanceof EntityManager ? args[0] : this.em,
+        ...(args[0] instanceof EntityManager ? args.slice(1) : args)
       );
 
     const createdCheckoutSessionDto =
@@ -132,7 +132,10 @@ export class BaseCheckoutSessionService<
     }
 
     return this.mappers.CheckoutSessionMapper.toDto(
-      checkoutSessionDetails.value
+      await this.mappers.UpdateCheckoutSessionMapper.toEntity(
+        checkoutSessionDetails.value,
+        this.em
+      )
     );
   }
 

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

@@ -101,8 +101,8 @@ export class BasePaymentLinkService<
 
     const paymentLink = await this.mappers.CreatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
 
     if (this.enableDatabaseBackup) {
@@ -142,8 +142,8 @@ export class BasePaymentLinkService<
     }
     const paymentLink = await this.mappers.UpdatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
 
     if (this.enableDatabaseBackup) {
@@ -179,7 +179,12 @@ export class BasePaymentLinkService<
       throw new Error('Payment link not found');
     }
 
-    return this.mappers.PaymentLinkMapper.toDto(paymentLink.value);
+    return this.mappers.PaymentLinkMapper.toDto(
+      await this.mappers.UpdatePaymentLinkMapper.toEntity(
+        paymentLink.value,
+        this.em
+      )
+    );
   }
 
   async expirePaymentLink({ id }: IdDto): Promise<void> {
@@ -223,15 +228,20 @@ export class BasePaymentLinkService<
     idsDto?: IdsDto
   ): Promise<MapperDomains['PaymentLinkMapper'][]> {
     const keys =
-      idsDto?.ids.map((id) => this.createCacheKey(id)) ??
-      (await this.cache.listKeys(this.cacheKeyPrefix));
+      idsDto?.ids && idsDto.ids.length > 0
+        ? idsDto?.ids.map((id) => this.createCacheKey(id))
+        : await this.cache.listKeys(this.cacheKeyPrefix);
 
+    console.log('keys', keys);
     return Promise.all(
       keys.map(async (key) => {
         const paymentLink =
           await this.cache.readRecord<MapperEntities['PaymentLinkMapper']>(key);
         const paymentLinkDto = this.mappers.PaymentLinkMapper.toDto(
-          paymentLink.value
+          await this.mappers.UpdatePaymentLinkMapper.toEntity(
+            paymentLink.value,
+            this.em
+          )
         );
         return paymentLinkDto;
       })

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

@@ -84,10 +84,11 @@ export class BasePlanService<
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Listing plans', idsDto);
     }
+
     return Promise.all(
       (
         await (em ?? this.em).findAll('Plan', {
-          filters: idsDto?.ids ? { id: { $in: idsDto.ids } } : undefined
+          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
         })
       ).map((plan) =>
         this.mappers.PlanMapper.toDto(plan as MapperEntities['PlanMapper'])
@@ -106,7 +107,7 @@ export class BasePlanService<
     const plan = await this.mappers.CreatePlanMapper.toEntity(
       planDto,
       em ?? this.em,
-      ...args
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(plan);

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

@@ -1,4 +1,4 @@
-import { IdDto } from '@forklaunch/common';
+import { IdDto, IdsDto } from '@forklaunch/common';
 import {
   evaluateTelemetryOptions,
   MetricsDefinition,
@@ -78,7 +78,7 @@ export class BaseSubscriptionService<
     const subscription = await this.mappers.CreateSubscriptionMapper.toEntity(
       subscriptionDto,
       em ?? this.em,
-      ...args
+      ...(args[0] instanceof EntityManager ? args.slice(1) : args)
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(subscription);
@@ -180,29 +180,22 @@ export class BaseSubscriptionService<
   }
 
   async listSubscriptions(
-    idsDto: { ids?: string[] },
+    idsDto?: IdsDto,
     em?: EntityManager
   ): Promise<Dto['SubscriptionMapper'][]> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Listing subscriptions', idsDto);
     }
-    const subscriptions = await (em ?? this.em).findAll('Subscription', {
-      where: idsDto.ids
-        ? {
-            id: {
-              $in: idsDto.ids
-            }
-          }
-        : undefined
-    });
-
     return Promise.all(
-      subscriptions.map((subscription) => {
-        const subscriptionDto = this.mappers.SubscriptionMapper.toDto(
+      (
+        await (em ?? this.em).findAll('Subscription', {
+          where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : undefined
+        })
+      ).map((subscription) =>
+        this.mappers.SubscriptionMapper.toDto(
           subscription as Entities['SubscriptionMapper']
-        );
-        return subscriptionDto;
-      })
+        )
+      )
     );
   }
 

package/lib/services/index.d.mts

@@ -113,9 +113,7 @@ declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator
     deleteSubscription(idDto: {
         id: string;
     }, em?: EntityManager): Promise<void>;
-    listSubscriptions(idsDto: {
-        ids?: string[];
-    }, em?: EntityManager): Promise<Dto['SubscriptionMapper'][]>;
+    listSubscriptions(idsDto?: IdsDto, em?: EntityManager): Promise<Dto['SubscriptionMapper'][]>;
     cancelSubscription(idDto: IdDto, em?: EntityManager): Promise<void>;
     resumeSubscription(idDto: IdDto, em?: EntityManager): Promise<void>;
 }

package/lib/services/index.d.ts

@@ -113,9 +113,7 @@ declare class BaseSubscriptionService<SchemaValidator extends AnySchemaValidator
     deleteSubscription(idDto: {
         id: string;
     }, em?: EntityManager): Promise<void>;
-    listSubscriptions(idsDto: {
-        ids?: string[];
-    }, em?: EntityManager): Promise<Dto['SubscriptionMapper'][]>;
+    listSubscriptions(idsDto?: IdsDto, em?: EntityManager): Promise<Dto['SubscriptionMapper'][]>;
     cancelSubscription(idDto: IdDto, em?: EntityManager): Promise<void>;
     resumeSubscription(idDto: IdDto, em?: EntityManager): Promise<void>;
 }

package/lib/services/index.js

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(services_exports);
 // services/billingPortal.service.ts
 var import_cache = require("@forklaunch/core/cache");
 var import_http = require("@forklaunch/core/http");
+var import_core = require("@mikro-orm/core");
 var BaseBillingPortalService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -63,8 +64,8 @@ var BaseBillingPortalService = class {
     }
     const billingPortal = await this.mappers.CreateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof import_core.EntityManager ? args[0] : this.em,
+      ...args[0] instanceof import_core.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(billingPortal);
@@ -85,7 +86,12 @@ var BaseBillingPortalService = class {
     if (!billingPortalDetails) {
       throw new Error("Session not found");
     }
-    return billingPortalDetails.value;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortalDetails.value,
+        this.em
+      )
+    );
   }
   async updateBillingPortalSession(billingPortalDto, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -102,8 +108,8 @@ var BaseBillingPortalService = class {
     }
     const billingPortal = await this.mappers.UpdateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof import_core.EntityManager ? args[0] : this.em,
+      ...args[0] instanceof import_core.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush({
@@ -119,7 +125,12 @@ var BaseBillingPortalService = class {
       value: updatedBillingPortalDto,
       ttlMilliseconds: this.cache.getTtlMilliseconds()
     });
-    return updatedBillingPortalDto;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortal,
+        this.em
+      )
+    );
   }
   async expireBillingPortalSession(idDto) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -141,6 +152,7 @@ var BaseBillingPortalService = class {
 // services/checkoutSession.service.ts
 var import_cache2 = require("@forklaunch/core/cache");
 var import_http2 = require("@forklaunch/core/http");
+var import_core2 = require("@mikro-orm/core");
 var BaseCheckoutSessionService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -172,8 +184,8 @@ var BaseCheckoutSessionService = class {
     }
     const checkoutSession = await this.mappers.CreateCheckoutSessionMapper.toEntity(
       checkoutSessionDto,
-      this.em,
-      ...args
+      args[0] instanceof import_core2.EntityManager ? args[0] : this.em,
+      ...args[0] instanceof import_core2.EntityManager ? args.slice(1) : args
     );
     const createdCheckoutSessionDto = await this.mappers.CheckoutSessionMapper.toDto(checkoutSession);
     if (this.enableDatabaseBackup) {
@@ -194,7 +206,10 @@ var BaseCheckoutSessionService = class {
       throw new Error("Session not found");
     }
     return this.mappers.CheckoutSessionMapper.toDto(
-      checkoutSessionDetails.value
+      await this.mappers.UpdateCheckoutSessionMapper.toEntity(
+        checkoutSessionDetails.value,
+        this.em
+      )
     );
   }
   async expireCheckoutSession({ id }) {
@@ -237,6 +252,7 @@ var BaseCheckoutSessionService = class {
 // services/paymentLink.service.ts
 var import_cache3 = require("@forklaunch/core/cache");
 var import_http3 = require("@forklaunch/core/http");
+var import_core3 = require("@mikro-orm/core");
 var BasePaymentLinkService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -266,8 +282,8 @@ var BasePaymentLinkService = class {
     }
     const paymentLink = await this.mappers.CreatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof import_core3.EntityManager ? args[0] : this.em,
+      ...args[0] instanceof import_core3.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(paymentLink);
@@ -291,8 +307,8 @@ var BasePaymentLinkService = class {
     }
     const paymentLink = await this.mappers.UpdatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof import_core3.EntityManager ? args[0] : this.em,
+      ...args[0] instanceof import_core3.EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(paymentLink);
@@ -321,7 +337,12 @@ var BasePaymentLinkService = class {
     if (!paymentLink) {
       throw new Error("Payment link not found");
     }
-    return this.mappers.PaymentLinkMapper.toDto(paymentLink.value);
+    return this.mappers.PaymentLinkMapper.toDto(
+      await this.mappers.UpdatePaymentLinkMapper.toEntity(
+        paymentLink.value,
+        this.em
+      )
+    );
   }
   async expirePaymentLink({ id }) {
     this.openTelemetryCollector.info("Payment link expired", { id });
@@ -357,12 +378,16 @@ var BasePaymentLinkService = class {
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
   async listPaymentLinks(idsDto) {
-    const keys = idsDto?.ids.map((id) => this.createCacheKey(id)) ?? await this.cache.listKeys(this.cacheKeyPrefix);
+    const keys = idsDto?.ids && idsDto.ids.length > 0 ? idsDto?.ids.map((id) => this.createCacheKey(id)) : await this.cache.listKeys(this.cacheKeyPrefix);
+    console.log("keys", keys);
     return Promise.all(
       keys.map(async (key) => {
         const paymentLink = await this.cache.readRecord(key);
         const paymentLinkDto = this.mappers.PaymentLinkMapper.toDto(
-          paymentLink.value
+          await this.mappers.UpdatePaymentLinkMapper.toEntity(
+            paymentLink.value,
+            this.em
+          )
         );
         return paymentLinkDto;
       })
@@ -372,6 +397,7 @@ var BasePaymentLinkService = class {
 
 // services/plan.service.ts
 var import_http4 = require("@forklaunch/core/http");
+var import_core4 = require("@mikro-orm/core");
 var BasePlanService = class {
   evaluatedTelemetryOptions;
   em;
@@ -395,7 +421,7 @@ var BasePlanService = class {
     }
     return Promise.all(
       (await (em ?? this.em).findAll("Plan", {
-        filters: idsDto?.ids ? { id: { $in: idsDto.ids } } : void 0
+        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
       })).map(
         (plan) => this.mappers.PlanMapper.toDto(plan)
       )
@@ -408,7 +434,7 @@ var BasePlanService = class {
     const plan = await this.mappers.CreatePlanMapper.toEntity(
       planDto,
       em ?? this.em,
-      ...args
+      ...args[0] instanceof import_core4.EntityManager ? args.slice(1) : args
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(plan);
@@ -448,6 +474,7 @@ var BasePlanService = class {
 
 // services/subscription.service.ts
 var import_http5 = require("@forklaunch/core/http");
+var import_core5 = require("@mikro-orm/core");
 var BaseSubscriptionService = class {
   constructor(em, openTelemetryCollector, schemaValidator, mappers, options) {
     this.options = options;
@@ -476,7 +503,7 @@ var BaseSubscriptionService = class {
     const subscription = await this.mappers.CreateSubscriptionMapper.toEntity(
       subscriptionDto,
       em ?? this.em,
-      ...args
+      ...args[0] instanceof import_core5.EntityManager ? args.slice(1) : args
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(subscription);
@@ -555,20 +582,14 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Listing subscriptions", idsDto);
     }
-    const subscriptions = await (em ?? this.em).findAll("Subscription", {
-      where: idsDto.ids ? {
-        id: {
-          $in: idsDto.ids
-        }
-      } : void 0
-    });
     return Promise.all(
-      subscriptions.map((subscription) => {
-        const subscriptionDto = this.mappers.SubscriptionMapper.toDto(
+      (await (em ?? this.em).findAll("Subscription", {
+        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
+      })).map(
+        (subscription) => this.mappers.SubscriptionMapper.toDto(
           subscription
-        );
-        return subscriptionDto;
-      })
+        )
+      )
     );
   }
   async cancelSubscription(idDto, em) {

package/lib/services/index.mjs

@@ -3,6 +3,7 @@ import { createCacheKey } from "@forklaunch/core/cache";
 import {
   evaluateTelemetryOptions
 } from "@forklaunch/core/http";
+import { EntityManager } from "@mikro-orm/core";
 var BaseBillingPortalService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -34,8 +35,8 @@ var BaseBillingPortalService = class {
     }
     const billingPortal = await this.mappers.CreateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...args[0] instanceof EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(billingPortal);
@@ -56,7 +57,12 @@ var BaseBillingPortalService = class {
     if (!billingPortalDetails) {
       throw new Error("Session not found");
     }
-    return billingPortalDetails.value;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortalDetails.value,
+        this.em
+      )
+    );
   }
   async updateBillingPortalSession(billingPortalDto, ...args) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -73,8 +79,8 @@ var BaseBillingPortalService = class {
     }
     const billingPortal = await this.mappers.UpdateBillingPortalMapper.toEntity(
       billingPortalDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager ? args[0] : this.em,
+      ...args[0] instanceof EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush({
@@ -90,7 +96,12 @@ var BaseBillingPortalService = class {
       value: updatedBillingPortalDto,
       ttlMilliseconds: this.cache.getTtlMilliseconds()
     });
-    return updatedBillingPortalDto;
+    return this.mappers.BillingPortalMapper.toDto(
+      await this.mappers.UpdateBillingPortalMapper.toEntity(
+        billingPortal,
+        this.em
+      )
+    );
   }
   async expireBillingPortalSession(idDto) {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -114,6 +125,7 @@ import { createCacheKey as createCacheKey2 } from "@forklaunch/core/cache";
 import {
   evaluateTelemetryOptions as evaluateTelemetryOptions2
 } from "@forklaunch/core/http";
+import { EntityManager as EntityManager2 } from "@mikro-orm/core";
 var BaseCheckoutSessionService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -145,8 +157,8 @@ var BaseCheckoutSessionService = class {
     }
     const checkoutSession = await this.mappers.CreateCheckoutSessionMapper.toEntity(
       checkoutSessionDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager2 ? args[0] : this.em,
+      ...args[0] instanceof EntityManager2 ? args.slice(1) : args
     );
     const createdCheckoutSessionDto = await this.mappers.CheckoutSessionMapper.toDto(checkoutSession);
     if (this.enableDatabaseBackup) {
@@ -167,7 +179,10 @@ var BaseCheckoutSessionService = class {
       throw new Error("Session not found");
     }
     return this.mappers.CheckoutSessionMapper.toDto(
-      checkoutSessionDetails.value
+      await this.mappers.UpdateCheckoutSessionMapper.toEntity(
+        checkoutSessionDetails.value,
+        this.em
+      )
     );
   }
   async expireCheckoutSession({ id }) {
@@ -212,6 +227,7 @@ import { createCacheKey as createCacheKey3 } from "@forklaunch/core/cache";
 import {
   evaluateTelemetryOptions as evaluateTelemetryOptions3
 } from "@forklaunch/core/http";
+import { EntityManager as EntityManager3 } from "@mikro-orm/core";
 var BasePaymentLinkService = class {
   evaluatedTelemetryOptions;
   enableDatabaseBackup;
@@ -241,8 +257,8 @@ var BasePaymentLinkService = class {
     }
     const paymentLink = await this.mappers.CreatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager3 ? args[0] : this.em,
+      ...args[0] instanceof EntityManager3 ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(paymentLink);
@@ -266,8 +282,8 @@ var BasePaymentLinkService = class {
     }
     const paymentLink = await this.mappers.UpdatePaymentLinkMapper.toEntity(
       paymentLinkDto,
-      this.em,
-      ...args
+      args[0] instanceof EntityManager3 ? args[0] : this.em,
+      ...args[0] instanceof EntityManager3 ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
       await this.em.persistAndFlush(paymentLink);
@@ -296,7 +312,12 @@ var BasePaymentLinkService = class {
     if (!paymentLink) {
       throw new Error("Payment link not found");
     }
-    return this.mappers.PaymentLinkMapper.toDto(paymentLink.value);
+    return this.mappers.PaymentLinkMapper.toDto(
+      await this.mappers.UpdatePaymentLinkMapper.toEntity(
+        paymentLink.value,
+        this.em
+      )
+    );
   }
   async expirePaymentLink({ id }) {
     this.openTelemetryCollector.info("Payment link expired", { id });
@@ -332,12 +353,16 @@ var BasePaymentLinkService = class {
     await this.cache.deleteRecord(this.createCacheKey(id));
   }
   async listPaymentLinks(idsDto) {
-    const keys = idsDto?.ids.map((id) => this.createCacheKey(id)) ?? await this.cache.listKeys(this.cacheKeyPrefix);
+    const keys = idsDto?.ids && idsDto.ids.length > 0 ? idsDto?.ids.map((id) => this.createCacheKey(id)) : await this.cache.listKeys(this.cacheKeyPrefix);
+    console.log("keys", keys);
     return Promise.all(
       keys.map(async (key) => {
         const paymentLink = await this.cache.readRecord(key);
         const paymentLinkDto = this.mappers.PaymentLinkMapper.toDto(
-          paymentLink.value
+          await this.mappers.UpdatePaymentLinkMapper.toEntity(
+            paymentLink.value,
+            this.em
+          )
         );
         return paymentLinkDto;
       })
@@ -349,6 +374,7 @@ var BasePaymentLinkService = class {
 import {
   evaluateTelemetryOptions as evaluateTelemetryOptions4
 } from "@forklaunch/core/http";
+import { EntityManager as EntityManager4 } from "@mikro-orm/core";
 var BasePlanService = class {
   evaluatedTelemetryOptions;
   em;
@@ -372,7 +398,7 @@ var BasePlanService = class {
     }
     return Promise.all(
       (await (em ?? this.em).findAll("Plan", {
-        filters: idsDto?.ids ? { id: { $in: idsDto.ids } } : void 0
+        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
       })).map(
         (plan) => this.mappers.PlanMapper.toDto(plan)
       )
@@ -385,7 +411,7 @@ var BasePlanService = class {
     const plan = await this.mappers.CreatePlanMapper.toEntity(
       planDto,
       em ?? this.em,
-      ...args
+      ...args[0] instanceof EntityManager4 ? args.slice(1) : args
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(plan);
@@ -427,6 +453,7 @@ var BasePlanService = class {
 import {
   evaluateTelemetryOptions as evaluateTelemetryOptions5
 } from "@forklaunch/core/http";
+import { EntityManager as EntityManager5 } from "@mikro-orm/core";
 var BaseSubscriptionService = class {
   constructor(em, openTelemetryCollector, schemaValidator, mappers, options) {
     this.options = options;
@@ -455,7 +482,7 @@ var BaseSubscriptionService = class {
     const subscription = await this.mappers.CreateSubscriptionMapper.toEntity(
       subscriptionDto,
       em ?? this.em,
-      ...args
+      ...args[0] instanceof EntityManager5 ? args.slice(1) : args
     );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(subscription);
@@ -534,20 +561,14 @@ var BaseSubscriptionService = class {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info("Listing subscriptions", idsDto);
     }
-    const subscriptions = await (em ?? this.em).findAll("Subscription", {
-      where: idsDto.ids ? {
-        id: {
-          $in: idsDto.ids
-        }
-      } : void 0
-    });
     return Promise.all(
-      subscriptions.map((subscription) => {
-        const subscriptionDto = this.mappers.SubscriptionMapper.toDto(
+      (await (em ?? this.em).findAll("Subscription", {
+        where: idsDto?.ids?.length ? { id: { $in: idsDto.ids } } : void 0
+      })).map(
+        (subscription) => this.mappers.SubscriptionMapper.toDto(
           subscription
-        );
-        return subscriptionDto;
-      })
+        )
+      )
     );
   }
   async cancelSubscription(idDto, em) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-billing-base",
-  "version": "0.7.4",
+  "version": "0.8.0",
   "description": "Billing basic implementation for forklaunch",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {
@@ -36,18 +36,18 @@
     "lib/**"
   ],
   "dependencies": {
-    "@forklaunch/common": "^0.6.14",
-    "@forklaunch/core": "^0.15.3",
-    "@forklaunch/internal": "^0.3.14",
-    "@forklaunch/validator": "^0.10.14",
-    "@mikro-orm/core": "^6.5.6",
+    "@forklaunch/common": "^0.6.17",
+    "@forklaunch/core": "^0.15.6",
+    "@forklaunch/internal": "^0.3.17",
+    "@forklaunch/validator": "^0.10.17",
+    "@mikro-orm/core": "^6.5.7",
     "@sinclair/typebox": "^0.34.41",
     "ajv": "^8.17.1",
-    "zod": "^4.1.11",
-    "@forklaunch/interfaces-billing": "0.7.3"
+    "zod": "^4.1.12",
+    "@forklaunch/interfaces-billing": "0.8.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20250930.1",
+    "@typescript/native-preview": "7.0.0-dev.20251007.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.6.2",
     "typedoc": "^0.28.13"