Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Bugfix/improve asset profile validation in activities import (#3057)

Thomas Kaulf2d431a6b89e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8cb065c27..73683ccbf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+
+### Fixed
+
+- Improved the asset profile validation in the activities import
+
## 2.57.0 - 2024-02-25
### Changed
diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts
index e33bab3477..a4895cf731 100644
--- a/apps/api/src/app/import/import.service.ts
+++ b/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,37 +595,33 @@ export class ImportService {
}
}
- const assetProfile = {
- currency,
- ...(
- await this.dataProviderService.getAssetProfiles([
- { dataSource, symbol }
- ])
- )?.[symbol]
- };
+ if (!assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })]) {
+ const assetProfile = {
+ currency,
+ ...(
+ await this.dataProviderService.getAssetProfiles([
+ { dataSource, symbol }
+ ])
+ )?.[symbol]
+ };
- if (type === 'BUY' || type === 'DIVIDEND' || type === 'SELL') {
- if (!assetProfile?.name) {
- throw new Error(
- `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
- );
- }
+ if (type === 'BUY' || type === 'DIVIDEND' || type === 'SELL') {
+ if (!assetProfile?.name) {
+ throw new Error(
+ `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
+ );
+ }
- if (
- 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}"`
- );
+ if (assetProfile.currency !== currency) {
+ throw new Error(
+ `activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
+ );
+ }
}
- }
- assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
- assetProfile;
+ assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
+ assetProfile;
+ }
}
return assetProfiles;