Fixes after Merge

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

@@ -35,6 +35,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
 import { GroupBy } from '@ghostfolio/common/types';
+import { DateRangeTypes } from '@ghostfolio/common/types/date-range.type';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
 import { Logger } from '@nestjs/common';
@@ -1452,7 +1453,7 @@ export abstract class PortfolioCalculator {
     chartDateMap[format(endDate, DATE_FORMAT)] = true;
 
     // Make sure some key dates are present
-    for (const dateRange of ['1d', '1y', '5y', 'max', 'mtd', 'wtd', 'ytd']) {
+    for (const dateRange of DateRangeTypes) {
       const { endDate: dateRangeEnd, startDate: dateRangeStart } =
         getIntervalFromDateRange(dateRange);
 

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

@@ -51,7 +51,7 @@ export class TagService {
     const tagsWithOrderCount = await this.prismaService.tag.findMany({
       include: {
         _count: {
-          select: { orders: true, symbolProfile: true }
+          select: { activities: true, symbolProfile: true }
         }
       }
     });
@@ -61,7 +61,7 @@ export class TagService {
         id,
         name,
         userId,
-        activityCount: _count.orders,
+        activityCount: _count.activities,
         holdingCount: _count.symbolProfile
       };
     });