fix number formatting (#154)

Author: adridadou

shared/src/main/scala/org/adridadou/openlaw/parser/template/variableTypes/NumberType.scala

@@ -20,7 +20,7 @@ case object NumberType extends VariableType("Number") {
       if(constructorType =!= this) {
         Failure(s"the constructor type should be $name but is ${constructorType.name}")
       } else {
-        attempt(expr.evaluateT[OpenlawBigDecimal](executionResult).map(OpenlawBigDecimal(_)))
+        attempt(expr.evaluateT[OpenlawBigDecimal](executionResult).map(OpenlawBigDecimal))
       }
     case _ =>
       Failure(s"the constructor for $name only handles single values")
@@ -79,22 +79,25 @@ case object NumberType extends VariableType("Number") {
 
 trait NumberFormatter {
   def formatNumber(bd:BigDecimal):String = {
-    bd.bigDecimal.toPlainString.replaceAll("(\\d)(?=(\\d{3})+$)", "$1,")
+    val regex = "(\\d)(?=(\\d{3})+$)"
+    val fullNumber = bd.bigDecimal.toPlainString
+    val split = fullNumber.split("\\.")
+    val intNumber = split(0)
+    val decimalNumber = split.lift(1)
+    val formattedIntNumber = intNumber.replaceAll(regex, "$1,")
+
+    decimalNumber.map(d => formattedIntNumber + "." + d).getOrElse(formattedIntNumber)
   }
 }
 
 case object NoTrailingZerosFormatter extends Formatter with NumberFormatter {
   override def format(value: OpenlawValue, executionResult: TemplateExecutionResult): Result[Seq[AgreementElement]] =
-    attempt(VariableType.convert[OpenlawBigDecimal](value).bigDecimal.stripTrailingZeros()) map {
-      case bd => Seq(FreeText(Text(formatNumber(bd))))
-    }
+    attempt(VariableType.convert[OpenlawBigDecimal](value).bigDecimal.stripTrailingZeros()) map (bd => Seq(FreeText(Text(formatNumber(bd)))))
 }
 
 case object RawNumberFormatter extends Formatter with NumberFormatter {
   override def format(value: OpenlawValue, executionResult: TemplateExecutionResult): Result[Seq[AgreementElement]] =
-    attempt(VariableType.convert[OpenlawBigDecimal](value).bigDecimal.stripTrailingZeros().toPlainString) map {
-      case str => Seq(FreeText(Text(str)))
-    }
+    attempt(VariableType.convert[OpenlawBigDecimal](value).bigDecimal.stripTrailingZeros().toPlainString) map (str => Seq(FreeText(Text(str))))
 }
 
 case class Rounding(expr:Expression) extends Formatter with NumberFormatter {

shared/src/test/scala/org/adridadou/openlaw/vm/OpenlawExecutionEngineSpec.scala

@@ -1372,4 +1372,27 @@ class OpenlawExecutionEngineSpec extends FlatSpec with Matchers with OptionValue
 
     missingInputs shouldBe Seq(VariableName("Email"))
   }
+
+  it should "format small numbers properly" in {
+    val text =
+      """
+        [[my number:Number]]
+      """.stripMargin
+
+    val template = compile(text)
+
+    engine.execute(template, TemplateParameters("my number" -> "0.000000042")) match {
+      case Success(executionResult) =>
+        println(parser.forReview(executionResult.agreements.head))
+        parser.forReview(executionResult.agreements.head) shouldBe "<p class=\"no-section\"><br />        0.000000042<br />      </p>"
+      case Failure(ex, message) => fail(message ,ex)
+    }
+
+    engine.execute(template, TemplateParameters("my number" -> "4200000000")) match {
+      case Success(executionResult) =>
+        println(parser.forReview(executionResult.agreements.head))
+        parser.forReview(executionResult.agreements.head) shouldBe "<p class=\"no-section\"><br />        4,200,000,000<br />      </p>"
+      case Failure(ex, message) => fail(message ,ex)
+    }
+  }
 }