Add current month (#1067)

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

@@ -65,6 +65,7 @@ import {
   max,
   parse,
   parseISO,
+  set,
   setDayOfYear,
   startOfDay,
   subDays,
@@ -215,22 +216,40 @@ export class PortfolioService {
           investment: item.investment.toNumber()
         };
       });
-    } else {
+
-      investments = portfolioCalculator.getInvestments().map((item) => {
+      // Add investment of current month
-        return {
+      const dateOfCurrentMonth = format(
-          date: item.date,
+        set(new Date(), { date: 1 }),
-          investment: item.investment.toNumber()
+        DATE_FORMAT
-        };
+      );
+      const investmentOfCurrentMonth = investments.filter(({ date }) => {
+        return date === dateOfCurrentMonth;
       });
 
+      if (investmentOfCurrentMonth.length <= 0) {
+        investments.push({
+          date: dateOfCurrentMonth,
+          investment: 0
+        });
+      }
+    } else {
+      investments = portfolioCalculator
+        .getInvestments()
+        .map(({ date, investment }) => {
+          return {
+            date,
+            investment: investment.toNumber()
+          };
+        });
+
       // Add investment of today
-      const investmentOfToday = investments.filter((investment) => {
+      const investmentOfToday = investments.filter(({ date }) => {
-        return investment.date === format(new Date(), DATE_FORMAT);
+        return date === format(new Date(), DATE_FORMAT);
       });
 
       if (investmentOfToday.length <= 0) {
-        const pastInvestments = investments.filter((investment) => {
+        const pastInvestments = investments.filter(({ date }) => {
-          return isBefore(parseDate(investment.date), new Date());
+          return isBefore(parseDate(date), new Date());
         });
         const lastInvestment = pastInvestments[pastInvestments.length - 1];
 

apps/client/src/app/components/investment-chart/investment-chart.component.ts

@@ -186,8 +186,10 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                 grid: {
                   borderColor: `rgba(${getTextColor()}, 0.1)`,
                   color: `rgba(${getTextColor()}, 0.8)`,
-                  display: false
+                  display: false,
+                  drawBorder: false
                 },
+                position: 'right',
                 ticks: {
                   callback: (value: number) => {
                     return transformTickToAbbreviation(value);