code refactor

mayswind · Dec 18, 2024 · 50a2221 · 50a2221
1 parent c2b1adf
commit 50a2221
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 32 deletions.
diff --git a/src/stores/transaction.js b/src/stores/transaction.js
@@ -746,6 +746,7 @@ export const useTransactionsStore = defineStore('transactions', {
             }
         },
         updateTransactionListFilter(filter) {
+            const accountsStore = useAccountsStore();
             let changed = false;
 
             if (filter && isNumber(filter.dateType) && this.transactionsFilter.dateType !== filter.dateType) {
@@ -775,6 +776,11 @@ export const useTransactionsStore = defineStore('transactions', {
 
             if (filter && isString(filter.accountIds) && this.transactionsFilter.accountIds !== filter.accountIds) {
                 this.transactionsFilter.accountIds = filter.accountIds;
+
+                if (datetimeConstants.allBillingCycleDateRangesMap[this.transactionsFilter.dateType] && !accountsStore.getAccountStatementDate(this.transactionsFilter.accountIds)) {
+                    this.transactionsFilter.dateType = datetimeConstants.allDateRanges.Custom.type;
+                }
+
                 changed = true;
             }
 

diff --git a/src/views/desktop/common/cards/AccountFilterSettingsCard.vue b/src/views/desktop/common/cards/AccountFilterSettingsCard.vue
@@ -323,15 +323,9 @@ export default {
                     self.statisticsStore.updateTransactionStatisticsInvalidState(true);
                 }
             } else if (this.type === 'transactionListCurrent') {
-                const filter = {
+                changed = self.transactionsStore.updateTransactionListFilter({
                     accountIds: isAllSelected ? '' : finalAccountIds
-                };
-
-                if (datetimeConstants.allBillingCycleDateRangesMap[self.transactionsStore.transactionsFilter.dateType] && !self.accountsStore.getAccountStatementDate(filter.accountIds)) {
-                    filter.dateType = datetimeConstants.allDateRanges.Custom.type;
-                }
-
-                changed = self.transactionsStore.updateTransactionListFilter(filter);
+                });
 
                 if (changed) {
                     self.transactionsStore.updateTransactionListInvalidState(true);

diff --git a/src/views/desktop/transactions/ListPage.vue b/src/views/desktop/transactions/ListPage.vue
@@ -1432,15 +1432,9 @@ export default {
                 return;
             }
 
-            const filter = {
+            const changed = this.transactionsStore.updateTransactionListFilter({
                 accountIds: accountIds
-            };
-
-            if (datetimeConstants.allBillingCycleDateRangesMap[this.query.dateType] && !this.accountsStore.getAccountStatementDate(accountIds)) {
-                filter.dateType = datetimeConstants.allDateRanges.Custom.type;
-            }
-
-            const changed = this.transactionsStore.updateTransactionListFilter(filter);
+            });
 
             if (changed) {
                 this.loading = true;

diff --git a/src/views/mobile/settings/AccountFilterSettingsPage.vue b/src/views/mobile/settings/AccountFilterSettingsPage.vue
@@ -295,15 +295,9 @@ export default {
                     filterAccountIds: filteredAccountIds
                 });
             } else if (this.type === 'transactionListCurrent') {
-                const filter = {
+                const changed = self.transactionsStore.updateTransactionListFilter({
                     accountIds: isAllSelected ? '' : finalAccountIds
-                };
-
-                if (datetimeConstants.allBillingCycleDateRangesMap[self.transactionsStore.transactionsFilter.dateType] && !self.accountsStore.getAccountStatementDate(filter.accountIds)) {
-                    filter.dateType = datetimeConstants.allDateRanges.Custom.type;
-                }
-
-                const changed = self.transactionsStore.updateTransactionListFilter(filter);
+                });
 
                 if (changed) {
                     self.transactionsStore.updateTransactionListInvalidState(true);

diff --git a/src/views/mobile/transactions/ListPage.vue b/src/views/mobile/transactions/ListPage.vue
@@ -981,15 +981,9 @@ export default {
                 return;
             }
 
-            const filter = {
+            const changed = this.transactionsStore.updateTransactionListFilter({
                 accountIds: accountIds
-            };
-
-            if (datetimeConstants.allBillingCycleDateRangesMap[this.query.dateType] && !this.accountsStore.getAccountStatementDate(accountIds)) {
-                filter.dateType = datetimeConstants.allDateRanges.Custom.type;
-            }
-
-            const changed = this.transactionsStore.updateTransactionListFilter(filter);
+            });
 
             this.showAccountPopover = false;