From 88349e3b7df930e36fcacf99a91f74dd323b99f7 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Thu, 13 Nov 2025 11:00:08 +0330 Subject: [PATCH] fix : free plan --- src/common/enums/message.enum.ts | 1 + .../providers/subscriptions.service.ts | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/common/enums/message.enum.ts b/src/common/enums/message.enum.ts index 349676c..40e1850 100755 --- a/src/common/enums/message.enum.ts +++ b/src/common/enums/message.enum.ts @@ -520,6 +520,7 @@ export const enum SubscriptionMessage { SLUG_LENGTH = "اسلاگ باید بین ۴ تا ۲۵۰ کاراکتر باشد", SLUG_EXISTS = "این اسلاگ قبلا ثبت شده است", FREE_PLAN_LIMIT_EXCEEDED = "شما در یک ماه گذشته از پلن رایگان استفاده کرده‌اید و نمی‌توانید مجدداً استفاده کنید", + FREE_PLAN_NOT_ALLOWED = "انتخاب پلن رایگان در تمدید سرویس امکان پدیر نیست", USER_DOES_NOT_HAVE_ACCESS = "شما دسترسی به این سرویس ندارید", } diff --git a/src/modules/subscriptions/providers/subscriptions.service.ts b/src/modules/subscriptions/providers/subscriptions.service.ts index d1934c6..e1b6c65 100755 --- a/src/modules/subscriptions/providers/subscriptions.service.ts +++ b/src/modules/subscriptions/providers/subscriptions.service.ts @@ -323,25 +323,12 @@ export class SubscriptionsService { const plan = await queryRunner.manager.findOne(SubscriptionPlan, { where: { id: dto.planId, service: { id: dto.serviceId } }, - relations: { service: true, directDiscount: true, } + relations: { service: true, directDiscount: true }, }); if (!plan) throw new BadRequestException(SubscriptionMessage.NOT_FOUND); if (plan.isFree) { - isFree = true; - const existingFreePlanSubscription = await queryRunner.manager.findOne(UserSubscription, { - where: { - user: { id: userId }, - plan: { isFree: true }, - }, - relations: { - plan: true, - }, - }); - - if (existingFreePlanSubscription) { - throw new BadRequestException(SubscriptionMessage.FREE_PLAN_LIMIT_EXCEEDED); - } + throw new BadRequestException(SubscriptionMessage.FREE_PLAN_NOT_ALLOWED); } const startDate =