From c8baf9b0d74227638a5bbf6841b03497a45cec4e Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Fri, 7 Apr 2023 23:09:24 +0200 Subject: [PATCH] feat: Check if user has active subscription or not for execution --- packages/backend/src/models/usage-data.ee.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/models/usage-data.ee.ts b/packages/backend/src/models/usage-data.ee.ts index 4c01d15d..047d0bf1 100644 --- a/packages/backend/src/models/usage-data.ee.ts +++ b/packages/backend/src/models/usage-data.ee.ts @@ -50,12 +50,16 @@ class UsageData extends Base { async checkIfLimitExceeded() { const user = await this.$relatedQuery('user'); - if (user.inTrial) { + if (await user.inTrial()) { return false; } const subscription = await this.$relatedQuery('subscription'); + if (!subscription.isActive) { + return true; + } + const plan = subscription.plan; return this.consumedTaskCount >= plan.quota;