Browse Source

Fee and unit price in base currency removed from activity

csehatt741 1 week ago
committed by Attila Cseh
parent
commit
34e24eba9a
  1. 14
      apps/api/src/app/import/import.service.ts
  2. 2
      apps/api/src/app/order/interfaces/activities.interface.ts
  3. 14
      apps/api/src/app/order/order.service.ts

14
apps/api/src/app/import/import.service.ts

@ -121,7 +121,6 @@ export class ImportService {
currency: undefined, currency: undefined,
createdAt: undefined, createdAt: undefined,
fee: 0, fee: 0,
feeInBaseCurrency: 0,
feeInSymbolCurrency: 0, feeInSymbolCurrency: 0,
id: assetProfile.id, id: assetProfile.id,
isDraft: false, isDraft: false,
@ -129,13 +128,6 @@ export class ImportService {
symbolProfileId: assetProfile.id, symbolProfileId: assetProfile.id,
type: 'DIVIDEND', type: 'DIVIDEND',
unitPrice: marketPrice, unitPrice: marketPrice,
unitPriceInBaseCurrency:
await this.exchangeRateDataService.toCurrencyAtDate(
marketPrice,
assetProfile.currency,
userCurrency,
date
),
unitPriceInSymbolCurrency: marketPrice, unitPriceInSymbolCurrency: marketPrice,
updatedAt: undefined, updatedAt: undefined,
userId: Account?.userId, userId: Account?.userId,
@ -448,12 +440,6 @@ export class ImportService {
...order, ...order,
error, error,
value, value,
feeInBaseCurrency: await this.exchangeRateDataService.toCurrencyAtDate(
fee,
assetProfile.currency,
userCurrency,
date
),
// @ts-ignore // @ts-ignore
SymbolProfile: assetProfile, SymbolProfile: assetProfile,
valueInBaseCurrency: valueInBaseCurrency:

2
apps/api/src/app/order/interfaces/activities.interface.ts

@ -11,11 +11,9 @@ export interface Activities {
export interface Activity extends Order { export interface Activity extends Order {
Account?: AccountWithPlatform; Account?: AccountWithPlatform;
error?: ActivityError; error?: ActivityError;
feeInBaseCurrency: number;
feeInSymbolCurrency: number; feeInSymbolCurrency: number;
SymbolProfile?: EnhancedSymbolProfile; SymbolProfile?: EnhancedSymbolProfile;
tags?: Tag[]; tags?: Tag[];
unitPriceInBaseCurrency: number;
unitPriceInSymbolCurrency: number; unitPriceInSymbolCurrency: number;
updateAccountBalance?: boolean; updateAccountBalance?: boolean;
value: number; value: number;

14
apps/api/src/app/order/order.service.ts

@ -534,13 +534,6 @@ export class OrderService {
return { return {
...order, ...order,
value, value,
feeInBaseCurrency:
await this.exchangeRateDataService.toCurrencyAtDate(
order.fee,
order.currency ?? order.SymbolProfile.currency,
userCurrency,
order.date
),
feeInSymbolCurrency: feeInSymbolCurrency:
await this.exchangeRateDataService.toCurrencyAtDate( await this.exchangeRateDataService.toCurrencyAtDate(
order.fee, order.fee,
@ -549,13 +542,6 @@ export class OrderService {
order.date order.date
), ),
SymbolProfile: assetProfile, SymbolProfile: assetProfile,
unitPriceInBaseCurrency:
await this.exchangeRateDataService.toCurrencyAtDate(
order.unitPrice,
order.currency ?? order.SymbolProfile.currency,
userCurrency,
order.date
),
unitPriceInSymbolCurrency: unitPriceInSymbolCurrency:
await this.exchangeRateDataService.toCurrencyAtDate( await this.exchangeRateDataService.toCurrencyAtDate(
order.unitPrice, order.unitPrice,

Loading…
Cancel
Save