Skip to content

Open source personal finance application

DEV: ugly way to check new getTotal function

ilkome5e9a17163380
diff --git a/store/trns/getters.js b/store/trns/getters.js
index cce22748..ca87206b 100644
--- a/store/trns/getters.js
+++ b/store/trns/getters.js
@@ -14,7 +14,7 @@ export default {
/**
* Return total amounts of trnsIds
- * * Refactor: params should be Object
+ * * TODO: need full refactor
*
* @param {Array} trnsIds
* @return {Object} return
@@ -22,53 +22,93 @@ export default {
* @return {String} return.incomes
* @return {String} return.total
*/
- getTotalOfTrnsIds: (_state, _getters, rootState, rootGetters) => (trnsIds, inculdeTrnasfers = false, isConvertToBase = true, walletId) => {
- const trns = rootState.trns.items
- const currencies = rootState.currencies.rates
- const wallets = rootState.wallets.items
- const baseCurrency = rootState.currencies.base
- const transferCategoryId = rootGetters['categories/transferCategoryId']
+ getTotalOfTrnsIds: (_state, _getters, rootState) => (trnsIds, inculdeTrnasfers = false, isConvertToBase = true, walletId) => {
+ const trnsItems = rootState.trns.items
+ const rates = rootState.currencies.rates
+ const walletsItems = rootState.wallets.items
+ const categoriesItems = rootState.categories.items
+ const baseRate = rootState.currencies.base
+ const transferCategoriesIds = getTransferCatgoriesIds(categoriesItems)
+
+ let total = 0
+
+ if (walletId) {
+ total = getTotal({
+ transferCategoriesIds,
+ trnsIds,
+ trnsItems,
+ walletsItems,
+ walletsIds: [walletId],
+ })
+
+ return {
+ expense: total.expenseTransactions + total.expenseTransfers,
+ income: total.incomeTransactions + total.incomeTransfers,
+ sum: total.sumTransactions + total.sumTransfers,
+ // @deprecated
+ expenses: total.expenseTransactions + total.expenseTransfers,
+ incomes: total.incomeTransactions + total.incomeTransfers,
+ total: total.sumTransactions + total.sumTransfers,
+ }
+ }
+ else if (inculdeTrnasfers && isConvertToBase) {
+ total = getTotal({
+ baseRate,
+ rates,
+ transferCategoriesIds,
+ trnsIds,
+ trnsItems,
+ walletsItems,
+ })
- let expenses = 0
- let incomes = 0
-
- for (const key of trnsIds) {
- const trn = trns[key]
- if (trn && (inculdeTrnasfers || trn.categoryId !== transferCategoryId)) {
- // Transaction
- if (trn.type !== 2) {
- const wallet = wallets[trn.walletId]
- if (!wallet && currencies)
- return
-
- let amount = 0
- isConvertToBase && wallet.currency !== baseCurrency
- ? amount = Math.abs(trn.amount / currencies[wallet.currency])
- : amount = trn.amount
-
- trn.type === 1
- ? incomes = incomes + amount
- : expenses = expenses + amount
- }
-
- // Transfer
- if (trn.type === 2 && inculdeTrnasfers) {
- if (walletId === trn.walletFromId || walletId === trn.expenseWalletId)
- expenses = expenses + (trn.expenseAmount ? trn.expenseAmount : trn.amount)
-
- if (walletId === trn.walletToId || walletId === trn.incomeWalletId)
- incomes = incomes + (trn.incomeAmount ? trn.incomeAmount : trn.amount)
- }
+ return {
+ expense: total.expenseTransactions + total.expenseTransfers,
+ income: total.incomeTransactions + total.incomeTransfers,
+ sum: total.sumTransactions + total.sumTransfers,
+ // @deprecated
+ expenses: total.expenseTransactions + total.expenseTransfers,
+ incomes: total.incomeTransactions + total.incomeTransfers,
+ total: total.sumTransactions + total.sumTransfers,
}
}
- return {
- expense: Math.abs(+expenses.toFixed(0)),
- income: Math.abs(+incomes.toFixed(0)),
- sum: parseInt(incomes - expenses),
- // @deprecated
- expenses: Math.abs(+expenses.toFixed(0)),
- incomes: Math.abs(+incomes.toFixed(0)),
- total: parseInt(incomes - expenses),
+ else if (inculdeTrnasfers && !isConvertToBase) {
+ total = getTotal({
+ transferCategoriesIds,
+ trnsIds,
+ trnsItems,
+ walletsItems,
+ walletsIds: [walletId],
+ })
+
+ return {
+ expense: total.expenseTransactions + total.expenseTransfers,
+ income: total.incomeTransactions + total.incomeTransfers,
+ sum: total.sumTransactions + total.sumTransfers,
+ // @deprecated
+ expenses: total.expenseTransactions + total.expenseTransfers,
+ incomes: total.incomeTransactions + total.incomeTransfers,
+ total: total.sumTransactions + total.sumTransfers,
+ }
+ }
+ else if (!inculdeTrnasfers) {
+ total = getTotal({
+ baseRate,
+ rates,
+ transferCategoriesIds,
+ trnsIds,
+ trnsItems,
+ walletsItems,
+ })
+
+ return {
+ expense: total.expenseTransactions,
+ income: total.incomeTransactions,
+ sum: total.sumTransactions,
+ // @deprecated
+ expenses: total.expenseTransactions,
+ incomes: total.incomeTransactions,
+ total: total.sumTransactions,
+ }
}
},
@@ -119,7 +159,7 @@ export default {
return trnsIds[0]
},
- // TODO: should use components/trns/functions/getTrns when its compatible
+ // TODO: should use components/trns/getTrns when its compatible
selectedTrnsIds(_state, getters, rootState) {
if (!getters.hasTrns)
return []
@@ -140,7 +180,7 @@ export default {
return trnsIds
},
- // TODO: should use components/trns/functions/getTrns when its compatible
+ // TODO: should use components/trns/getTrns when its compatible
selectedTrnsIdsWithDate(_state, getters, rootState) {
if (!getters.hasTrns)
return []