enhancement(TransactionsCSV): split accounting category fields

opencollective · Jan 30, 2024 · df1f110 · df1f110
1 parent 6fe6897
commit df1f110
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/server/controllers/account-transactions.js b/src/server/controllers/account-transactions.js
@@ -248,16 +248,9 @@ const formatAccountName = (account) => {
   }
 };
 
-const formatAccountingCategory = (accountingCategory) => {
-  if (!accountingCategory) {
-    return '';
-  } else {
-    return `${accountingCategory.code} - ${accountingCategory.name}`;
-  }
-};
-
 const csvMapping = {
-  accountingCategory: (t) => formatAccountingCategory(get(t, 'expense.accountingCategory')),
+  accountingCategoryCode: (t) => get(t, 'expense.accountingCategory.code') || '',
+  accountingCategoryName: (t) => get(t, 'expense.accountingCategory.name') || '',
   date: (t) => moment.utc(t.createdAt).format('YYYY-MM-DD'),
   datetime: (t) => moment.utc(t.createdAt).format('YYYY-MM-DDTHH:mm:ss'),
   id: 'id',
@@ -529,7 +522,7 @@ const accountTransactions = async (req, res) => {
   const fetchAll = variables.offset ? false : parseToBooleanDefaultFalse(req.query.fetchAll);
 
   // Add fields info to the query, to prevent fetching what's not needed
-  variables.hasAccountingCategoryField = fields.includes('accountingCategory');
+  variables.hasAccountingCategoryField = fields.some((field) => field.startsWith('accountingCategory'));
 
   try {
     // Forward Api Key or Authorization header