Improve testability with dependency injection, bring etoro test cover…

…age to 100%
dickwolff · Feb 9, 2024 · 42a29f8 · 42a29f8
1 parent d5cad1c
commit 42a29f8
Show file tree

Hide file tree

Showing 16 changed files with 288 additions and 255 deletions.
diff --git a/src/converter.ts b/src/converter.ts
@@ -9,6 +9,7 @@ import { AbstractConverter } from "./converters/abstractconverter";
 import { Trading212Converter } from "./converters/trading212Converter";
 import { SwissquoteConverter } from "./converters/swissquoteConverter";
 import { FinpensionConverter } from "./converters/finpensionConverter";
+import { YahooFinanceService } from "./yahooFinanceService";
 
 
 export function createAndRunConverter(converterType: string, inputFilePath: string, outputFilePath: string, completionCallback: CallableFunction, errorCallback: CallableFunction) {
@@ -42,45 +43,47 @@ export function createAndRunConverter(converterType: string, inputFilePath: stri
 
 function createConverter(converterType: string): AbstractConverter {
 
+    const yahooFinanceService = new YahooFinanceService();
+
     let converter: AbstractConverter;
 
     switch (converterType) {
         case "t212":
         case "trading212":
             console.log("[i] Processing file using Trading212 converter");
-            converter = new Trading212Converter();
+            converter = new Trading212Converter(yahooFinanceService);
             break;
         case "degiro":
             console.log("[i] Processing file using DeGiro converter");
             console.log("[i] NOTE: There is a new version available of the DeGiro converter");
             console.log("[i] The new converter has multiple record parsing improvements and also supports platform fees.");
             console.log("[i] The new converter is currently in beta and we're looking for your feedback!");
             console.log("[i] You can run the beta converter with the command 'npm run start degiro-v2'.");
-            converter = new DeGiroConverter();
+            converter = new DeGiroConverter(yahooFinanceService);
             break;
         case "degiro-v2":
             console.log("[i] Processing file using DeGiro converter (V2 Beta)");
             console.log("[i] NOTE: You are running a converter that is currently in beta.");
             console.log("[i] If you have any issues, please report them on GitHub. Many thanks!");
-            converter = new DeGiroConverterV2();
+            converter = new DeGiroConverterV2(yahooFinanceService);
             break;
         case "fp":
         case "finpension":
             console.log("[i] Processing file using Finpension converter");
-            converter = new FinpensionConverter();
+            converter = new FinpensionConverter(yahooFinanceService);
             break;
         case "sq":
         case "swissquote":
             console.log("[i] Processing file using Swissquote converter");
-            converter = new SwissquoteConverter();
+            converter = new SwissquoteConverter(yahooFinanceService);
             break;
         case "schwab":
             console.log("[i] Processing file using Schwab converter");
-            converter = new SchwabConverter();
+            converter = new SchwabConverter(yahooFinanceService);
             break;
         case "etoro":
             console.log("[i] Processing file using Etoro converter");
-            converter = new EtoroConverter();
+            converter = new EtoroConverter(yahooFinanceService);
             break;
         default:
             throw new Error(`Unknown converter '${converterType}' provided`);

diff --git a/src/converters/abstractconverter.ts b/src/converters/abstractconverter.ts
@@ -1,11 +1,17 @@
 import * as fs from "fs";
 import * as cliProgress from "cli-progress";
+import { YahooFinanceService } from "../yahooFinanceService";
 
 export abstract class AbstractConverter {
 
+    protected yahooFinanceService: YahooFinanceService;
+
     protected progress: cliProgress.MultiBar;
 
-    constructor() {
+    constructor(yahooFinanceService: YahooFinanceService) {
+
+        this.yahooFinanceService = yahooFinanceService;
+
         this.progress = new cliProgress.MultiBar(
             {
                 stopOnComplete: true,

diff --git a/src/converters/degiroConverter.test.ts b/src/converters/degiroConverter.test.ts
@@ -1,11 +1,12 @@
+import { YahooFinanceService } from "../yahooFinanceService";
 import { DeGiroConverter } from "./degiroConverter";
 
 describe("degiroConverter", () => {
 
     it("should construct", () => {
 
       // Act
-      const sut = new DeGiroConverter();
+      const sut = new DeGiroConverter(new YahooFinanceService());
 
       // Asssert
       expect(sut).toBeTruthy();

diff --git a/src/converters/degiroConverter.ts b/src/converters/degiroConverter.ts
@@ -10,12 +10,8 @@ import { GhostfolioOrderType } from "../models/ghostfolioOrderType";
 
 export class DeGiroConverter extends AbstractConverter {
 
-  private yahooFinanceService: YahooFinanceService;
-
-  constructor() {
-    super();
-
-    this.yahooFinanceService = new YahooFinanceService();
+  constructor(yahooFinanceService: YahooFinanceService) {
+    super(yahooFinanceService);
 
     dayjs.extend(customParseFormat);
   }
@@ -37,12 +33,13 @@ export class DeGiroConverter extends AbstractConverter {
         return columnValue;
       }
     }, async (_, records: DeGiroRecord[]) => {
-      
+
       // If records is empty, parsing failed..
-      if (records === undefined) {
+      if (records === undefined || records.length === 0) {
         return errorCallback(new Error("An error ocurred while parsing!"));
       }
 
+
       console.log("[i] Read CSV file. Start processing..");
       const result: GhostfolioExport = {
         meta: {
@@ -89,7 +86,7 @@ export class DeGiroConverter extends AbstractConverter {
             this.progress);
         }
         catch (err) {
-          this.logQueryError(record.isin || record.product, idx);  
+          this.logQueryError(record.isin || record.product, idx);
           return errorCallback(err);
         }
 

diff --git a/src/converters/degiroConverterV2.test.ts b/src/converters/degiroConverterV2.test.ts
@@ -1,11 +1,12 @@
+import { YahooFinanceService } from "../yahooFinanceService";
 import { DeGiroConverterV2 } from "./degiroConverterV2";
 
 describe("degiroConverterV2", () => {
 
     it("should construct", () => {
 
       // Act
-      const sut = new DeGiroConverterV2();
+      const sut = new DeGiroConverterV2(new YahooFinanceService());
 
       // Asssert
       expect(sut).toBeTruthy();