remove currency flag (#50)

psuzn · Jan 4, 2024 · 6ba96b4 · 6ba96b4
1 parent 1e06ca9
commit 6ba96b4
Show file tree

Hide file tree

Showing 4 changed files with 711 additions and 14 deletions.
diff --git a/backend/src/main/kotlin/me/sujanpoudel/playdeals/domain/ForexRate.kt b/backend/src/main/kotlin/me/sujanpoudel/playdeals/domain/ForexRate.kt
@@ -12,6 +12,5 @@ data class ConversionRate(
   val currency: String,
   val symbol: String,
   val name: String,
-  val flag: String,
   val rate: Float
 )
diff --git a/backend/src/main/kotlin/me/sujanpoudel/playdeals/jobs/ForexFetcher.kt b/backend/src/main/kotlin/me/sujanpoudel/playdeals/jobs/ForexFetcher.kt
@@ -1,5 +1,7 @@
 package me.sujanpoudel.playdeals.jobs
 
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import io.vertx.core.json.Json
 import io.vertx.ext.web.client.WebClient
 import io.vertx.ext.web.client.WebClientOptions
@@ -19,10 +21,21 @@ import org.kodein.di.instance
 import java.time.Duration
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
-import java.util.Currency
 import java.util.Locale
 import java.util.UUID
 
+data class Currency(
+  val name: String,
+  val symbol: String
+)
+
+fun loadCurrencies(): HashMap<String, me.sujanpoudel.playdeals.jobs.Currency> {
+  return Gson().fromJson(
+    Thread.currentThread().contextClassLoader.getResource("currencies.json")?.readText() ?: "{}",
+    object : TypeToken<HashMap<String, me.sujanpoudel.playdeals.jobs.Currency>>() {}
+  )
+}
+
 class ForexFetcher(
   override val di: DI,
   private val conf: Conf
@@ -48,6 +61,8 @@ class ForexFetcher(
   }
 
   private suspend fun getForexRates(): ForexRate {
+    val currencies = loadCurrencies()
+
     val response = webClient.get("/v1/latest?access_key=${conf.forexApiKey}&format=1&base=EUR")
       .send()
       .await()
@@ -59,21 +74,15 @@ class ForexFetcher(
     val epochSeconds = response.getLong("timestamp")
     val usdRate = response.getJsonObject("rates").getNumber("USD").toFloat()
 
-    val currencyLocale = Locale.getAvailableLocales().associateBy {
-      kotlin.runCatching { Currency.getInstance(it) }.getOrNull() ?: Locale.getDefault()
-    }
-
     return ForexRate(
       timestamp = OffsetDateTime.ofInstant(java.time.Instant.ofEpochSecond(epochSeconds), ZoneOffset.UTC),
       rates = response.getJsonObject("rates").map {
-        val currency = kotlin.runCatching { Currency.getInstance(it.key) }.getOrNull()
-        val locale = currencyLocale.getOrDefault(currency, Locale.US)
+        val currency = currencies[it.key]
 
         ConversionRate(
           currency = it.key,
-          symbol = currency?.getSymbol(locale) ?: "$",
-          name = currency?.displayName ?: it.key,
-          flag = locale.flagEmoji,
+          symbol = currency?.symbol ?: "$",
+          name = currency?.name ?: it.key,
           rate = (it.value as Number).toFloat() / usdRate
         )
       }