Merge pull request #125 from pliancy/fix/filter-failed-plans

fix: filter out failed plan calls
pliancy · Aug 9, 2024 · a1d74ed · a1d74ed
2 parents f71108c + 47a9e1e
commit a1d74ed
Showing 1 changed file with 46 additions and 31 deletions.
diff --git a/src/lib/plans/plans.ts b/src/lib/plans/plans.ts
@@ -8,48 +8,63 @@ export class Plans extends Base {
 
     /**
      * retrieves available global licensing for both user and storage that aren't assigned to customers
+     * This will filter out any failed plans whose calls to the API return an error
      * @returns object containing the available user and storage data
      */
     async getPlans(): Promise<any> {
         const { authCookie, csrfToken } = await this.authenticate()
         const planIds = await this._getAllPlanIds(authCookie)
 
         return Promise.all(
-            planIds.map(async (id) => {
-                const [planDataRes, planPowerUserDataRes] = await Promise.all([
-                    this.http.get<[string, UsageStats][]>(
-                        `/msp/usage_stats/${this.resellerId}/${id}/`,
-                        {
-                            headers: { cookie: authCookie, 'X-CSRFToken': csrfToken },
-                        },
-                    ),
-                    this.http.get(`/msp/get_plan_pu_data/${this.resellerId}/${id}/`, {
-                        headers: { cookie: authCookie, 'X-CSRFToken': csrfToken },
-                    }),
-                ])
+            planIds
+                .map(async (id) => {
+                    let planDataRes: any
+                    let planPowerUserDataRes: any
+                    try {
+                        ;[planDataRes, planPowerUserDataRes] = await Promise.all([
+                            this.http.get<[string, UsageStats][]>(
+                                `/msp/usage_stats/${this.resellerId}/${id}/`,
+                                {
+                                    headers: {
+                                        cookie: authCookie,
+                                        'X-CSRFToken': csrfToken,
+                                    },
+                                },
+                            ),
+                            this.http.get(`/msp/get_plan_pu_data/${this.resellerId}/${id}/`, {
+                                headers: {
+                                    cookie: authCookie,
+                                    'X-CSRFToken': csrfToken,
+                                },
+                            }),
+                        ])
+                    } catch (e) {
+                        return
+                    }
 
-                const planData = planDataRes.data
-                const planPowerUserData = planPowerUserDataRes.data
+                    const planData = planDataRes.data
+                    const planPowerUserData = planPowerUserDataRes.data
 
-                let ref = {} as UsageStats
-                if (planData.length > 0) {
-                    const entries = Object.entries(planData[0] ?? [])
-                    if (entries.length > 0) {
-                        ref = (entries[0] ?? [])[1] as UsageStats
+                    let ref = {} as UsageStats
+                    if (planData.length > 0) {
+                        const entries = Object.entries(planData[0] ?? [])
+                        if (entries.length > 0) {
+                            ref = (entries[0] ?? [])[1] as UsageStats
+                        }
                     }
-                }
 
-                return {
-                    planId: id,
-                    totalPowerUsers: planPowerUserData?.purchased,
-                    usedPowerUsers: planPowerUserData?.purchased
-                        ? planPowerUserData?.purchased - ref.power_user_stats?.Available
-                        : undefined,
-                    availablePowerUsers: ref.power_user_stats?.Available,
-                    availableStorage: ref.storage_stats?.Available,
-                    customers: planData.map((customer: object) => Object.keys(customer)[0]),
-                }
-            }),
+                    return {
+                        planId: id,
+                        totalPowerUsers: planPowerUserData?.purchased,
+                        usedPowerUsers: planPowerUserData?.purchased
+                            ? planPowerUserData?.purchased - ref.power_user_stats?.Available
+                            : undefined,
+                        availablePowerUsers: ref.power_user_stats?.Available,
+                        availableStorage: ref.storage_stats?.Available,
+                        customers: planData.map((customer: object) => Object.keys(customer)[0]),
+                    }
+                })
+                .filter((e) => e),
         )
     }