Return number of creaeted txns from exporters

brafdlog · Nov 21, 2022 · 1e35bf7 · 1e35bf7
1 parent 97b3399
commit 1e35bf7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 12 deletions.
diff --git a/src/backend/commonTypes.ts b/src/backend/commonTypes.ts
@@ -83,10 +83,14 @@ export type ExportTransactionsParams = {
   outputVendorsConfig: Config['outputVendors'];
 }
 
+export type ExportTransactionsResult = {
+  exportedTransactionsNum: number
+}
+
 export type ExportTransactionsFunction = (
   exportTransactionsParams: ExportTransactionsParams,
   eventPublisher: any
-) => Promise<any>;
+) => Promise<ExportTransactionsResult>;
 
 export interface OutputVendor {
   name: OutputVendorName;

diff --git a/src/backend/eventEmitters/EventEmitter.ts b/src/backend/eventEmitters/EventEmitter.ts
@@ -93,6 +93,15 @@ export class ExporterEvent extends BudgetTrackingEvent {
   }
 }
 
+export class ExporterEndEvent extends ExporterEvent {
+  exportedTransactionsNum: number;
+
+  constructor(exporterEventParams: ExporterEventParams & { exportedTransactionsNum: number }) {
+    super(exporterEventParams);
+    this.exportedTransactionsNum = exporterEventParams.exportedTransactionsNum;
+  }
+}
+
 export class DownalodChromeEvent extends BudgetTrackingEvent {
   percent: number;
 
@@ -115,7 +124,7 @@ export type EventDataMap = {
   [EventNames.EXPORTER_START]: ExporterEvent
   [EventNames.EXPORTER_PROGRESS]: ExporterEvent
   [EventNames.EXPORTER_ERROR]: ExporterEvent
-  [EventNames.EXPORTER_END]: ExporterEvent
+  [EventNames.EXPORTER_END]: ExporterEndEvent
   [EventNames.GENERAL_ERROR]: BudgetTrackingEvent
   [EventNames.LOG]: BudgetTrackingEvent
 };

diff --git a/src/backend/export/exportTransactions.ts b/src/backend/export/exportTransactions.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {
-  AccountStatus, EventNames, EventPublisher, ExporterEvent
+  AccountStatus, EventNames, EventPublisher, ExporterEndEvent, ExporterEvent
 } from '@/backend/eventEmitters/EventEmitter';
 import { EnrichedTransaction, Config } from '@/backend/commonTypes';
 import outputVendors from '@/backend/export/outputVendors';
@@ -25,11 +25,13 @@ export async function createTransactionsInExternalVendors(
       await outputVendor.init?.(outputVendorsConfig);
       await eventPublisher.emit(EventNames.EXPORTER_START, new ExporterEvent({ message: 'Starting', ...baseEvent }));
       try {
-        const vendorResult = await outputVendor.exportTransactions({
+        const exportTransactionsResult = await outputVendor.exportTransactions({
           transactionsToCreate: allTransactions, startDate, outputVendorsConfig
         }, eventPublisher);
-        await eventPublisher.emit(EventNames.EXPORTER_END, new ExporterEvent({ message: 'Finished', ...baseEvent, status: AccountStatus.DONE }));
-        executionResult[outputVendor.name] = vendorResult;
+        await eventPublisher.emit(EventNames.EXPORTER_END, new ExporterEndEvent({
+          message: 'Finished', ...baseEvent, status: AccountStatus.DONE, exportedTransactionsNum: exportTransactionsResult.exportedTransactionsNum
+        }));
+        executionResult[outputVendor.name] = exportTransactionsResult;
       } catch (e) {
         await eventPublisher.emit(EventNames.EXPORTER_ERROR, new ExporterEvent({
           message: e.message, error: e, ...baseEvent

diff --git a/src/backend/export/outputVendors/csv/csv.ts b/src/backend/export/outputVendors/csv/csv.ts
@@ -85,6 +85,9 @@ const exportTransactions: ExportTransactionsFunction = async ({ transactionsToCr
   const mergedTransactions = mergeTransactions(savedTransactions, transactionsToCreate);
   const sorted = sortByDate(mergedTransactions);
   await writeCsvFile(filePath, serializeTransactions(sorted));
+  return {
+    exportedTransactionsNum: sorted.length
+  };
 };
 
 const parseTransactionsFile = async (filename: string) => {

diff --git a/src/backend/export/outputVendors/googleSheets/googleSheets.ts b/src/backend/export/outputVendors/googleSheets/googleSheets.ts
@@ -45,7 +45,9 @@ const createTransactionsInGoogleSheets: ExportTransactionsFunction = async (
 
   if (transactionsToCreate.length === 0) {
     await emitProgressEvent(eventPublisher, transactions, 'All transactions already exist in google sheets');
-    return null;
+    return {
+      exportedTransactionsNum: 0
+    };
   }
 
   await emitProgressEvent(eventPublisher, transactions, `Creating ${transactionsToCreate.length} transactions in google sheets`);
@@ -66,10 +68,12 @@ const createTransactionsInGoogleSheets: ExportTransactionsFunction = async (
     transaction.status
   ]);
 
-  const spreadsheetAppendResult = await googleSheets.appendToSpreadsheet(
+  await googleSheets.appendToSpreadsheet(
     spreadsheetId, `${DEFAULT_SHEET_NAME}!A:A`, transactionsInSheetsFormat, oAuthClient
   );
-  return spreadsheetAppendResult.data;
+  return {
+    exportedTransactionsNum: transactionsToCreate.length
+  };
 };
 
 async function emitProgressEvent(eventPublisher: EventPublisher, allTransactions: EnrichedTransaction[], message: string) {

diff --git a/src/backend/export/outputVendors/json/json.ts b/src/backend/export/outputVendors/json/json.ts
@@ -22,6 +22,9 @@ const exportTransactions: ExportTransactionsFunction = async ({ transactionsToCr
   const mergedTransactions = mergeTransactions(savedTransactions, transactionsToCreate);
   const sorted = sortByDate(mergedTransactions);
   await fs.writeFile(filePath, JSON.stringify(sorted, null, 4));
+  return {
+    exportedTransactionsNum: sorted.length
+  };
 };
 
 export default {

diff --git a/src/backend/export/outputVendors/ynab/ynab.ts b/src/backend/export/outputVendors/ynab/ynab.ts
@@ -50,14 +50,19 @@ const createTransactions: ExportTransactionsFunction = async ({ transactionsToCr
   transactionsThatDontExistInYnab = transactionsThatDontExistInYnab.filter((transaction) => moment(transaction.date, YNAB_DATE_FORMAT).isBefore(NOW));
   if (!transactionsThatDontExistInYnab.length) {
     await emitProgressEvent(eventPublisher, transactionsToCreate, 'All transactions already exist in ynab. Doing nothing.');
-    return null;
+    return {
+      exportedTransactionsNum: 0
+    };
   }
+
   await emitProgressEvent(eventPublisher, transactionsToCreate, `Creating ${transactionsThatDontExistInYnab.length} transactions in ynab`);
   try {
-    const transactionCreationResult = await ynabAPI!.transactions.createTransactions(ynabConfig.options.budgetId, {
+    await ynabAPI!.transactions.createTransactions(ynabConfig.options.budgetId, {
       transactions: transactionsThatDontExistInYnab
     });
-    return transactionCreationResult;
+    return {
+      exportedTransactionsNum: transactionsThatDontExistInYnab.length
+    };
   } catch (e) {
     await eventPublisher.emit(EventNames.EXPORTER_ERROR, new ExporterEvent({
       message: e.message, error: e, exporterName: ynabOutputVendor.name, allTransactions: transactionsToCreate