Refactoring

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

@@ -140,11 +140,11 @@ export class BenchmarkService {
         performances: {
           allTimeHigh: {
             date: allTimeHigh?.date || new Date(),
-            performancePercent: performancePercentFromAllTimeHigh,
-            trend50d: benchmarkTrends[index].trend50d,
-            trend200d: benchmarkTrends[index].trend200d
+            performancePercent: performancePercentFromAllTimeHigh
           }
-        }
+        },
+        trend50d: benchmarkTrends[index].trend50d,
+        trend200d: benchmarkTrends[index].trend200d
       };
     });
 

libs/common/src/lib/helper.ts

@@ -32,27 +32,32 @@ export function calculateBenchmarkTrend({
   const hasEnoughData = historicalData.length >= 2 * days;
 
   if (!hasEnoughData) {
-    return null;
+    return 'UNKNOWN';
   }
 
-  const latestDataAverage = calculateMovingAverage({
+  const recentPeriodAverage = calculateMovingAverage({
     days,
     prices: historicalData.slice(0, days).map(({ marketPrice }) => {
       return new Big(marketPrice);
     })
   });
-  const oldDataAverage = calculateMovingAverage({
+
+  const pastPeriodAverage = calculateMovingAverage({
     days,
     prices: historicalData.slice(days, 2 * days).map(({ marketPrice }) => {
       return new Big(marketPrice);
     })
   });
 
-  return latestDataAverage > oldDataAverage
-    ? 'UP'
-    : latestDataAverage < oldDataAverage
-      ? 'DOWN'
-      : 'NEUTRAL';
+  if (recentPeriodAverage > pastPeriodAverage) {
+    return 'UP';
+  }
+
+  if (recentPeriodAverage < pastPeriodAverage) {
+    return 'DOWN';
+  }
+
+  return 'NEUTRAL';
 }
 
 export function calculateMovingAverage({

libs/common/src/lib/interfaces/benchmark.interface.ts

@@ -9,8 +9,8 @@ export interface Benchmark {
     allTimeHigh: {
       date: Date;
       performancePercent: number;
-      trend50d: BenchmarkTrend;
-      trend200d: BenchmarkTrend;
     };
   };
+  trend50d: BenchmarkTrend;
+  trend200d: BenchmarkTrend;
 }

libs/common/src/lib/types/benchmark-trend.type.ts

@@ -1 +1 @@
-export type BenchmarkTrend = 'DOWN' | 'NEUTRAL' | 'UP';
+export type BenchmarkTrend = 'DOWN' | 'NEUTRAL' | 'UNKNOWN' | 'UP';