Merge branch 'main' into fix/fix-import-by-isin-number

CHANGELOG.md

@@ -11,6 +11,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the activities import by `isin` in the _Yahoo Finance_ service
 
+## 2.58.0 - 2024-02-27
+
+### Changed
+
+- Improved the handling of activities without account
+
+### Fixed
+
+- Fixed the query to filter activities of excluded accounts
+- Improved the asset profile validation in the activities import
+
 ## 2.57.0 - 2024-02-25
 
 ### Changed

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

@@ -570,17 +570,10 @@ export class ImportService {
       [assetProfileIdentifier: string]: Partial<SymbolProfile>;
     } = {};
 
-    const uniqueActivitiesDto = uniqBy(
-      activitiesDto,
-      ({ dataSource, symbol }) => {
-        return getAssetProfileIdentifier({ dataSource, symbol });
-      }
-    );
-
     for (const [
       index,
       { currency, dataSource, symbol, type }
-    ] of uniqueActivitiesDto.entries()) {
+    ] of activitiesDto.entries()) {
       if (!this.configurationService.get('DATA_SOURCES').includes(dataSource)) {
         throw new Error(
           `activities.${index}.dataSource ("${dataSource}") is not valid`
@@ -602,6 +595,7 @@ export class ImportService {
         }
       }
 
+      if (!assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })]) {
         const assetProfile = {
           currency,
           ...(
@@ -618,15 +612,9 @@ export class ImportService {
             );
           }
 
-        if (
+          if (assetProfile.currency !== currency) {
-          assetProfile.currency !== currency &&
-          !this.exchangeRateDataService.hasCurrencyPair(
-            currency,
-            assetProfile.currency
-          )
-        ) {
             throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}" and no exchange rate is available from "${currency}" to "${assetProfile.currency}"`
+              `activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
             );
           }
         }
@@ -634,6 +622,7 @@ export class ImportService {
         assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
           assetProfile;
       }
+    }
 
     return assetProfiles;
   }

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

@@ -292,19 +292,14 @@ export class OrderService {
     }
 
     if (types) {
-      where.OR = types.map((type) => {
+      where.type = { in: types };
-        return {
-          type: {
-            equals: type
-          }
-        };
-      });
     }
 
     if (withExcludedAccounts === false) {
-      where.Account = {
+      where.OR = [
-        NOT: { isExcluded: true }
+        { Account: null },
-      };
+        { Account: { NOT: { isExcluded: true } } }
+      ];
     }
 
     const [orders, count] = await Promise.all([

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

@@ -749,7 +749,9 @@ export class PortfolioService {
       } = position;
 
       const accounts: PortfolioPositionDetail['accounts'] = uniqBy(
-        orders,
+        orders.filter(({ Account }) => {
+          return Account;
+        }),
         'Account.id'
       ).map(({ Account }) => {
         return Account;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.57.0",
+  "version": "2.58.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",