code refactor

This commit is contained in:
MaysWind
2024-09-09 23:26:08 +08:00
parent 30344ef5cb
commit 77e9ae94cf
+9 -22
View File
@@ -307,16 +307,9 @@ function buildBasicSubmitTransaction(transaction, dummyTime) {
utcOffset: transaction.utcOffset utcOffset: transaction.utcOffset
}; };
if (transaction.type === transactionConstants.allTransactionTypes.Expense) { if (transaction.type === transactionConstants.allTransactionTypes.Transfer) {
submitTransaction.categoryId = transaction.expenseCategory;
} else if (transaction.type === transactionConstants.allTransactionTypes.Income) {
submitTransaction.categoryId = transaction.incomeCategory;
} else if (transaction.type === transactionConstants.allTransactionTypes.Transfer) {
submitTransaction.categoryId = transaction.transferCategory;
submitTransaction.destinationAccountId = transaction.destinationAccountId; submitTransaction.destinationAccountId = transaction.destinationAccountId;
submitTransaction.destinationAmount = transaction.destinationAmount; submitTransaction.destinationAmount = transaction.destinationAmount;
} else {
return null;
} }
return submitTransaction; return submitTransaction;
@@ -867,7 +860,13 @@ export const useTransactionsStore = defineStore('transactions', {
const submitTransaction = buildBasicSubmitTransaction(transaction, true); const submitTransaction = buildBasicSubmitTransaction(transaction, true);
if (!submitTransaction) { if (transaction.type === transactionConstants.allTransactionTypes.Expense) {
submitTransaction.categoryId = transaction.expenseCategory;
} else if (transaction.type === transactionConstants.allTransactionTypes.Income) {
submitTransaction.categoryId = transaction.incomeCategory;
} else if (transaction.type === transactionConstants.allTransactionTypes.Transfer) {
submitTransaction.categoryId = transaction.transferCategory;
} else {
return Promise.reject('An error occurred'); return Promise.reject('An error occurred');
} }
@@ -1044,21 +1043,9 @@ export const useTransactionsStore = defineStore('transactions', {
if (transactions) { if (transactions) {
for (let i = 0; i < transactions.length; i++) { for (let i = 0; i < transactions.length; i++) {
const transaction = transactions[i]; const transaction = transactions[i];
if (transaction.type === transactionConstants.allTransactionTypes.Income) {
transaction.incomeCategory = transaction.categoryId;
} else if (transaction.type === transactionConstants.allTransactionTypes.Expense) {
transaction.expenseCategory = transaction.categoryId;
} else if (transaction.type === transactionConstants.allTransactionTypes.Transfer) {
transaction.transferCategory = transaction.categoryId;
}
const submitTransaction = buildBasicSubmitTransaction(transaction, false); const submitTransaction = buildBasicSubmitTransaction(transaction, false);
if (!submitTransaction) { submitTransaction.categoryId = transaction.categoryId;
return Promise.reject('An error occurred');
}
submitTransactions.push(submitTransaction); submitTransactions.push(submitTransaction);
} }
} }