From 5b315bfc81d2c1a97b23d486ec5fa5fc917ca49a Mon Sep 17 00:00:00 2001
From: liuyi <forehalo@gmail.com>
Date: Wed, 17 Apr 2024 16:19:34 +0800
Subject: [PATCH] fix(server): only returns active subscriptions (#6590)

---
 packages/backend/server/src/plugins/payment/resolver.ts | 1 +
 packages/backend/server/src/plugins/payment/service.ts  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/server/src/plugins/payment/resolver.ts b/packages/backend/server/src/plugins/payment/resolver.ts
index cbc0d0eec9..d8200f01b8 100644
--- a/packages/backend/server/src/plugins/payment/resolver.ts
+++ b/packages/backend/server/src/plugins/payment/resolver.ts
@@ -369,6 +369,7 @@ export class UserSubscriptionResolver {
     return this.db.userSubscription.findMany({
       where: {
         userId: user.id,
+        status: SubscriptionStatus.Active,
       },
     });
   }
diff --git a/packages/backend/server/src/plugins/payment/service.ts b/packages/backend/server/src/plugins/payment/service.ts
index c4db3d9be3..58d7351602 100644
--- a/packages/backend/server/src/plugins/payment/service.ts
+++ b/packages/backend/server/src/plugins/payment/service.ts
@@ -765,7 +765,9 @@ export class SubscriptionService {
       );
       return {
         price,
-        coupon: !subscribed ? CouponType.ProEarlyAccessOneYearFree : undefined,
+        coupon: canHaveEADiscount
+          ? CouponType.ProEarlyAccessOneYearFree
+          : undefined,
       };
     } else {
       const isAIEaUser = await this.features.isEarlyAccessUser(