From 5c56658cc04e0c54e4c88846f475cdef9e2d0c9b Mon Sep 17 00:00:00 2001
From: csehatt741 <att741@gmail.com>
Date: Fri, 21 Feb 2025 10:59:40 +0100
Subject: [PATCH] Code review fixes

---
 .../src/app/portfolio/calculator/portfolio-calculator.ts    | 3 +++
 .../app/portfolio/calculator/twr/portfolio-calculator.ts    | 2 +-
 apps/api/src/app/portfolio/portfolio.service.ts             | 6 +++---
 .../responses/public-portfolio-response.interface.ts        | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 65122b52d..7e96f8055 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -175,7 +175,10 @@ export abstract class PortfolioCalculator {
 
     if (!transactionPoints.length) {
       return {
+<<<<<<< HEAD
         activitiesCount: 0,
+=======
+>>>>>>> 6e5db62f (Code review fixes)
         currentValueInBaseCurrency: new Big(0),
         createdAt: new Date(),
         errors: [],
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
index 62c60be92..33168e832 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
@@ -94,7 +94,6 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
     }
 
     return {
-      createdAt: new Date(),
       currentValueInBaseCurrency,
       hasErrors,
       positions,
@@ -106,6 +105,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
         return ['BUY', 'SELL'].includes(type);
       }).length,
       errors: [],
+      createdAt: new Date(),
       historicalData: [],
       totalLiabilitiesWithCurrencyEffect: new Big(0),
       totalValuablesWithCurrencyEffect: new Big(0)
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 7703b0cc1..2a24c7f8e 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1100,7 +1100,7 @@ export class PortfolioService {
         firstOrderDate: undefined,
         hasErrors: false,
         performance: {
-          createdAt: undefined,
+          createdAt: new Date(),
           currentNetWorth: 0,
           currentValueInBaseCurrency: 0,
           netPerformance: 0,
@@ -1155,10 +1155,10 @@ export class PortfolioService {
       hasErrors,
       firstOrderDate: parseDate(historicalData[0]?.date),
       performance: {
+        createdAt,
         netPerformance,
         netPerformanceWithCurrencyEffect,
         totalInvestment,
-        createdAt: createdAt,
         currentNetWorth: netWorth,
         currentValueInBaseCurrency: valueWithCurrencyEffect,
         netPerformancePercentage: netPerformanceInPercentage,
@@ -1916,6 +1916,7 @@ export class PortfolioService {
       })?.toNumber();
 
     return {
+      createdAt,
       annualizedPerformancePercent,
       annualizedPerformancePercentWithCurrencyEffect,
       cash,
@@ -1929,7 +1930,6 @@ export class PortfolioService {
       totalSell,
       committedFunds: committedFunds.toNumber(),
       currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(),
-      createdAt: createdAt,
       dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
       emergencyFund: {
         assets: emergencyFundPositionsValueInBaseCurrency,
diff --git a/libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts b/libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts
index 17d7dc066..7a98e3c8d 100644
--- a/libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts
+++ b/libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts
@@ -3,7 +3,6 @@ import { Market } from '../../types';
 
 export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 {
   alias?: string;
-  createdAt: Date;
   hasDetails: boolean;
   holdings: {
     [symbol: string]: Pick<
@@ -33,6 +32,7 @@ export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 {
 }
 
 interface PublicPortfolioResponseV1 {
+  createdAt: Date;
   performance: {
     '1d': {
       relativeChange: number;