Skip to content

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

Bugfix/fix currency inconsistency with GBX and GBp in eod historical data service (#1869)

Thomas Kaul737890005021
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbbf6e6088..e02ae48744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Introduced the allocations by ETF provider chart on the allocations page
+### Fixed
+
+- Fixed an issue with the currency inconsistency in the _EOD Historical Data_ service (convert from `GBX` to `GBp`)
+
## 1.256.0 - 2023-04-17
### Added
diff --git a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
index b0ef5735b5..4f1113d3f8 100644
--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
@@ -40,7 +40,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
return {
assetClass: searchResult?.assetClass,
assetSubClass: searchResult?.assetSubClass,
- currency: searchResult?.currency,
+ currency: this.convertCurrency(searchResult?.currency),
dataSource: this.getName(),
isin: searchResult?.isin,
name: searchResult?.name,
@@ -147,7 +147,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
{ close, code, timestamp }
) => {
result[code] = {
- currency: searchResponse?.items[0]?.currency,
+ currency: this.convertCurrency(searchResponse?.items[0]?.currency),
dataSource: DataSource.EOD_HISTORICAL_DATA,
marketPrice: close,
marketState: isToday(new Date(timestamp * 1000)) ? 'open' : 'closed'
@@ -184,16 +184,26 @@ export class EodHistoricalDataService implements DataProviderInterface {
return {
assetClass,
assetSubClass,
- currency,
dataSource,
name,
- symbol
+ symbol,
+ currency: this.convertCurrency(currency)
};
}
)
};
}
+ private convertCurrency(aCurrency: string) {
+ let currency = aCurrency;
+
+ if (currency === 'GBX') {
+ currency = 'GBp';
+ }
+
+ return currency;
+ }
+
private async getSearchResult(aQuery: string): Promise<
(LookupItem & {
assetClass: AssetClass;
@@ -213,14 +223,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
const response = await get();
searchResult = response.map(
- ({
- Code,
- Currency: currency,
- Exchange,
- ISIN: isin,
- Name: name,
- Type
- }) => {
+ ({ Code, Currency, Exchange, ISIN: isin, Name: name, Type }) => {
const { assetClass, assetSubClass } = this.parseAssetClass({
Exchange,
Type
@@ -229,9 +232,9 @@ export class EodHistoricalDataService implements DataProviderInterface {
return {
assetClass,
assetSubClass,
- currency,
isin,
name,
+ currency: this.convertCurrency(Currency),
dataSource: this.getName(),
symbol: `${Code}.${Exchange}`
};