Browse Source

Fix issue with end date

pull/3393/head
Thomas Kaul 1 year ago
parent
commit
4a97308bdc
  1. 13
      apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
  2. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
  3. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
  4. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
  5. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
  6. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
  7. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
  8. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
  9. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts
  10. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
  11. 2
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts

13
apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@ -282,7 +282,7 @@ export abstract class PortfolioCalculator {
dataGatheringItems,
dateQuery: {
gte: parseDate(firstTransactionPoint?.date),
lt: end
lt: endDate
}
});
@ -316,16 +316,16 @@ export abstract class PortfolioCalculator {
: 1;
let chartDates = eachDayOfInterval(
{ end, start: chartStartDate },
{ end: endDate, start: chartStartDate },
{ step }
).map((date) => {
return resetHours(date);
});
const includesEndDate = isSameDay(last(chartDates), end);
const includesEndDate = isSameDay(last(chartDates), endDate);
if (!includesEndDate) {
chartDates.push(resetHours(end));
chartDates.push(resetHours(endDate));
}
if (firstIndex > 0) {
@ -984,11 +984,6 @@ export abstract class PortfolioCalculator {
totalTimeWeightedInvestmentValueWithCurrencyEffect
} = values;
console.log(
'Chart: totalTimeWeightedInvestmentValue',
totalTimeWeightedInvestmentValue.toFixed()
);
const netPerformanceInPercentage = totalTimeWeightedInvestmentValue.eq(0)
? 0
: totalNetPerformanceValue

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts

@ -144,7 +144,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('0'),
errors: [],
grossPerformance: new Big('-12.6'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts

@ -129,7 +129,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('0'),
errors: [],
grossPerformance: new Big('-12.6'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts

@ -114,7 +114,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('297.8'),
errors: [],
grossPerformance: new Big('24.6'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts

@ -142,7 +142,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('13298.425356'),
errors: [],
grossPerformance: new Big('27172.74'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts

@ -103,7 +103,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('0'),
errors: [],
grossPerformance: new Big('0'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts

@ -127,7 +127,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('103.10483'),
errors: [],
grossPerformance: new Big('27.33'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts

@ -103,7 +103,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('0'),
errors: [],
grossPerformance: new Big('0'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts

@ -91,7 +91,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big(0),
grossPerformance: new Big(0),
grossPerformancePercentage: new Big(0),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts

@ -129,7 +129,7 @@ describe('PortfolioCalculator', () => {
spy.mockRestore();
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('87.8'),
errors: [],
grossPerformance: new Big('21.93'),

2
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts

@ -159,7 +159,7 @@ describe('PortfolioCalculator', () => {
valueWithCurrencyEffect: 0
});
expect(portfolioSnapshot).toEqual({
expect(portfolioSnapshot).toMatchObject({
currentValueInBaseCurrency: new Big('0'),
errors: [],
grossPerformance: new Big('19.86'),

Loading…
Cancel
Save