Refactoring

apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts

@@ -23,7 +23,7 @@ export class PortfolioCalculatorFactory {
     private readonly configurationService: ConfigurationService,
     private readonly currentRateService: CurrentRateService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly portfolioService: PortfolioSnapshotService,
+    private readonly portfolioSnapshotService: PortfolioSnapshotService,
     private readonly redisCacheService: RedisCacheService
   ) {}
 
@@ -53,7 +53,7 @@ export class PortfolioCalculatorFactory {
           configurationService: this.configurationService,
           currentRateService: this.currentRateService,
           exchangeRateDataService: this.exchangeRateDataService,
-          portfolioService: this.portfolioService,
+          portfolioSnapshotService: this.portfolioSnapshotService,
           redisCacheService: this.redisCacheService
         });
       case PerformanceCalculationType.TWR:
@@ -66,7 +66,7 @@ export class PortfolioCalculatorFactory {
           userId,
           configurationService: this.configurationService,
           exchangeRateDataService: this.exchangeRateDataService,
-          portfolioService: this.portfolioService,
+          portfolioSnapshotService: this.portfolioSnapshotService,
           redisCacheService: this.redisCacheService
         });
       default:

apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@@ -64,7 +64,7 @@ export abstract class PortfolioCalculator {
   private endDate: Date;
   private exchangeRateDataService: ExchangeRateDataService;
   private filters: Filter[];
-  private portfolioService: PortfolioSnapshotService;
+  private portfolioSnapshotService: PortfolioSnapshotService;
   private redisCacheService: RedisCacheService;
   private snapshot: PortfolioSnapshot;
   private snapshotPromise: Promise<void>;
@@ -80,7 +80,7 @@ export abstract class PortfolioCalculator {
     currentRateService,
     exchangeRateDataService,
     filters,
-    portfolioService,
+    portfolioSnapshotService,
     redisCacheService,
     userId
   }: {
@@ -91,7 +91,7 @@ export abstract class PortfolioCalculator {
     currentRateService: CurrentRateService;
     exchangeRateDataService: ExchangeRateDataService;
     filters: Filter[];
-    portfolioService: PortfolioSnapshotService;
+    portfolioSnapshotService: PortfolioSnapshotService;
     redisCacheService: RedisCacheService;
     userId: string;
   }) {
@@ -140,7 +140,7 @@ export abstract class PortfolioCalculator {
         return a.date?.localeCompare(b.date);
       });
 
-    this.portfolioService = portfolioService;
+    this.portfolioSnapshotService = portfolioSnapshotService;
     this.redisCacheService = redisCacheService;
     this.userId = userId;
 
@@ -1078,7 +1078,7 @@ export abstract class PortfolioCalculator {
 
       if (isCachedPortfolioSnapshotExpired) {
         // Compute in the background
-        this.portfolioService.addJobToQueue({
+        this.portfolioSnapshotService.addJobToQueue({
           data: {
             userId: this.userId
           },
@@ -1094,7 +1094,7 @@ export abstract class PortfolioCalculator {
     } else {
       // Wait for computation
       // TODO
-      const job = await this.portfolioService.addJobToQueue({
+      const job = await this.portfolioSnapshotService.addJobToQueue({
         data: {
           userId: this.userId
         },

apps/api/src/services/portfolio-snapshot/portfolio-snapshot.processor.ts

@@ -23,7 +23,7 @@ export class PortfolioSnapshotProcessor {
     try {
       Logger.log(
         `Portfolio snapshot calculation of user ${job.data.userId} has been started`,
-        `PortfolioProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
+        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
       );
 
       // TODO: Do something
@@ -31,12 +31,12 @@ export class PortfolioSnapshotProcessor {
 
       Logger.log(
         `Portfolio snapshot calculation of user ${job.data.userId} has been completed`,
-        `PortfolioProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
+        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
       );
     } catch (error) {
       Logger.error(
         error,
-        `PortfolioProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
+        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
       );
 
       throw new Error(error);