Merge remote-tracking branch 'origin/main' into task/symbol-autocomplete-type-safety

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

@@ -627,6 +627,7 @@ export class PortfolioService {
           assetClass: assetProfile.assetClass,
           assetSubClass: assetProfile.assetSubClass,
           countries: assetProfile.countries,
+          currency: assetProfile.currency,
           dataSource: assetProfile.dataSource,
           holdings: assetProfile.holdings.map(
             ({ allocationInPercentage, name }) => {
@@ -1699,6 +1700,7 @@ export class PortfolioService {
       assetClass: AssetClass.LIQUIDITY,
       assetSubClass: AssetSubClass.CASH,
       assetProfile: {
+        currency,
         assetClass: AssetClass.LIQUIDITY,
         assetSubClass: AssetSubClass.CASH,
         countries: [],

libs/common/src/lib/interfaces/portfolio-position.interface.ts

@@ -22,6 +22,7 @@ export interface PortfolioPosition {
     | 'assetClass'
     | 'assetSubClass'
     | 'countries'
+    | 'currency'
     | 'dataSource'
     | 'holdings'
     | 'name'
@@ -42,6 +43,7 @@ export interface PortfolioPosition {
   /** @deprecated */
   countries: Country[];
 
+  /** @deprecated */
   currency: string;
 
   /** @deprecated */

libs/ui/src/lib/mocks/holdings.ts

@@ -17,6 +17,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'USD',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [
@@ -81,6 +82,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'EUR',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [
@@ -145,6 +147,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'USD',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [
@@ -202,6 +205,7 @@ export const holdings: PortfolioPosition[] = [
       assetClass: 'LIQUIDITY',
       assetSubClass: 'CASH',
       countries: [],
+      currency: 'USD',
       dataSource: 'COINGECKO',
       holdings: [],
       sectors: [],
@@ -249,6 +253,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'USD',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [
@@ -313,6 +318,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'USD',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [
@@ -377,6 +383,7 @@ export const holdings: PortfolioPosition[] = [
           weight: 1
         }
       ],
+      currency: 'USD',
       dataSource: 'YAHOO',
       holdings: [],
       sectors: [

libs/ui/src/lib/services/data.service.ts

@@ -69,10 +69,11 @@ import { Injectable } from '@angular/core';
 import { SortDirection } from '@angular/material/sort';
 import { utc } from '@date-fns/utc';
 import {
+  Account,
   AccountBalance,
   DataSource,
   MarketData,
-  Order as OrderModel,
+  Order,
   Tag
 } from '@prisma/client';
 import { format, parseISO } from 'date-fns';
@@ -751,11 +752,11 @@ export class DataService {
   }
 
   public postAccess(aAccess: CreateAccessDto) {
-    return this.http.post<OrderModel>('/api/v1/access', aAccess);
+    return this.http.post<Access>('/api/v1/access', aAccess);
   }
 
   public postAccount(aAccount: CreateAccountDto) {
-    return this.http.post<OrderModel>('/api/v1/account', aAccount);
+    return this.http.post<Account>('/api/v1/account', aAccount);
   }
 
   public postAccountBalance(aAccountBalance: CreateAccountBalanceDto) {
@@ -766,7 +767,7 @@ export class DataService {
   }
 
   public postActivity(aOrder: CreateOrderDto) {
-    return this.http.post<OrderModel>('/api/v1/activities', aOrder);
+    return this.http.post<Order>('/api/v1/activities', aOrder);
   }
 
   public postApiKey() {