Refactor Activities interface to ActivitiesResponse interface

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

@@ -3,11 +3,6 @@ import { AccountWithPlatform } from '@ghostfolio/common/types';
 
 import { Order, Tag } from '@prisma/client';
 
-export interface Activities {
-  activities: Activity[];
-  count: number;
-}
-
 export interface Activity extends Order {
   account?: AccountWithPlatform;
   error?: ActivityError;

apps/api/src/app/order/order.controller.ts

@@ -11,7 +11,10 @@ import {
   DATA_GATHERING_QUEUE_PRIORITY_HIGH,
   HEADER_KEY_IMPERSONATION
 } from '@ghostfolio/common/config';
-import { ActivityResponse } from '@ghostfolio/common/interfaces';
+import {
+  ActivitiesResponse,
+  ActivityResponse
+} from '@ghostfolio/common/interfaces';
 import { permissions } from '@ghostfolio/common/permissions';
 import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';
 
@@ -37,7 +40,6 @@ import { parseISO } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { CreateOrderDto } from './create-order.dto';
-import { Activities } from './interfaces/activities.interface';
 import { OrderService } from './order.service';
 import { UpdateOrderDto } from './update-order.dto';
 
@@ -114,7 +116,7 @@ export class OrderController {
     @Query('symbol') filterBySymbol?: string,
     @Query('tags') filterByTags?: string,
     @Query('take') take?: number
-  ): Promise<Activities> {
+  ): Promise<ActivitiesResponse> {
     let endDate: Date;
     let startDate: Date;
 

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

@@ -14,6 +14,7 @@ import {
 } from '@ghostfolio/common/config';
 import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import {
+  ActivitiesResponse,
   AssetProfileIdentifier,
   EnhancedSymbolProfile,
   Filter
@@ -37,8 +38,6 @@ import { endOfToday, isAfter } from 'date-fns';
 import { groupBy, uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Activities } from './interfaces/activities.interface';
-
 @Injectable()
 export class OrderService {
   public constructor(
@@ -345,7 +344,7 @@ export class OrderService {
     userCurrency: string;
     userId: string;
     withExcludedAccountsAndActivities?: boolean;
-  }): Promise<Activities> {
+  }): Promise<ActivitiesResponse> {
     let orderBy: Prisma.Enumerable<Prisma.OrderOrderByWithRelationInput> = [
       { date: 'asc' }
     ];

apps/client/src/app/services/data.service.ts

@@ -9,7 +9,6 @@ import { CreateTagDto } from '@ghostfolio/api/app/endpoints/tags/create-tag.dto'
 import { UpdateTagDto } from '@ghostfolio/api/app/endpoints/tags/update-tag.dto';
 import { CreateWatchlistItemDto } from '@ghostfolio/api/app/endpoints/watchlist/create-watchlist-item.dto';
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
-import { Activities } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto';
 import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.interface';
 import { DeleteOwnUserDto } from '@ghostfolio/api/app/user/delete-own-user.dto';
@@ -24,6 +23,7 @@ import {
   AccessTokenResponse,
   AccountBalancesResponse,
   AccountsResponse,
+  ActivitiesResponse,
   ActivityResponse,
   AiPromptResponse,
   ApiKeyResponse,
@@ -215,7 +215,7 @@ export class DataService {
     sortColumn?: string;
     sortDirection?: SortDirection;
     take?: number;
-  }): Observable<Activities> {
+  }): Observable<ActivitiesResponse> {
     let params = this.buildFiltersAsQueryParams({ filters });
 
     if (range) {