Make the Decoder for Currency case insensitive

scala-steward · Apr 26, 2023 · 89f59f9 · 89f59f9
1 parent 7e076ad
commit 89f59f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/circe/src/main/scala/com/velocidi/apso/circe/ExtraJsonProtocol.scala b/circe/src/main/scala/com/velocidi/apso/circe/ExtraJsonProtocol.scala
@@ -77,7 +77,7 @@ trait ExtraMiscJsonProtocol {
     Decoder[Json].emapPrettyTry(json => Try(ConfigFactory.parseString(json.toString)))
 
   implicit def currencyDecoder(implicit moneyContext: MoneyContext): Decoder[Currency] =
-    Decoder[String].emapPrettyTry(Currency(_))
+    Decoder[String].emapPrettyTry(s => Currency(s.toUpperCase))
   implicit val currencyEncoder: Encoder[Currency] = Encoder[String].contramap(_.toString)
 
   /** Encodes a map as an array of key-value objects.

diff --git a/circe/src/test/scala/com/velocidi/apso/circe/ExtraJsonProtocolSpec.scala b/circe/src/test/scala/com/velocidi/apso/circe/ExtraJsonProtocolSpec.scala
@@ -106,12 +106,12 @@ class ExtraJsonProtocolSpec extends Specification {
 
     "provide an Encoder and Decoder for Currency" in {
       implicit val moneyContext: MoneyContext = MoneyContext(EUR, defaultCurrencySet, Nil)
-      val currency: Currency = USD
-      val currencyString = """"USD""""
+      val usd: Currency = USD
 
-      currency.asJson.noSpaces mustEqual currencyString
-      decode[Currency](currencyString) must beRight(currency)
-      decode[Currency]("EU") must beLeft
+      usd.asJson.noSpaces mustEqual "\"USD\""
+      decode[Currency]("\"USD\"") must beRight(usd)
+      decode[Currency]("\"usd\"") must beRight(usd)
+      decode[Currency]("\"EU\"") must beLeft
     }
 
     "provide an Encoder and Decoder for a Map as an array of json objects" in {