@forklaunch/implementation-billing-base 0.8.23 → 0.9.0

package/lib/services/index.mjs

@@ -39,7 +39,7 @@ var BaseBillingPortalService = class {
       ...args[0] instanceof 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({
@@ -83,9 +83,9 @@ var BaseBillingPortalService = class {
       ...args[0] instanceof EntityManager ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush({
+      await this.em.persist({
         billingPortal
-      });
+      }).flush();
     }
     const updatedBillingPortalDto = {
       ...existingBillingPortal,
@@ -162,7 +162,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),
@@ -199,11 +199,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));
   }
@@ -212,11 +215,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));
   }
@@ -261,7 +267,7 @@ var BasePaymentLinkService = class {
       ...args[0] instanceof EntityManager3 ? 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({
@@ -286,7 +292,7 @@ var BasePaymentLinkService = class {
       ...args[0] instanceof EntityManager3 ? args.slice(1) : args
     );
     if (this.enableDatabaseBackup) {
-      await this.em.persistAndFlush(paymentLink);
+      await this.em.persist(paymentLink).flush();
     }
     const updatedLinkDto = {
       ...existingLink,
@@ -315,33 +321,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));
   }
@@ -383,10 +398,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
+        )
       )
     );
   }
@@ -408,8 +428,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) {
@@ -431,7 +456,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
+    );
   }
 };
 
@@ -481,7 +509,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(
@@ -492,11 +520,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
     );
@@ -505,11 +536,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
     );
@@ -537,20 +571,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
         )
@@ -561,7 +601,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");
     }
@@ -574,7 +617,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");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-billing-base",
-  "version": "0.8.23",
+  "version": "0.9.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.38",
-    "@forklaunch/core": "^0.18.15",
-    "@forklaunch/internal": "^0.3.40",
-    "@forklaunch/validator": "^0.10.38",
-    "@mikro-orm/core": "6.6.9",
+    "@forklaunch/common": "^0.7.5",
+    "@forklaunch/core": "^0.19.5",
+    "@forklaunch/internal": "^0.4.5",
+    "@forklaunch/validator": "^0.11.5",
+    "@mikro-orm/core": "7.0.4",
     "@sinclair/typebox": "^0.34.48",
     "ajv": "^8.18.0",
     "zod": "^4.3.6",
-    "@forklaunch/interfaces-billing": "0.8.23"
+    "@forklaunch/interfaces-billing": "0.9.0"
   },
   "devDependencies": {
-    "@typescript/native-preview": "7.0.0-dev.20260312.1",
+    "@typescript/native-preview": "7.0.0-dev.20260320.1",
     "depcheck": "^1.4.7",
     "prettier": "^3.8.1",
     "typedoc": "^0.28.17"