Merge pull request wasp-lang#382 from wasp-lang/filip-dry-subscription-status

Dry up subscription status

Author: sodic

opensaas-sh/app_diff/src/admin/dashboards/users/UsersTable.tsx.diff

@@ -1,6 +1,6 @@
 --- template/app/src/admin/dashboards/users/UsersTable.tsx
 +++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx
-@@ -202,7 +202,7 @@
+@@ -207,7 +207,7 @@
                  <p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p>
                </div>
                <div className='col-span-2 flex items-center'>

opensaas-sh/app_diff/src/analytics/stats.ts.diff

@@ -1,18 +1,19 @@
 --- template/app/src/analytics/stats.ts
 +++ opensaas-sh/app/src/analytics/stats.ts
-@@ -2,10 +2,8 @@
+@@ -2,11 +2,9 @@
  import { type DailyStatsJob } from 'wasp/server/jobs';
  import Stripe from 'stripe';
- import { stripe } from '../payment/stripe/stripeClient'
+ import { stripe } from '../payment/stripe/stripeClient';
 -import { listOrders } from '@lemonsqueezy/lemonsqueezy.js';
  import { getDailyPageViews, getSources } from './providers/plausibleAnalyticsUtils';
 -// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils';
 -import { paymentProcessor } from '../payment/paymentProcessor';
-+// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils;
+ import { SubscriptionStatus } from '../payment/plans';
++// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils';
 
  export type DailyStatsProps = { dailyStats?: DailyStats; weeklyStats?: DailyStats[]; isLoading?: boolean };
 
-@@ -41,17 +39,7 @@
+@@ -42,17 +40,7 @@
        paidUserDelta -= yesterdaysStats.paidUserCount;
      }
 
@@ -27,11 +28,11 @@
 -      default:
 -        throw new Error(`Unsupported payment processor: ${paymentProcessor.id}`);
 -    }
-+    let totalRevenue = await fetchTotalStripeRevenue()
++    let totalRevenue = await fetchTotalStripeRevenue();
 
      const { totalViews, prevDayViewsChangePercent } = await getDailyPageViews();
 
-@@ -162,38 +150,3 @@
+@@ -163,38 +151,3 @@
    // Revenue is in cents so we convert to dollars (or your main currency unit)
    return totalRevenue / 100;
  }
@@ -70,4 +71,3 @@
 -    throw error;
 -  }
 -}
-\ No newline at end of file

opensaas-sh/app_diff/src/server/scripts/dbSeeds.ts.diff

@@ -1,6 +1,6 @@
 --- template/app/src/server/scripts/dbSeeds.ts
 +++ opensaas-sh/app/src/server/scripts/dbSeeds.ts
-@@ -37,9 +37,11 @@
+@@ -38,9 +38,11 @@
      sendNewsletter: false,
      credits,
      subscriptionStatus,

template/app/src/admin/dashboards/users/UsersTable.tsx

@@ -1,4 +1,4 @@
-import { type SubscriptionStatus } from '../../../payment/plans';
+import { SubscriptionStatus } from '../../../payment/plans';
 import { useQuery, getPaginatedUsers } from 'wasp/client/operations';
 import { useState, useEffect } from 'react';
 import SwitcherOne from '../../elements/forms/SwitcherOne';
