Refactoring

apps/api/src/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor.ts

@@ -1,6 +1,6 @@
 import {
   decodeDataSource,
-  getUnmaskedGhostfolioDataSource
+  transformDataSourceInRequest
 } from '@ghostfolio/api/helper/data-source.helper';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 
@@ -28,30 +28,19 @@ export class TransformDataSourceInRequestInterceptor<
     const http = context.switchToHttp();
     const request = http.getRequest();
 
-    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
     if (request.body?.activities) {
-        const ghostfolioDataSources = this.configurationService.get(
-          'DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER'
-        );
-
       request.body.activities = request.body.activities.map((activity) => {
-          if (DataSource[activity.dataSource]) {
         return {
           ...activity,
-              dataSource: getUnmaskedGhostfolioDataSource({
+          dataSource: transformDataSourceInRequest({
-                ghostfolioDataSources,
+            configurationService: this.configurationService,
             dataSource: activity.dataSource
           })
         };
-          } else {
-            return {
-              ...activity,
-              dataSource: decodeDataSource(activity.dataSource)
-            };
-          }
       });
     }
 
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
       for (const type of ['body', 'params', 'query']) {
         const dataSourceValue = request[type]?.dataSource;
 
@@ -68,19 +57,6 @@ export class TransformDataSourceInRequestInterceptor<
           });
         }
       }
-    } else {
-      if (request.body?.activities) {
-        request.body.activities = request.body.activities.map((activity) => {
-          if (DataSource[activity.dataSource]) {
-            return activity;
-          } else {
-            return {
-              ...activity,
-              dataSource: decodeDataSource(activity.dataSource)
-            };
-          }
-        });
-      }
     }
 
     return next.handle();