From fddaa52b393da4c580959211dda12fa9fafb1b9a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 30 May 2025 16:25:17 +0200 Subject: [PATCH] Refactor payment method linking logic Extract method comparison into reusable function and optimize linked organization lookup using Set for better performance. --- .../account/payments/paymentMethods.svelte | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/routes/(console)/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte index de20933c9..2c815ecce 100644 --- a/src/routes/(console)/account/payments/paymentMethods.svelte +++ b/src/routes/(console)/account/payments/paymentMethods.svelte @@ -41,11 +41,15 @@ (method: PaymentMethodData) => !!method?.last4 ); - $: hasLinkedOrgs = filteredMethods.some((method) => - orgList.some( - (org) => method.$id === org.paymentMethodId || method.$id === org.backupPaymentMethodId - ) + + const isMethodLinkedToOrg = (methodId: string, org: Organization) => + methodId === org.paymentMethodId || methodId === org.backupPaymentMethodId; + + + $: linkedMethodIds = new Set( + orgList.flatMap(org => [org.paymentMethodId, org.backupPaymentMethodId].filter(Boolean)) ); + $: hasLinkedOrgs = filteredMethods.some(method => linkedMethodIds.has(method.$id)); $: hasPaymentError = filteredMethods.some((method) => method?.lastError || method?.expired); @@ -75,10 +79,8 @@ {#each filteredMethods as paymentMethod, i} - {@const linkedOrgs = orgList?.filter( - (org) => - paymentMethod.$id === org.paymentMethodId || - paymentMethod.$id === org.backupPaymentMethodId + {@const linkedOrgs = orgList?.filter(org => + isMethodLinkedToOrg(paymentMethod.$id, org) )}