Merge branch 'main' into feature/support-derived-currencies-in-currency-validation

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Added support for derived currencies in the currency validation
+- Added support for automatic deletion of unused asset profiles when deleting activities
 
 ### Fixed
 

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

@@ -66,7 +66,6 @@ export class OrderController {
 
     return this.orderService.deleteOrders({
       filters,
-      userCurrency: this.request.user.Settings.settings.baseCurrency,
       userId: this.request.user.id
     });
   }

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

@@ -184,7 +184,15 @@ export class OrderService {
       where
     });
 
-    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(order.type)) {
+    const [symbolProfile] =
+      await this.symbolProfileService.getSymbolProfilesByIds([
+        order.symbolProfileId
+      ]);
+
+    if (
+      ['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(order.type) ||
+      symbolProfile.activitiesCount === 0
+    ) {
       await this.symbolProfileService.deleteById(order.symbolProfileId);
     }
 
@@ -200,18 +208,16 @@ export class OrderService {
 
   public async deleteOrders({
     filters,
-    userCurrency,
     userId
   }: {
     filters?: Filter[];
-    userCurrency: string;
     userId: string;
   }): Promise<number> {
     const { activities } = await this.getOrders({
       filters,
       userId,
-      userCurrency,
       includeDrafts: true,
+      userCurrency: undefined,
       withExcludedAccounts: true
     });
 
@@ -225,6 +231,19 @@ export class OrderService {
       }
     });
 
+    const symbolProfiles =
+      await this.symbolProfileService.getSymbolProfilesByIds(
+        activities.map(({ symbolProfileId }) => {
+          return symbolProfileId;
+        })
+      );
+
+    for (const { activitiesCount, id } of symbolProfiles) {
+      if (activitiesCount === 0) {
+        await this.symbolProfileService.deleteById(id);
+      }
+    }
+
     this.eventEmitter.emit(
       PortfolioChangedEvent.getName(),
       new PortfolioChangedEvent({ userId })

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

@@ -1,3 +1,4 @@
+import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
@@ -19,6 +20,7 @@ import { UserService } from './user.service';
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '30 days' }
     }),
+    OrderModule,
     PrismaModule,
     PropertyModule,
     SubscriptionModule,

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

@@ -1,3 +1,4 @@
+import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { environment } from '@ghostfolio/api/environments/environment';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
@@ -40,6 +41,7 @@ export class UserService {
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly eventEmitter: EventEmitter2,
+    private readonly orderService: OrderService,
     private readonly prismaService: PrismaService,
     private readonly propertyService: PropertyService,
     private readonly subscriptionService: SubscriptionService,
@@ -398,8 +400,8 @@ export class UserService {
     } catch {}
 
     try {
-      await this.prismaService.order.deleteMany({
+      await this.orderService.deleteOrders({
-        where: { userId: where.id }
+        userId: where.id
       });
     } catch {}
 

libs/common/src/lib/personal-finance-tools.ts

@@ -18,6 +18,13 @@ export const personalFinanceTools: Product[] = [
     origin: `United States`,
     slogan: 'Investment Software Suite'
   },
+  {
+    founded: 2016,
+    key: 'alphatrackr',
+    languages: ['English'],
+    name: 'AlphaTrackr',
+    slogan: 'Investment Portfolio Tracking Tool'
+  },
   {
     founded: 2017,
     hasSelfHostingAbility: false,
@@ -26,6 +33,17 @@ export const personalFinanceTools: Product[] = [
     origin: `Switzerland`,
     slogan: 'Simplicity for Complex Wealth'
   },
+  {
+    founded: 2018,
+    hasFreePlan: true,
+    hasSelfHostingAbility: false,
+    key: 'anlage.app',
+    languages: ['English'],
+    name: 'Anlage.App',
+    origin: `Austria`,
+    pricingPerYear: '$120',
+    slogan: 'Analyze and track your portfolio.'
+  },
   {
     founded: 2022,
     hasFreePlan: true,
@@ -190,6 +208,16 @@ export const personalFinanceTools: Product[] = [
     origin: `Germany`,
     slogan: 'Volle Kontrolle über deine Investitionen'
   },
+  {
+    hasFreePlan: true,
+    hasSelfHostingAbility: false,
+    key: 'holistic-capital',
+    languages: ['Deutsch'],
+    name: 'Holistic',
+    origin: `Germany`,
+    slogan: 'Die All-in-One Lösung für dein Vermögen.',
+    useAnonymously: true
+  },
   {
     hasFreePlan: true,
     hasSelfHostingAbility: false,
@@ -264,6 +292,17 @@ export const personalFinanceTools: Product[] = [
     region: `United States`,
     slogan: 'Your financial future, in your control'
   },
+  {
+    hasFreePlan: false,
+    hasSelfHostingAbility: false,
+    key: 'merlincrypto',
+    languages: ['English'],
+    name: 'Merlin',
+    origin: `United States`,
+    pricingPerYear: '$204',
+    region: 'Canada, United States',
+    slogan: 'The smartest way to track your crypto'
+  },
   {
     founded: 2019,
     hasFreePlan: false,
@@ -331,6 +370,14 @@ export const personalFinanceTools: Product[] = [
     pricingPerYear: '$360',
     slogan: 'Tools for Better Investors'
   },
+  {
+    hasFreePlan: true,
+    key: 'portfoloo',
+    name: 'Portfoloo',
+    note: 'Portfoloo has discontinued',
+    slogan:
+      'Free Stock Portfolio Tracker with unlimited portfolio and stocks for DIY investors'
+  },
   {
     founded: 2021,
     hasFreePlan: true,
@@ -370,6 +417,13 @@ export const personalFinanceTools: Product[] = [
     pricingPerYear: '$239',
     slogan: 'Stock Market Analysis & Tools for Investors'
   },
+  {
+    founded: 2022,
+    key: 'segmio',
+    name: 'Segmio',
+    origin: `Romania`,
+    slogan: 'Wealth Management and Net Worth Tracking'
+  },
   {
     founded: 2007,
     hasFreePlan: true,
@@ -381,6 +435,13 @@ export const personalFinanceTools: Product[] = [
     region: `Global`,
     slogan: 'Stock Portfolio Tracker'
   },
+  {
+    hasFreePlan: true,
+    key: 'sharesmaster',
+    name: 'SharesMaster',
+    note: 'SharesMaster has discontinued',
+    slogan: 'Free Stock Portfolio Tracker'
+  },
   {
     hasFreePlan: true,
     hasSelfHostingAbility: false,