enhance funding plan with extra params

yellowbean · Aug 28, 2024 · 206d9f1 · 206d9f1
1 parent d4fc409
commit 206d9f1
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/absbox/local/component.py b/absbox/local/component.py
@@ -2044,6 +2044,19 @@ def mkRateAssumption(x):
         case _ :
             raise RuntimeError(f"Failed to match RateAssumption:{x}")
 
+def mkFundingPlan(x:tuple):
+    # IssueBondEvent mPre bondName accountName Bond mFormula mFormula
+    match x:
+        case (d,p,bName,accName,bnd,mBal,mRate):
+            return [vDate(d), mkTag(("IssueBondEvent",[earlyReturnNone(mkPre,p),vStr(bName),vStr(accName)
+                                                       ,mkBnd(bnd["name"],bnd|{"startDate":vDate(d)})|{"tag":"Bond"}
+                                                       ,earlyReturnNone(mkDs,mBal)
+                                                       ,earlyReturnNone(mkDs,mRate)]))]
+        case (d,bName,accName,bnd):
+            return [vDate(d), mkTag(("IssueBondEvent",[None,vStr(bName),vStr(accName),mkBnd(bnd["name"],bnd|{"startDate":vDate(d)})|{"tag":"Bond"},None,None]))]
+        case _:
+            raise RuntimeError(f"Failed to match mkFundingPlan:{x}")
+
 
 def mkNonPerfAssumps(r, xs:list) -> dict:
     def translate(y) -> dict:
@@ -2072,10 +2085,7 @@ def translate(y) -> dict:
             case ("makeWhole", d,spd,tbl):
                 return {"makeWholeWhen": [d,spd,tbl]}
             case ("issueBond", *issuancePlan):
-                return {"issueBondSchedule": [ [vDate(d),[vStr(bGrpName)
-                                                         ,vStr(accName)
-                                                         ,mkBnd(bnd["name"],bnd|{"startDate":vDate(d)})|{"tag":"Bond"}]] 
-                                                for (d,bGrpName,accName,bnd) in issuancePlan]  }
+                return {"issueBondSchedule": [ mkFundingPlan(p) for p in issuancePlan]  }
     match xs:
         case None:
             return {}