@@ -15,9 +15,11 @@ function AdminSwitch({ id, isAdmin }: Pick<User, 'id' | 'isAdmin'>) {
 
 const UsersTable = () => {
   const [currentPage, setCurrentPage] = useState(1);
-  const [emailFilter, setEmailFilter] = useState<string | undefined>('');
+  const [emailFilter, setEmailFilter] = useState<string | undefined>(undefined);
   const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
-  const [subscriptionStatusFilter, setSubcriptionStatusFilter] = useState<SubscriptionStatus[]>([]);
+  const [subscriptionStatusFilter, setSubcriptionStatusFilter] = useState<Array<SubscriptionStatus | null>>(
+    []
+  );
 
   const skipPages = currentPage - 1;
 
@@ -90,31 +92,34 @@ const UsersTable = () => {
                 </div>
                 <select
                   onChange={(e) => {
-                    const targetValue = e.target.value === '' ? null : e.target.value;
-                    setSubcriptionStatusFilter((prevValue) => {
-                      if (prevValue?.includes(targetValue as SubscriptionStatus)) {
-                        return prevValue?.filter((val) => val !== targetValue);
-                      } else if (!!prevValue) {
-                        return [...prevValue, targetValue as SubscriptionStatus];
-                      } else {
-                        return prevValue;
-                      }
-                    });
+                    const selectedValue = e.target.value == 'has_not_subscribed' ? null : e.target.value;
+
+                    console.log(selectedValue);
+                    if (selectedValue === 'clear-all') {
+                      setSubcriptionStatusFilter([]);
+                    } else {
+                      setSubcriptionStatusFilter((prevValue) => {
+                        if (prevValue.includes(selectedValue as SubscriptionStatus)) {
+                          return prevValue.filter((val) => val !== selectedValue);
+                        } else {
+                          return [...prevValue, selectedValue as SubscriptionStatus];
+                        }
+                      });
+                    }
                   }}
                   name='status-filter'
                   id='status-filter'
                   className='absolute top-0 left-0 z-20 h-full w-full bg-white opacity-0'
                 >
-                  <option value=''>Select filters</option>
-                  {['past_due', 'cancel_at_period_end', 'active', 'deleted', null].map((status) => {
-                    if (!subscriptionStatusFilter.includes(status as SubscriptionStatus)) {
-                      return (
-                        <option key={status} value={status || ''}>
-                          {status ? status : 'has not subscribed'}
-                        </option>
-                      );
-                    }
-                  })}
+                  <option value='select-filters'>Select filters</option>
+                  {[...Object.values(SubscriptionStatus), null]
+                    .filter((status) => !subscriptionStatusFilter.includes(status))
+                    .map((status) => {
+                      const extendedStatus = status ?? 'has_not_subscribed'
+                      return <option key={extendedStatus} value={extendedStatus}>
+                        {extendedStatus}
+                      </option>
+                    })}
                 </select>
                 <span className='absolute top-1/2 right-4 z-10 -translate-y-1/2'>
                   <ChevronDownIcon />

template/app/src/analytics/stats.ts

@@ -1,11 +1,12 @@
 import { type DailyStats } from 'wasp/entities';
 import { type DailyStatsJob } from 'wasp/server/jobs';
 import Stripe from 'stripe';
-import { stripe } from '../payment/stripe/stripeClient'
+import { stripe } from '../payment/stripe/stripeClient';
 import { listOrders } from '@lemonsqueezy/lemonsqueezy.js';
 import { getDailyPageViews, getSources } from './providers/plausibleAnalyticsUtils';
 // import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils';
 import { paymentProcessor } from '../payment/paymentProcessor';
+import { SubscriptionStatus } from '../payment/plans';
 
 export type DailyStatsProps = { dailyStats?: DailyStats; weeklyStats?: DailyStats[]; isLoading?: boolean };
 
@@ -30,7 +31,7 @@ export const calculateDailyStats: DailyStatsJob<never, void> = async (_args, con
     // we don't want to count those users as current paying users
     const paidUserCount = await context.entities.User.count({
       where: {
-        subscriptionStatus: 'active',
+        subscriptionStatus: SubscriptionStatus.Active,
       },
     });
 
@@ -196,4 +197,4 @@ async function fetchTotalLemonSqueezyRevenue() {
     console.error('Error fetching Lemon Squeezy revenue:', error);
     throw error;
   }
-}
+}

template/app/src/demo-ai-app/operations.ts

@@ -11,6 +11,7 @@ import type {
 import { HttpError } from 'wasp/server';
 import { GeneratedSchedule } from './schedule';
 import OpenAI from 'openai';
+import { SubscriptionStatus } from '../payment/plans';
 import { ensureArgsSchemaOrThrowHttpError } from '../server/validation';
 
 const openai = setupOpenAI();
@@ -61,8 +62,8 @@ export const generateGptResponse: GenerateGptResponse<GenerateGptResponseInput,
     const hasCredits = context.user.credits > 0;
     const hasValidSubscription =
       !!context.user.subscriptionStatus &&
-      context.user.subscriptionStatus !== 'deleted' &&
-      context.user.subscriptionStatus !== 'past_due';
+      context.user.subscriptionStatus !== SubscriptionStatus.Deleted &&
+      context.user.subscriptionStatus !== SubscriptionStatus.PastDue;
     const canUserContinue = hasCredits || hasValidSubscription;
 
     if (!canUserContinue) {

template/app/src/payment/PricingPage.tsx

@@ -1,6 +1,6 @@
 import { useAuth } from 'wasp/client/auth';
 import { generateCheckoutSession, getCustomerPortalUrl, useQuery } from 'wasp/client/operations';
-import { PaymentPlanId, paymentPlans, prettyPaymentPlanName } from './plans';
+import { PaymentPlanId, paymentPlans, prettyPaymentPlanName, SubscriptionStatus } from './plans';
 import { AiFillCheckCircle } from 'react-icons/ai';
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -40,7 +40,7 @@ const PricingPage = () => {
   const [isPaymentLoading, setIsPaymentLoading] = useState<boolean>(false);
 
   const { data: user } = useAuth();
-  const isUserSubscribed = !!user && !!user.subscriptionStatus && user.subscriptionStatus !== 'deleted';
+  const isUserSubscribed = !!user && !!user.subscriptionStatus && user.subscriptionStatus !== SubscriptionStatus.Deleted;
 
   const {
     data: customerPortalUrl,

template/app/src/payment/lemonSqueezy/webhook.ts

@@ -2,13 +2,12 @@ import { type MiddlewareConfigFn, HttpError } from 'wasp/server';
 import { type PaymentsWebhook } from 'wasp/server/api';
 import { type PrismaClient } from '@prisma/client';
 import express from 'express';
-import { paymentPlans, PaymentPlanId } from '../plans';
+import { paymentPlans, PaymentPlanId, SubscriptionStatus } from '../plans';
 import { updateUserLemonSqueezyPaymentDetails } from './paymentDetails';
 import { type Order, type Subscription, getCustomer } from '@lemonsqueezy/lemonsqueezy.js';
 import crypto from 'crypto';
 import { requireNodeEnvVar } from '../../server/utils';
 
-
 export const lemonSqueezyWebhook: PaymentsWebhook = async (request, response, context) => {
   try {
     const rawBody = request.body.toString('utf8');
@@ -94,7 +93,11 @@ async function handleOrderCreated(data: Order, userId: string, prismaUserDelegat
   console.log(`Order ${order_number} created for user ${lemonSqueezyId}`);
 }
 
-async function handleSubscriptionCreated(data: Subscription, userId: string, prismaUserDelegate: PrismaClient['user']) {
+async function handleSubscriptionCreated(
+  data: Subscription,
+  userId: string,
+  prismaUserDelegate: PrismaClient['user']
+) {
   const { customer_id, status, variant_id } = data.data.attributes;
   const lemonSqueezyId = customer_id.toString();
 
@@ -106,7 +109,7 @@ async function handleSubscriptionCreated(data: Subscription, userId: string, pri
         lemonSqueezyId,
         userId,
         subscriptionPlan: planId,
-        subscriptionStatus: status,
+        subscriptionStatus: status as SubscriptionStatus,
         datePaid: new Date(),
       },
       prismaUserDelegate
@@ -118,26 +121,29 @@ async function handleSubscriptionCreated(data: Subscription, userId: string, pri
   console.log(`Subscription created for user ${lemonSqueezyId}`);
 }
 
-
 // NOTE: LemonSqueezy's 'subscription_updated' event is sent as a catch-all and fires even after 'subscription_created' & 'order_created'.
-async function handleSubscriptionUpdated(data: Subscription, userId: string, prismaUserDelegate: PrismaClient['user']) {
+async function handleSubscriptionUpdated(
+  data: Subscription,
+  userId: string,
+  prismaUserDelegate: PrismaClient['user']
+) {
   const { customer_id, status, variant_id } = data.data.attributes;
   const lemonSqueezyId = customer_id.toString();
 
   const planId = getPlanIdByVariantId(variant_id.toString());
 
   // We ignore other statuses like 'paused' and 'unpaid' for now, because we block user usage if their status is NOT active.
   // Note that a status changes to 'past_due' on a failed payment retry, then after 4 unsuccesful payment retries status
-  // becomes 'unpaid' and finally 'expired' (i.e. 'deleted'). 
-  // NOTE: ability to pause or trial a subscription is something that has to be additionally configured in the lemon squeezy dashboard. 
+  // becomes 'unpaid' and finally 'expired' (i.e. 'deleted').
+  // NOTE: ability to pause or trial a subscription is something that has to be additionally configured in the lemon squeezy dashboard.
   // If you do enable these features, make sure to handle these statuses here.
   if (status === 'past_due' || status === 'active') {
     await updateUserLemonSqueezyPaymentDetails(
       {
         lemonSqueezyId,
         userId,
         subscriptionPlan: planId,
-        subscriptionStatus: status,
+        subscriptionStatus: status as SubscriptionStatus,
         ...(status === 'active' && { datePaid: new Date() }),
       },
       prismaUserDelegate
@@ -146,31 +152,41 @@ async function handleSubscriptionUpdated(data: Subscription, userId: string, pri
   }
 }
 
-async function handleSubscriptionCancelled(data: Subscription, userId: string, prismaUserDelegate: PrismaClient['user']) {
+async function handleSubscriptionCancelled(
+  data: Subscription,
+  userId: string,
+  prismaUserDelegate: PrismaClient['user']
+) {
   const { customer_id } = data.data.attributes;
   const lemonSqueezyId = customer_id.toString();
 
   await updateUserLemonSqueezyPaymentDetails(
     {
       lemonSqueezyId,
       userId,
-      subscriptionStatus: 'cancel_at_period_end', // cancel_at_period_end is the Stripe equivalent of LemonSqueezy's cancelled
+      // cancel_at_period_end is the Stripe equivalent of LemonSqueezy's cancelled
+      subscriptionStatus: 'cancel_at_period_end' as SubscriptionStatus,
     },
     prismaUserDelegate
   );
 
   console.log(`Subscription cancelled for user ${lemonSqueezyId}`);
 }
 
-async function handleSubscriptionExpired(data: Subscription, userId: string, prismaUserDelegate: PrismaClient['user']) {
+async function handleSubscriptionExpired(
+  data: Subscription,
+  userId: string,
+  prismaUserDelegate: PrismaClient['user']
+) {
   const { customer_id } = data.data.attributes;
   const lemonSqueezyId = customer_id.toString();
 
   await updateUserLemonSqueezyPaymentDetails(
     {
       lemonSqueezyId,
       userId,
-      subscriptionStatus: 'deleted', // deleted is the Stripe equivalent of LemonSqueezy's expired
+      // deleted is the Stripe equivalent of LemonSqueezy's expired
+      subscriptionStatus: SubscriptionStatus.Deleted,
     },
     prismaUserDelegate
   );
@@ -181,7 +197,9 @@ async function handleSubscriptionExpired(data: Subscription, userId: string, pri
 async function fetchUserCustomerPortalUrl({ lemonSqueezyId }: { lemonSqueezyId: string }): Promise<string> {
   const { data: lemonSqueezyCustomer, error } = await getCustomer(lemonSqueezyId);
   if (error) {
-    throw new Error(`Error fetching customer portal URL for user lemonsqueezy id ${lemonSqueezyId}: ${error}`);
+    throw new Error(
+      `Error fetching customer portal URL for user lemonsqueezy id ${lemonSqueezyId}: ${error}`
+    );
   }
   const customerPortalUrl = lemonSqueezyCustomer.data.attributes.urls.customer_portal;
   if (!customerPortalUrl) {
@@ -198,4 +216,5 @@ function getPlanIdByVariantId(variantId: string): PaymentPlanId {
     throw new Error(`No plan with LemonSqueezy variant id ${variantId}`);
   }
   return planId;
-}
+}
+

template/app/src/payment/plans.ts

@@ -1,13 +1,12 @@
 import * as z from 'zod';
 import { requireNodeEnvVar } from '../server/utils';
 
-export const subscriptionStatusSchema = z
-  .literal('past_due')
-  .or(z.literal('cancel_at_period_end'))
-  .or(z.literal('active'))
-  .or(z.literal('deleted'));
-
-export type SubscriptionStatus = z.infer<typeof subscriptionStatusSchema>;
+export enum SubscriptionStatus {
+  PastDue = 'past_due',
+  CancelAtPeriodEnd = 'cancel_at_period_end',
+  Active = 'active',
+  Deleted = 'deleted',
+}
 
 export enum PaymentPlanId {
   Hobby = 'hobby',