feature(template) Add formatting support for numbers and monetary amo…

…unts in templates Signed-off-by: Jerome Simeon <jeromesimeon@me.com>
accordproject · Mar 18, 2020 · a39edc2 · a39edc2
1 parent 8190e2b
commit a39edc2
Show file tree

Hide file tree

Showing 9 changed files with 6,760 additions and 6,757 deletions.
diff --git a/examples/interestsformat/data.json b/examples/interestsformat/data.json
@@ -1,6 +1,8 @@
 {
   "$class": "org.accordproject.interests.TemplateModel",
-  "loanAmount": 100000,
+  "loanAmount": { "$class": "org.accordproject.money.MonetaryAmount",
+                  "doubleValue" : 100000,
+                  "currencyCode" : "GBP" },
   "rate": 2.5,
   "loanDuration": 3
 }
diff --git a/examples/interestsformat/logic/interests.ergo b/examples/interestsformat/logic/interests.ergo
@@ -27,22 +27,24 @@ define function roundn(x:Double, n:Integer) {
 }
 
 // Formula taken from https://en.wikipedia.org/wiki/Mortgage_calculator#Monthly_payment_formula
-define function monthlyPaymentFormula(loanAmount: Double, rate: Double, loanDuration: Integer) : MonetaryAmount {
+define function monthlyPaymentFormula(loanAmount: MonetaryAmount, rate: Double, loanDuration: Integer) : MonetaryAmount {
+	let currency = loanAmount.currencyCode;
+	let amount = loanAmount.doubleValue;
   let term = longToDouble(loanDuration * 12);
-  if (rate = 0.0) then return MonetaryAmount{ doubleValue: (loanAmount / term), currencyCode: USD }
+  if (rate = 0.0) then return MonetaryAmount{ doubleValue: (amount / term), currencyCode: currency }
   else
     let monthlyRate = (rate / 12.0) / 100.0;
     let monthlyPayment =
-      (monthlyRate * loanAmount)
+      (monthlyRate * amount)
       / (1.0 - ((1.0 + monthlyRate) ^ (-term)));
-    return MonetaryAmount{ doubleValue: roundn(monthlyPayment, 0), currencyCode: USD }
+    return MonetaryAmount{ doubleValue: roundn(monthlyPayment, 0), currencyCode: currency }
 }
 
-define function cummulativeInterests(loanAmount: Double, rate: Double, loanDuration: Integer) : MonetaryAmount {
+define function cummulativeInterests(loanAmount: MonetaryAmount, rate: Double, loanDuration: Integer) : MonetaryAmount {
   let term = longToDouble(loanDuration * 12);
   let monthly = monthlyPaymentFormula(loanAmount, rate, loanDuration);
   return MonetaryAmount{
-    doubleValue: term * (monthly.doubleValue - loanAmount),
+    doubleValue: term * (monthly.doubleValue - loanAmount.doubleValue),
     currencyCode: monthly.currencyCode
   }
 }

diff --git a/examples/interestsformat/model/model.cto b/examples/interestsformat/model/model.cto
@@ -15,6 +15,7 @@
 namespace org.accordproject.interests
 
 import org.accordproject.time.* from https://models.accordproject.org/v2.0/time.cto
+import org.accordproject.money.* from https://models.accordproject.org/money@0.2.0.cto
 
 transaction Request {
   o String input
@@ -25,7 +26,7 @@ transaction Response {
 }
 
 concept TemplateModel {
-  o Double loanAmount
+  o MonetaryAmount loanAmount
   o Double rate
   o Integer loanDuration
 }

diff --git a/examples/interestsformat/text/grammar.tem.md b/examples/interestsformat/text/grammar.tem.md
@@ -1,4 +1,4 @@
-This is a fixed interest loan to the amount of {{loanAmount}}
+This is a fixed interest loan to the amount of {{loanAmount as "K0,0.0 (CCC)"}}
 at the yearly interest rate of {{rate}}%
 with a loan term of {{loanDuration}},
-and monthly payments of {{% monetaryAmountFormat(monthlyPaymentFormula(contract.loanAmount,contract.rate,contract.loanDuration), "0,0.0 CCC") %}}
+and monthly payments of {{% monthlyPaymentFormula(contract.loanAmount,contract.rate,contract.loanDuration) as "K0,0.0 (CCC)" %}}
diff --git a/extraction/src/ErgoParser.mly b/extraction/src/ErgoParser.mly
@@ -51,13 +51,11 @@ let make_template_computed prov e =
     [e]
 
 let make_template_variable_as prov v s =
-  ErgoCompiler.ecallfun prov
-    (relative_name_of_qname (Some "org.accordproject.time","format"))
-    [ErgoCompiler.eunaryoperator prov
+  ErgoCompiler.eas prov
+    (Util.char_list_of_string s)
+    (ErgoCompiler.eunaryoperator prov
        (EOpDot (Util.char_list_of_string v))
-       (make_template_input prov);
-     ErgoCompiler.econst prov
-       (ErgoCompiler.ErgoData.dstring (Util.char_list_of_string s))]
+       (make_template_input prov))
 
 (* Construct AST for variables *)
 let wrap_template_variable prov name ve =

diff --git a/packages/ergo-cli/extracted/ergoccore.js b/packages/ergo-cli/extracted/ergoccore.js
diff --git a/packages/ergo-cli/extracted/ergotopcore.js b/packages/ergo-cli/extracted/ergotopcore.js
diff --git a/packages/ergo-compiler/extracted/compilercore.js b/packages/ergo-compiler/extracted/compilercore.js
diff --git a/packages/ergo-engine/test/workload.json b/packages/ergo-engine/test/workload.json
@@ -367,7 +367,7 @@
     "clauseName": "generateText",
     "currentTime": "2019-01-01T16:34:00-05:00",
     "expected": {
-      "response": "This is a fixed interest loan to the amount of 100000.0\nat the yearly interest rate of 2.5%\nwith a loan term of 3,\nand monthly payments of {{\"2,886.0 USD\"}}\n"
+      "response": "This is a fixed interest loan to the amount of £100,000.0 (GBP)\nat the yearly interest rate of 2.5%\nwith a loan term of 3,\nand monthly payments of {{\"£2,886.0 (GBP)\"}}\n"
     }
   },
   {