fix(converter): fix diff calculating

checkmoney · Mar 3, 2019 · 9a68a41 · 9a68a41
1 parent 7c5fd2c
commit 9a68a41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/back/src/money/application/CurrencyConverter.ts b/back/src/money/application/CurrencyConverter.ts
@@ -43,7 +43,7 @@ export class CurrencyConverter {
 
     const rate = await this.getExchangeRate(from, to, normalizedDate)
       .catch(tryTo(this.exchangeRateRepo.findClosest(from, to, normalizedDate)))
-      .catch(() => this.fetchExchangeRate(from, to, new Date()))
+      .catch(() => this.getExchangeRate(from, to, new Date()))
       .catch(tryTo(this.exchangeRateRepo.findLast(from, to)))
 
     return Math.round(amount * rate)
@@ -79,7 +79,8 @@ export class CurrencyConverter {
     const MIN_DAY_FOR_HISTORY_TRANSACTION = 2
 
     const rateIsOld =
-      differenceInDays(when, new Date()) > MIN_DAY_FOR_HISTORY_TRANSACTION
+      Math.abs(differenceInDays(when, new Date())) >
+      MIN_DAY_FOR_HISTORY_TRANSACTION
 
     if (rateIsOld) {
       return this.exchangeRateApi.getHistoryExchangeRate(from, to, when)

diff --git a/back/src/money/domain/ExchangeRateRepository.ts b/back/src/money/domain/ExchangeRateRepository.ts
@@ -68,6 +68,7 @@ class ExchangeRateRepo {
     const rateToDiff = (rate: Option<ExchangeRate>) =>
       rate
         .map(r => differenceInMilliseconds(r.collectAt, forWhen))
+        .map(Math.abs)
         .getOrElse(Infinity)
 
     const beforeDiff = rateToDiff(before)