Fix converters after main merge

dickwolff · Feb 1, 2024 · 99f6223 · 99f6223
1 parent 1e425a0
commit 99f6223
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/src/converters/degiroConverter.ts b/src/converters/degiroConverter.ts
@@ -89,7 +89,8 @@ export class DeGiroConverter extends AbstractConverter {
             this.progress);
         }
         catch (err) {
-          throw err;
+          this.logQueryError(record.isin || record.product, idx);  
+          return errorCallback(err);
         }
 
         // Log whenever there was no match found.

diff --git a/src/converters/degiroConverterV2.ts b/src/converters/degiroConverterV2.ts
@@ -24,7 +24,7 @@ export class DeGiroConverterV2 extends AbstractConverter {
   /**
    * @inheritdoc
    */
-  public processFile(inputFile: string, callback: any): void {
+  public processFileContents(inputFile: string, successCallback: any, errorCallback: any): void {
 
     // Read file contents of the CSV export.
     const csvFile = fs.readFileSync(inputFile, "utf-8");
@@ -101,7 +101,7 @@ export class DeGiroConverterV2 extends AbstractConverter {
           } 
           catch (err) {    
             this.logQueryError(record.isin || record.product, idx);            
-            throw err;
+            return errorCallback(err);
           }
 
           // Log whenever there was no match found.
@@ -145,7 +145,7 @@ export class DeGiroConverterV2 extends AbstractConverter {
 
         this.progress.stop();
 
-        callback(result);
+        successCallback(result);
       });
   }
 

diff --git a/src/converters/finpensionConverter.ts b/src/converters/finpensionConverter.ts
@@ -120,7 +120,7 @@ export class FinpensionConverter extends AbstractConverter {
                 }
                 catch (err) {                    
                     this.logQueryError(record.isin || record.assetName, idx + 2);        
-                    throw err;
+                    return errorCallback(err);
                 }
 
                 // Log whenever there was no match found.

diff --git a/src/converters/schwabConverter.ts b/src/converters/schwabConverter.ts
@@ -24,7 +24,7 @@ export class SchwabConverter extends AbstractConverter {
     /**
      * @inheritdoc
      */
-    public processFile(inputFile: string, callback: any): void {
+    public processFileContents(inputFile: string, successCallback: any, errorCallback: any): void {
 
         // Read file contents of the CSV export.
         const csvFile = fs.readFileSync(inputFile, "utf-8");
@@ -145,7 +145,7 @@ export class SchwabConverter extends AbstractConverter {
                 }
                 catch (err) {
                     this.logQueryError(record.symbol || record.description, idx + 2);    
-                    throw err;
+                    return errorCallback(err);
                 }
 
                 // Log whenever there was no match found.
@@ -187,7 +187,7 @@ export class SchwabConverter extends AbstractConverter {
 
             this.progress.stop()
 
-            callback(result);
+            successCallback(result);
         });
 
         // Catch any error.

diff --git a/src/converters/swissquoteComverter.test.ts → src/converters/swissquoteConverter.test.ts b/src/converters/swissquoteComverter.test.ts → src/converters/swissquoteConverter.test.ts
diff --git a/src/converters/trading212Converter.ts b/src/converters/trading212Converter.ts
@@ -128,7 +128,7 @@ export class Trading212Converter extends AbstractConverter {
                 }
                 catch (err) {
                     this.logQueryError(record.isin || record.ticker || record.name, idx + 2);        
-                    throw err;
+                    return errorCallback(err);
                 }
 
                 // Log whenever there was no match found.