fix: currency api uses the right keys

apps/swap/.env.manual

@@ -4,7 +4,7 @@ REDIS_HOST='0.0.0.0'
 REDIS_PORT='6379'
 MOCK_BTC_KES_RATE='8708520.117232416'
 # CURRENCY_API_KEY='foo-bar-baz'
-DATABASE_URL=postgresql://bs:password@0.0.0.0:5432/swap
+DATABASE_URL=mongodb://bs:password@mongodb:27017
 INTASEND_PUBLIC_KEY=ISPubKey_test_925ab885-f06d-4ace-8507-4186413a59a4
 INTASEND_PRIVATE_KEY=ISSecretKey_test_3d887e44-33c4-4455-978e-d2ae7b10907d
 FEDIMINT_CLIENTD_BASE_URL=http://0.0.0.0:7070

apps/swap/src/fx/fx.service.ts

@@ -4,7 +4,11 @@ import { Inject, Injectable, Logger } from '@nestjs/common';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { ConfigService } from '@nestjs/config';
 import { HttpService } from '@nestjs/axios';
-import { Currency, CustomStore } from '@bitsacco/common';
+import {
+  Currency,
+  CustomStore,
+  mapToSupportedCurrency,
+} from '@bitsacco/common';
 
 interface CurrencyApiResponse {
   meta: {
@@ -69,7 +73,7 @@ export class FxService {
     const response = await firstValueFrom(
       this.httpService
         .get(
-          `https://api.currencyapi.com/v3/latest?apikey=${api_key}&base_currency=${baseCurrency}&currencies=${targetCurrency}`,
+          `https://api.currencyapi.com/v3/latest?apikey=${api_key}&base_currency=${mapToSupportedCurrency(baseCurrency)}&currencies=${mapToSupportedCurrency(targetCurrency)}`,
           {
             headers: {
               'Content-Type': 'application/json',

libs/common/src/utils/currency.spec.ts

@@ -1,5 +1,5 @@
 import { SupportedCurrencies, Currency } from '../types';
-import { mapToCurrency } from './currency';
+import { mapToCurrency, mapToSupportedCurrency } from './currency';
 
 describe('mapToCurrency', () => {
   it('should map KES to Currency.KES', () => {
@@ -19,3 +19,22 @@ describe('mapToCurrency', () => {
     }).toThrow('Unsupported currency: UNSUPPORTED');
   });
 });
+
+describe('mapToSupportedCurrency', () => {
+  it('should map Currency.KES to SupportedCurrencies.KES', () => {
+    const result = mapToSupportedCurrency(Currency.KES);
+    expect(result).toBe(SupportedCurrencies.KES);
+  });
+
+  it('should map Currency.BTC to SupportedCurrencies.BTC', () => {
+    const result = mapToSupportedCurrency(Currency.BTC);
+    expect(result).toBe(SupportedCurrencies.BTC);
+  });
+
+  it('should throw an error for unsupported currencies', () => {
+    expect(() => {
+      // @ts-ignore - Intentionally passing an invalid value
+      mapToSupportedCurrency('UNSUPPORTED');
+    }).toThrow('Unsupported currency: UNSUPPORTED');
+  });
+});

libs/common/src/utils/currency.ts

@@ -11,6 +11,19 @@ export function mapToCurrency(currency: SupportedCurrencyType): Currency {
   }
 }
 
+export function mapToSupportedCurrency(
+  currency: Currency,
+): SupportedCurrencyType {
+  switch (currency) {
+    case Currency.BTC:
+      return 'BTC' as SupportedCurrencyType;
+    case Currency.KES:
+      return 'KES' as SupportedCurrencyType;
+    default:
+      throw new Error(`Unsupported currency: ${currency}`);
+  }
+}
+
 export function fiatToBtc({
   amountFiat,
   btcToFiatRate,