|
@ -56,12 +56,11 @@ import { |
|
|
Platform, |
|
|
Platform, |
|
|
Prisma, |
|
|
Prisma, |
|
|
Tag, |
|
|
Tag, |
|
|
Type as TypeOfOrder |
|
|
Type as ActivityType |
|
|
} from '@prisma/client'; |
|
|
} from '@prisma/client'; |
|
|
import Big from 'big.js'; |
|
|
import Big from 'big.js'; |
|
|
import { |
|
|
import { |
|
|
differenceInDays, |
|
|
differenceInDays, |
|
|
endOfToday, |
|
|
|
|
|
format, |
|
|
format, |
|
|
isAfter, |
|
|
isAfter, |
|
|
isBefore, |
|
|
isBefore, |
|
@ -1577,7 +1576,7 @@ export class PortfolioService { |
|
|
const dividend = this.getSumOfActivityType({ |
|
|
const dividend = this.getSumOfActivityType({ |
|
|
activities, |
|
|
activities, |
|
|
userCurrency, |
|
|
userCurrency, |
|
|
activityType: TypeOfOrder.DIVIDEND |
|
|
activityType: 'DIVIDEND' |
|
|
}).toNumber(); |
|
|
}).toNumber(); |
|
|
const emergencyFund = new Big( |
|
|
const emergencyFund = new Big( |
|
|
Math.max( |
|
|
Math.max( |
|
@ -1590,7 +1589,7 @@ export class PortfolioService { |
|
|
const interest = this.getSumOfActivityType({ |
|
|
const interest = this.getSumOfActivityType({ |
|
|
activities, |
|
|
activities, |
|
|
userCurrency, |
|
|
userCurrency, |
|
|
activityType: TypeOfOrder.INTEREST |
|
|
activityType: 'INTEREST' |
|
|
}).toNumber(); |
|
|
}).toNumber(); |
|
|
const items = this.getSumOfActivityType({ |
|
|
const items = this.getSumOfActivityType({ |
|
|
activities, |
|
|
activities, |
|
@ -1706,7 +1705,7 @@ export class PortfolioService { |
|
|
userCurrency |
|
|
userCurrency |
|
|
}: { |
|
|
}: { |
|
|
activities: OrderWithAccount[]; |
|
|
activities: OrderWithAccount[]; |
|
|
activityType: TypeOfOrder; |
|
|
activityType: ActivityType; |
|
|
date?: Date; |
|
|
date?: Date; |
|
|
userCurrency: string; |
|
|
userCurrency: string; |
|
|
}) { |
|
|
}) { |
|
|