From f46c07487f395eccb3e2a12c57b47e34500cb3ad Mon Sep 17 00:00:00 2001 From: Aleksandr Shinkarev Date: Sun, 16 May 2021 20:22:47 +0500 Subject: [PATCH 1/2] chore --- src/main/scala/scala2021/ashinkarev/task09/Converter.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/scala/scala2021/ashinkarev/task09/Converter.scala b/src/main/scala/scala2021/ashinkarev/task09/Converter.scala index 6d098fe..0f23ca1 100644 --- a/src/main/scala/scala2021/ashinkarev/task09/Converter.scala +++ b/src/main/scala/scala2021/ashinkarev/task09/Converter.scala @@ -16,3 +16,4 @@ case class Converter(conversion: Conversion) { object Converter { implicit val converter = new Converter(Map()) } + From 39b40cf1eb88de208aada813b03ff0d5227b5cae Mon Sep 17 00:00:00 2001 From: Aleksandr Shinkarev Date: Sun, 16 May 2021 20:23:55 +0500 Subject: [PATCH 2/2] chore --- src/main/scala/scala2021/ashinkarev/task09/Currency.scala | 1 + src/main/scala/scala2021/ashinkarev/task09/Money.scala | 1 + src/main/scala/scala2021/ashinkarev/task09/package.scala | 1 + src/test/scala/scala2021/ashinkarev/task09/TestSuite.scala | 1 + 4 files changed, 4 insertions(+) diff --git a/src/main/scala/scala2021/ashinkarev/task09/Currency.scala b/src/main/scala/scala2021/ashinkarev/task09/Currency.scala index 7c5cdfb..c433fc2 100644 --- a/src/main/scala/scala2021/ashinkarev/task09/Currency.scala +++ b/src/main/scala/scala2021/ashinkarev/task09/Currency.scala @@ -14,3 +14,4 @@ object EUR extends Currency { object GBP extends Currency { override val toString = "GBP" } + diff --git a/src/main/scala/scala2021/ashinkarev/task09/Money.scala b/src/main/scala/scala2021/ashinkarev/task09/Money.scala index bb8cf29..62706fd 100644 --- a/src/main/scala/scala2021/ashinkarev/task09/Money.scala +++ b/src/main/scala/scala2021/ashinkarev/task09/Money.scala @@ -15,3 +15,4 @@ case class Money(amount: BigDecimal, currency: Currency)(implicit converter: Con (this.amount + convertedMoney.amount)(this.currency) } } + diff --git a/src/main/scala/scala2021/ashinkarev/task09/package.scala b/src/main/scala/scala2021/ashinkarev/task09/package.scala index 9e0e5bf..42148e0 100644 --- a/src/main/scala/scala2021/ashinkarev/task09/package.scala +++ b/src/main/scala/scala2021/ashinkarev/task09/package.scala @@ -14,3 +14,4 @@ package object task09 { def apply(currency: Currency)(implicit converter: Converter): Money = BigDecimal(value).apply(currency) } } + diff --git a/src/test/scala/scala2021/ashinkarev/task09/TestSuite.scala b/src/test/scala/scala2021/ashinkarev/task09/TestSuite.scala index 5958b0e..4f4fcb6 100644 --- a/src/test/scala/scala2021/ashinkarev/task09/TestSuite.scala +++ b/src/test/scala/scala2021/ashinkarev/task09/TestSuite.scala @@ -24,3 +24,4 @@ class TestSuite extends AnyFunSuite with TableDrivenPropertyChecks with ScalaChe (sum to GBP).amount should be (51.3765); } } +