Merge pull request #1024 from automatisch/billing-query

chore: Adjust billing query to be more dynamic

packages/backend/src/graphql/queries/get-billing-and-usage.ee.ts

@@ -5,13 +5,26 @@ import ExecutionStep from '../../models/execution-step';
 import Subscription from '../../models/subscription.ee';
 import { DateTime } from 'luxon';
 
+type BillingCardAction = {
+  type: string;
+  text: string;
+  src?: string | null;
+};
+
 type ComputedSubscription = {
-  monthlyQuota: string;
   status: string;
-  nextBillDate: string;
+  monthlyQuota: {
-  nextBillAmount: string;
+    title: string;
-  updateUrl: string;
+    action: BillingCardAction;
-  cancelUrl: string;
+  };
+  nextBillDate: {
+    title: string;
+    action: BillingCardAction;
+  };
+  nextBillAmount: {
+    title: string;
+    action: BillingCardAction;
+  };
 };
 
 const getBillingAndUsage = async (
@@ -41,23 +54,52 @@ const paidSubscription = (subscription: Subscription): ComputedSubscription => {
   );
 
   return {
-    monthlyQuota: currentPlan.limit,
     status: subscription.status,
-    nextBillDate: subscription.nextBillDate,
+    monthlyQuota: {
-    nextBillAmount: '€' + subscription.nextBillAmount,
+      title: currentPlan.limit,
-    updateUrl: subscription.updateUrl,
+      action: {
-    cancelUrl: subscription.cancelUrl,
+        type: 'link',
+        text: 'Change plan',
+        src: '/settings/billing/change-plan',
+      },
+    },
+    nextBillAmount: {
+      title: '€' + subscription.nextBillAmount,
+      action: {
+        type: 'link',
+        text: 'Update payment method',
+        src: subscription.updateUrl,
+      },
+    },
+    nextBillDate: {
+      title: subscription.nextBillDate,
+      action: {
+        type: 'text',
+        text: '(monthly payment)',
+      },
+    },
   };
 };
 
 const freeTrialSubscription = (): ComputedSubscription => {
   return {
-    monthlyQuota: 'Free trial',
     status: null,
-    nextBillDate: '---',
+    monthlyQuota: {
-    nextBillAmount: '---',
+      title: 'Free Trial',
-    updateUrl: null,
+      action: {
-    cancelUrl: null,
+        type: 'link',
+        text: 'Upgrade plan',
+        src: '/settings/billing/upgrade',
+      },
+    },
+    nextBillAmount: {
+      title: '---',
+      action: null,
+    },
+    nextBillDate: {
+      title: '---',
+      action: null,
+    },
   };
 };
 

packages/backend/src/graphql/schema.graphql

@@ -479,13 +479,32 @@ type GetBillingAndUsage {
   usage: Usage
 }
 
+type MonthlyQuota {
+  title: String
+  action: BillingCardAction
+}
+
+type NextBillAmount {
+  title: String
+  action: BillingCardAction
+}
+
+type NextBillDate {
+  title: String
+  action: BillingCardAction
+}
+
+type BillingCardAction {
+  type: String
+  text: String
+  src: String
+}
+
 type Subscription {
-  monthlyQuota: String
-  updateUrl: String
-  cancelUrl: String
   status: String
-  nextBillAmount: String
+  monthlyQuota: MonthlyQuota
-  nextBillDate: String
+  nextBillAmount: NextBillAmount
+  nextBillDate: NextBillDate
 }
 
 type Usage {