Clean up usage of backend billing cycle data

Author: jamesrkiger

jsapp/js/account/subscriptionStore.ts

@@ -15,6 +15,7 @@ class SubscriptionStore {
   public planResponse: SubscriptionInfo[] = [];
   public addOnsResponse: SubscriptionInfo[] = [];
   public activeSubscriptions: SubscriptionInfo[] = [];
+  public canceledPlans: SubscriptionInfo[] = [];
   public isPending = false;
   public isInitialised = false;
 
@@ -50,6 +51,11 @@ class SubscriptionStore {
     this.activeSubscriptions = response.results.filter((sub) =>
       ACTIVE_STRIPE_STATUSES.includes(sub.status)
     );
+    this.canceledPlans = response.results.filter(
+      (sub) =>
+        sub.items[0]?.price.product.metadata?.product_type == 'plan' &&
+        sub.status === 'canceled'
+    );
     // get any active plan subscriptions for the user
     this.planResponse = this.activeSubscriptions.filter(
       (sub) => sub.items[0]?.price.product.metadata?.product_type == 'plan'

jsapp/js/account/usage/usage.api.ts

@@ -35,8 +35,9 @@ export interface AssetWithUsage {
 
 export interface UsageResponse {
   current_month_start: string;
+  current_month_end: string;
   current_year_start: string;
-  billing_period_end: string | null;
+  current_year_end: string;
   total_submission_count: {
     current_month: number;
     current_year: number;

jsapp/js/account/usage/useUsage.hook.ts

@@ -57,7 +57,7 @@ const loadUsage = async (
       usage.total_nlp_usage[`mt_characters_current_${trackingPeriod}`],
     currentMonthStart: usage.current_month_start,
     currentYearStart: usage.current_year_start,
-    billingPeriodEnd: usage.billing_period_end,
+    billingPeriodEnd: usage[`current_${trackingPeriod}_end`],
     trackingPeriod,
     lastUpdated,
   };

jsapp/js/account/usage/yourPlan.component.tsx

@@ -51,6 +51,10 @@ export const YourPlan = () => {
     let date;
     if (subscriptions.planResponse.length) {
       date = subscriptions.planResponse[0].start_date;
+    } else if (subscriptions.canceledPlans.length){
+      date =
+        subscriptions.canceledPlans[subscriptions.canceledPlans.length - 1]
+          .ended_at;
     } else {
       date = session.currentAccount.date_joined;
     }