From 783fe1aac1d1719d71b1db1982f9b25787b0a285 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Thu, 13 Nov 2025 11:06:06 +0330 Subject: [PATCH] fix : free plan --- .../subscriptions/providers/subscriptions.service.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/modules/subscriptions/providers/subscriptions.service.ts b/src/modules/subscriptions/providers/subscriptions.service.ts index b92e592..66cb185 100755 --- a/src/modules/subscriptions/providers/subscriptions.service.ts +++ b/src/modules/subscriptions/providers/subscriptions.service.ts @@ -230,12 +230,17 @@ export class SubscriptionsService { if (plan.isFree) { isFree = true; - const oneMonthAgo = dayjs().subtract(1, "month").toDate(); + // const oneMonthAgo = dayjs().subtract(1, "month").toDate(); const existingFreePlanSubscription = await queryRunner.manager.findOne(UserSubscription, { where: { user: { id: userId }, - plan: { isFree: true }, - startDate: MoreThan(oneMonthAgo), + plan: { + isFree: true, + service: { + id: serviceId, + }, + }, + // startDate: MoreThan(oneMonthAgo), }, relations: { plan: true,