Yield curve Name into Queries

ifrs17-template/Test/ImportStorageTest.ipynb

@@ -427,15 +427,15 @@
             "cell_type": "code",
             "source": [
                 "var sampleGic = new GroupOfInsuranceContract(){Portfolio = \"P1\"};",
-                "\nvar inputDataGic = new GroupOfInsuranceContract[]{ sampleGic with {SystemName = \"Gross1\", LiabilityType = LiabilityTypes.LRC},",
-                "\n                                                   sampleGic with {SystemName = \"Gross2\", LiabilityType = LiabilityTypes.LRC},",
-                "\n                                                   sampleGic with {SystemName = \"Gross3\", LiabilityType = LiabilityTypes.LRC},",
+                "\nvar inputDataGic = new GroupOfInsuranceContract[]{ sampleGic with {SystemName = \"Gross1\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
+                "\n                                                   sampleGic with {SystemName = \"Gross2\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
+                "\n                                                   sampleGic with {SystemName = \"Gross3\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
                 "\n                                                 };",
                 "\n",
                 "\nvar sampleGric = new GroupOfReinsuranceContract(){Portfolio = \"ReP1\"};",
-                "\nvar inputDataGric = new GroupOfReinsuranceContract[]{ sampleGric with {SystemName = \"Reins1\", LiabilityType = LiabilityTypes.LRC},",
-                "\n                                                      sampleGric with {SystemName = \"Reins2\", LiabilityType = LiabilityTypes.LRC},",
-                "\n                                                      sampleGric with {SystemName = \"Reins3\", LiabilityType = LiabilityTypes.LRC},",
+                "\nvar inputDataGric = new GroupOfReinsuranceContract[]{ sampleGric with {SystemName = \"Reins1\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
+                "\n                                                      sampleGric with {SystemName = \"Reins2\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
+                "\n                                                      sampleGric with {SystemName = \"Reins3\", LiabilityType = LiabilityTypes.LRC, ContractualCurrency = \"CHF\", ValuationApproach = \"BBA\"},",
                 "\n                                                 };",
                 "\nvar sampleDnState = new DataNodeState {Partition = reportingNodePartition.Id, Year = args.Year, Month = args.Month, State = State.Active};",
                 "\nvar inputDataState = new DataNodeState[]{ sampleDnState with {DataNode = \"Gross1\"} ,",

ifrs17/DataModel/DataStructure.ipynb

@@ -1648,6 +1648,8 @@
                 "\n    public string LiabilityType { get; init; }",
                 "\n    public string Profitability { get; init; }",
                 "\n    public string Partner { get; init; }",
+                "\n    public string YieldCurveName { get; init; }",
+                "\n    ",
                 "\n    ",
                 "\n    //DataNodeState",
                 "\n    public int Year { get; init; }",

ifrs17/Import/ImportStorage.ipynb

@@ -301,21 +301,21 @@
                 "\n    ",
                 "\n    public IEnumerable<AocStep> GetAllAocSteps(InputSource source) => aocStepByInputSource[source];",
                 "\n    public IEnumerable<AocStep> GetCalculatedTelescopicAocSteps() => AocConfigurationByAocStep.Where(kvp => kvp.Value.DataType == DataType.CalculatedTelescopic).Select(kvp => kvp.Key);",
-                "\n        ",
+                "\n",
                 "\n    //YieldCurve",
                 "\n    public double[] GetYearlyYieldCurve(ImportIdentity id, string economicBasis) {",
                 "\n        var yc = GetYieldCurve(id, economicBasis);",
                 "\n        return yc.Values.Skip(args.Year - yc.Year).ToArray(); //Check if the returned array is empty? Log Warning?",
                 "\n    }",
                 "\n    ",
                 "\n    public YieldCurve GetYieldCurve(ImportIdentity id, string economicBasis) => (economicBasis, GetYieldCurvePeriod(id)) switch {",
-                "\n            (EconomicBases.C, PeriodType.BeginningOfPeriod) => CurrentYieldCurve[DataNodeDataBySystemName[id.DataNode].ContractualCurrency][PreviousPeriod],",
-                "\n            (EconomicBases.C, PeriodType.EndOfPeriod) => CurrentYieldCurve[DataNodeDataBySystemName[id.DataNode].ContractualCurrency][CurrentPeriod],",
+                "\n            (EconomicBases.C, PeriodType.BeginningOfPeriod) => CurrentYieldCurve[id.DataNode][PreviousPeriod],",
+                "\n            (EconomicBases.C, PeriodType.EndOfPeriod) => CurrentYieldCurve[id.DataNode][CurrentPeriod],",
                 "\n            (EconomicBases.L, _ ) => LockedInYieldCurve[id.DataNode],",
                 "\n            (_, PeriodType.NotApplicable) => (YieldCurve)ApplicationMessage.Log(Error.YieldCurvePeriodNotApplicable, id.AocType, id.Novelty),",
                 "\n            (_, _) => (YieldCurve)ApplicationMessage.Log(Error.EconomicBasisNotFound, id.DataNode)",
                 "\n       };",
-                "\n    ",
+                "\n",
                 "\n    //int Identity.ProjectionPeriod ",
                 "\n    public int GetProjectionCount() => ProjectionConfiguration.Count();",
                 "\n    public int GetShift(int projectionPeriod) => ProjectionConfiguration[projectionPeriod].Shift;",