rename hasActiveSubscription from useCurrentUser() to hasOngoingSubscription

2021-10-21 00:01:03 +02:00
parent 6dbdeac4d3
commit 1dd1c2bafe
6 changed files with 19 additions and 9 deletions
--- a/app/users/queries/get-current-user.ts
+++ b/app/users/queries/get-current-user.ts
@ -17,7 +17,15 @@ export default async function getCurrentUser(_ = null, { session }: Ctx) {
 					organization: {
 						include: {
 							subscriptions: {
-								where: { status: SubscriptionStatus.active },
+								where: {
+									OR: [
+										{ status: { not: SubscriptionStatus.deleted } },
+										{
+											status: SubscriptionStatus.deleted,
+											cancellationEffectiveDate: { gt: new Date() },
+										},
+									],
+								},
 							},
 						},
 					},