fix min

Signed-off-by: George Lemon <[email protected]>
openpeeps · Aug 23, 2023 · 0c863b1 · 0c863b1
1 parent a1ca226
commit 0c863b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/money.nim b/src/money.nim
@@ -352,7 +352,7 @@ proc `.`*[A: int64, C: Alpha3](unit: A, currency: C): Money =
   result = amount(unit, currency)
 
 proc `.`*[A: float64, C: Alpha3](fAmount: A, currency: C): Money =
-  var a = split($fAmount, ".")
+  var a = split($fAmount, ".") # todo avoid string conversion
   var subunits =
     if a[1].len == 1:
       parseInt(a[1] & "0")
@@ -486,7 +486,7 @@ proc min*[M: Money](x: varargs[M]): M =
   ## Returns the smallest of the given `Money` objects
   result = x[0]
   for i in 1..high(x):
-    if x[i].units <= result.units and x[i].subunits > result.subunits:
+    if x[i].units <= result.units and x[i].subunits <= result.subunits:
       result = x[i]
 
 proc avg*[M: Money](x: varargs[M]): M =

diff --git a/tests/test1.nim b/tests/test1.nim
@@ -49,7 +49,7 @@ test "currencies":
   assert amount(199, CZK) != amount(100, EUR)
 
 test "amount min":
-  assert min(50.EUR, 55.EUR, 120.EUR, 5.EUR, 5.02.EUR) == 5.02.EUR
+  assert min(50.EUR, 55.EUR, 120.EUR, 5.EUR, 5.02.EUR) == 5.EUR
 
 test "amount max":
   assert max(50.EUR, 55.EUR, 120.EUR, 5.EUR, 120.50.EUR) == 120.50.EUR