Slice by accident year current and previous (#300)

* slice by accident year current and previous * rename * update bm
Systemorph · May 8, 2023 · 610b0aa · 610b0aa
1 parent fd38a2d
commit 610b0aa
Show file tree

Hide file tree

Showing 7 changed files with 3,273 additions and 3,245 deletions.
diff --git a/ifrs17-template/Report/Reports.ipynb b/ifrs17-template/Report/Reports.ipynb
@@ -99,7 +99,7 @@
                 "\npv.ReportingNode = \"CH\";",
                 "\npv.ReportingPeriod = (2021, 3);",
                 "\npv.CurrencyType = CurrencyType.Contractual;",
-                "\npv.ColumnSlices = new string[]{};//\"GroupOfContract\", \"AmountType\", \"Scenario\"",
+                "\npv.ColumnSlices = new string[]{};//\"GroupOfContract\", \"AmountType\", \"Scenario\", \"ServicePeriod\"", 
                 "\npv.Scenario = null; //\"All\";",
                 "\npv.DataFilter = null; //new [] {(\"GroupOfContract\", \"DT1.2\"),(\"LiabilityType\", \"LIC\") };",
                 "\n(await pv.ToReportAsync)"

diff --git a/...ta/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv b/...ta/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH_MTUP10pct_Contractual.csv
diff --git a/...e/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv b/...e/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2020_12_CH__Contractual.csv
diff --git a/...te/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv b/...te/Test/Data/ReportVariableBenchmarks/ReportVariableBenchmarks_2021_3_CH__Contractual.csv
diff --git a/ifrs17/Constants/Enums.ipynb b/ifrs17/Constants/Enums.ipynb
@@ -300,6 +300,24 @@
             "metadata": {},
             "execution_count": 0,
             "outputs": []
+        },
+        {
+            "cell_type": "markdown",
+            "source": [
+                "# Report Variable"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
+        },
+        {
+            "cell_type": "code",
+            "source": [
+                "public enum ServicePeriod{ NotApplicable, PastService, CurrentService, FutureService }"
+            ],
+            "metadata": {},
+            "execution_count": 0,
+            "outputs": []
         }
     ]
 }
diff --git a/ifrs17/DataModel/DataStructure.ipynb b/ifrs17/DataModel/DataStructure.ipynb
@@ -1963,12 +1963,17 @@
                 "\n    [Dimension(typeof(int), nameof(AccidentYear))]",
                 "\n    [IdentityProperty]",
                 "\n    public int AccidentYear { get; init; }",
-                "\n    ",
+                "\n",
+                "\n    [NotVisible]",
+                "\n    [Dimension(typeof(ServicePeriod))]",
+                "\n    [IdentityProperty]",
+                "\n    public ServicePeriod ServicePeriod { get; init; }",
+                "\n",
                 "\n    [NotVisible]",
                 "\n    [NoArithmetics(ArithmeticOperation.Scale)]",
                 "\n    [Dimension(typeof(ProjectionConfiguration), nameof(Projection))]",
                 "\n    [IdentityProperty]",
-                "\n    //[AggregateBy]",
+                "\n    [AggregateBy]",
                 "\n    public string Projection { get; init;}",
                 "\n    ",
                 "\n    [NotVisible]",
@@ -2016,6 +2021,7 @@
                 "\n        Partner = rv.Partner;",
                 "\n        IsReinsurance = rv.IsReinsurance;",
                 "\n        AccidentYear = rv.AccidentYear;",
+                "\n        ServicePeriod = rv.ServicePeriod;",
                 "\n        Projection = rv.Projection;",
                 "\n        VariableType = rv.VariableType;",
                 "\n        Novelty = rv.Novelty;",

diff --git a/ifrs17/Report/ReportConfigurationAndUtils.ipynb b/ifrs17/Report/ReportConfigurationAndUtils.ipynb
@@ -155,6 +155,10 @@
                 "\n                      ",
                 "\n                      //LIC",
                 "\n                      AccidentYear = iv.AccidentYear == null ? default : (int)iv.AccidentYear,",
+                "\n                      ServicePeriod = ",
+                "\n                      dn.LiabilityType == LiabilityTypes.LIC",
+                "\n                            ? iv.AccidentYear == args.Year ? ServicePeriod.CurrentService : ServicePeriod.PastService",
+                "\n                            : ServicePeriod.NotApplicable,",
                 "\n                      ",
                 "\n                      Projection = \"P0\",//Assign the correct value for each projection (check ProjectionConfiguration values)",
                 "\n                      Value = iv.Values.ElementAtOrDefault(0) })",