Merge branch 'main' of github.com:ghostfolio/ghostfolio

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the export functionality by the tags
+- Extended the user endpoint `GET api/v1/user` by the activities count
+
 ### Changed
 
 - Upgraded `prettier` from version `3.4.2` to `3.5.1`

apps/api/src/app/export/export.module.ts

@@ -1,6 +1,7 @@
 import { AccountModule } from '@ghostfolio/api/app/account/account.module';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
+import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
 
 import { Module } from '@nestjs/common';
 
@@ -8,7 +9,7 @@ import { ExportController } from './export.controller';
 import { ExportService } from './export.service';
 
 @Module({
-  imports: [AccountModule, ApiModule, OrderModule],
+  imports: [AccountModule, ApiModule, OrderModule, TagModule],
   controllers: [ExportController],
   providers: [ExportService]
 })

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

@@ -1,6 +1,7 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
+import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import { Filter, Export } from '@ghostfolio/common/interfaces';
 
 import { Injectable } from '@nestjs/common';
@@ -9,7 +10,8 @@ import { Injectable } from '@nestjs/common';
 export class ExportService {
   public constructor(
     private readonly accountService: AccountService,
-    private readonly orderService: OrderService
+    private readonly orderService: OrderService,
+    private readonly tagService: TagService
   ) {}
 
   public async export({
@@ -60,9 +62,21 @@ export class ExportService {
       });
     }
 
+    const tags = (await this.tagService.getTagsForUser(userId))
+      .filter(({ isUsed }) => {
+        return isUsed;
+      })
+      .map(({ id, name }) => {
+        return {
+          id,
+          name
+        };
+      });
+
     return {
       meta: { date: new Date().toISOString(), version: environment.version },
       accounts,
+      tags,
       activities: activities.map(
         ({
           accountId,
@@ -72,6 +86,7 @@ export class ExportService {
           id,
           quantity,
           SymbolProfile,
+          tags: currentTags,
           type,
           unitPrice
         }) => {
@@ -86,13 +101,12 @@ export class ExportService {
             currency: SymbolProfile.currency,
             dataSource: SymbolProfile.dataSource,
             date: date.toISOString(),
-            symbol:
+            symbol: ['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(type)
-              type === 'FEE' ||
-              type === 'INTEREST' ||
-              type === 'ITEM' ||
-              type === 'LIABILITY'
               ? SymbolProfile.name
-                : SymbolProfile.symbol
+              : SymbolProfile.symbol,
+            tags: currentTags.map(({ id: tagId }) => {
+              return tagId;
+            })
           };
         }
       ),

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

@@ -86,6 +86,9 @@ export class UserService {
         orderBy: { alias: 'asc' },
         where: { GranteeUser: { id } }
       }),
+      this.prismaService.order.count({
+        where: { userId: id }
+      }),
       this.prismaService.order.findFirst({
         orderBy: {
           date: 'asc'
@@ -96,8 +99,9 @@ export class UserService {
     ]);
 
     const access = userData[0];
-    const firstActivity = userData[1];
+    const activitiesCount = userData[1];
-    let tags = userData[2];
+    const firstActivity = userData[2];
+    let tags = userData[3];
 
     let systemMessage: SystemMessage;
 
@@ -117,6 +121,7 @@ export class UserService {
     }
 
     return {
+      activitiesCount,
       id,
       permissions,
       subscription,

libs/common/src/lib/interfaces/export.interface.ts

@@ -1,10 +1,6 @@
-import { Account, Order } from '@prisma/client';
+import { Account, Order, Tag } from '@prisma/client';
 
 export interface Export {
-  meta: {
-    date: string;
-    version: string;
-  };
   accounts: Omit<Account, 'createdAt' | 'updatedAt' | 'userId'>[];
   activities: (Omit<
     Order,
@@ -16,5 +12,10 @@ export interface Export {
     | 'updatedAt'
     | 'userId'
   > & { date: string; symbol: string })[];
+  meta: {
+    date: string;
+    version: string;
+  };
+  tags: Omit<Tag, 'userId'>[];
   user: { settings: { currency: string } };
 }

libs/common/src/lib/interfaces/user.interface.ts

@@ -10,6 +10,7 @@ import { UserSettings } from './user-settings.interface';
 export interface User {
   access: Pick<Access, 'alias' | 'id' | 'permissions'>[];
   accounts: Account[];
+  activitiesCount: number;
   dateOfFirstActivity: Date;
   id: string;
   permissions: string[];