Refactor isAfter() with isFuture() and isPast()

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

@@ -51,6 +51,8 @@ import {
   format,
   isAfter,
   isBefore,
+  isFuture,
+  isPast,
   isWithinInterval,
   min,
   startOfDay,
@@ -134,7 +136,7 @@ export abstract class PortfolioCalculator {
             dateOfFirstActivity = date;
           }
 
-          if (isAfter(date, new Date())) {
+          if (isFuture(date)) {
             // Adapt date to today if activity is in future (e.g. liability)
             // to include it in the interval
             date = endOfDay(new Date());
@@ -1113,7 +1115,7 @@ export abstract class PortfolioCalculator {
         portfolioSnapshot
       );
 
-      if (isAfter(new Date(), new Date(expiration))) {
+      if (isPast(new Date(expiration))) {
         isCachedPortfolioSnapshotExpired = true;
       }
     } catch {}

apps/api/src/services/benchmark/benchmark.service.ts

@@ -23,7 +23,7 @@ import { BenchmarkTrend } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
 import { Big } from 'big.js';
-import { addHours, isAfter, subDays } from 'date-fns';
+import { addHours, isPast, subDays } from 'date-fns';
 import { round, uniqBy } from 'lodash';
 import ms from 'ms';
 
@@ -94,7 +94,7 @@ export class BenchmarkService {
 
         this.logger.debug('Fetched benchmarks from cache');
 
-        if (isAfter(new Date(), new Date(expiration))) {
+        if (isPast(new Date(expiration))) {
           this.calculateAndCacheBenchmarks({
             enableSharing
           });