From 0a00cd9581402fb5f588fca74117881f924efa45 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Thu, 27 Jun 2024 16:00:21 +0100 Subject: [PATCH] refactor: Update SubscriptionPlan method name to getPlanType --- .../Jobs/PaymentProvider/PopulatePlanNameInProject.ts | 2 +- Common/Tests/Types/Billing/SubscriptionPlan.test.ts | 6 +++--- Common/Types/Billing/SubscriptionPlan.ts | 2 +- CommonServer/Services/ProjectService.ts | 6 +++--- CommonUI/src/Utils/Project.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts b/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts index 3ae063193f..7c60c094fa 100644 --- a/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts +++ b/App/FeatureSet/Workers/Jobs/PaymentProvider/PopulatePlanNameInProject.ts @@ -39,7 +39,7 @@ RunCron( try { if (project.paymentProviderPlanId) { // get subscription detail. - const planName: PlanType = SubscriptionPlan.getPlanSelect( + const planName: PlanType = SubscriptionPlan.getPlanType( project.paymentProviderPlanId as string, ); diff --git a/Common/Tests/Types/Billing/SubscriptionPlan.test.ts b/Common/Tests/Types/Billing/SubscriptionPlan.test.ts index 4969349983..a244dadbcb 100644 --- a/Common/Tests/Types/Billing/SubscriptionPlan.test.ts +++ b/Common/Tests/Types/Billing/SubscriptionPlan.test.ts @@ -118,7 +118,7 @@ describe("SubscriptionPlan", () => { expect(isValidPlanId).toBe(true); }); }); - describe("getPlanSelect", () => { + describe("getPlanType", () => { it("should return the plan name if valid planId is passed", () => { new SubscriptionPlan( monthlyPlanId, @@ -129,7 +129,7 @@ describe("SubscriptionPlan", () => { 2, 30, ); - const result: PlanType = SubscriptionPlan.getPlanSelect( + const result: PlanType = SubscriptionPlan.getPlanType( monthlyPlanId, env, ); @@ -140,7 +140,7 @@ describe("SubscriptionPlan", () => { .fn() .mockReturnValue(undefined); expect(() => { - SubscriptionPlan.getPlanSelect("invalid-plan-id", env); + SubscriptionPlan.getPlanType("invalid-plan-id", env); }).toThrow(BadDataException); }); }); diff --git a/Common/Types/Billing/SubscriptionPlan.ts b/Common/Types/Billing/SubscriptionPlan.ts index 68329921da..8edc870230 100644 --- a/Common/Types/Billing/SubscriptionPlan.ts +++ b/Common/Types/Billing/SubscriptionPlan.ts @@ -157,7 +157,7 @@ export default class SubscriptionPlan { return Boolean(this.getSubscriptionPlanById(planId, env)); } - public static getPlanSelect( + public static getPlanType( planId: string, env?: JSONObject | undefined, ): PlanType { diff --git a/CommonServer/Services/ProjectService.ts b/CommonServer/Services/ProjectService.ts index 27c1c130a5..550ddaa205 100755 --- a/CommonServer/Services/ProjectService.ts +++ b/CommonServer/Services/ProjectService.ts @@ -114,7 +114,7 @@ export class Service extends DatabaseService { throw new BadDataException("Plan is invalid."); } - data.data.planName = SubscriptionPlan.getPlanSelect( + data.data.planName = SubscriptionPlan.getPlanType( data.data.paymentProviderPlanId, ); @@ -358,7 +358,7 @@ export class Service extends DatabaseService { paymentProviderMeteredSubscriptionId: subscription.meteredSubscriptionId, trialEndsAt: subscription.trialEndsAt || new Date(), - planName: SubscriptionPlan.getPlanSelect( + planName: SubscriptionPlan.getPlanType( updateBy.data.paymentProviderPlanId! as string, ), }, @@ -968,7 +968,7 @@ export class Service extends DatabaseService { throw new BadDataException("Project does not have any plans"); } - const plan: PlanType = SubscriptionPlan.getPlanSelect( + const plan: PlanType = SubscriptionPlan.getPlanType( project.paymentProviderPlanId, getAllEnvVars(), ); diff --git a/CommonUI/src/Utils/Project.ts b/CommonUI/src/Utils/Project.ts index 6b8b88fb90..5bd443e750 100644 --- a/CommonUI/src/Utils/Project.ts +++ b/CommonUI/src/Utils/Project.ts @@ -44,7 +44,7 @@ export default class ProjectUtil { return null; } - return SubscriptionPlan.getPlanSelect( + return SubscriptionPlan.getPlanType( project.paymentProviderPlanId, getAllEnvVars(), );