Skip to content

Import With Define Format Fix For With Target Option #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nnikolopoulos merged 9 commits into from
Feb 20, 2023
Merged

Import With Define Format Fix For With Target Option #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
520de20
Replace DataSource with options.TargetDataSource for A and CF and adj…
Feb 9, 2023
2a0fe59
Merge branch 'develop' into 184_ImportWithFormatTarget
Feb 10, 2023
4347cf5
Merge branch 'develop' into 184_ImportWithFormatTarget
Feb 10, 2023
3faff19
Merge branch 'develop' into 184_ImportWithFormatTarget
Feb 15, 2023
544ffe0
Fix .WithActivityLog()
Feb 15, 2023
dd206f3
Replace DataSource with options.TargetDataSource except in CommitPart…
Feb 15, 2023
d697f1a
Fix MapTemplateAndImportTest
Feb 15, 2023
31a6e6d
Use disposable Workspaces
Feb 15, 2023
13cc172
Merge branch 'develop' into 184_ImportWithFormatTarget
Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 41 additions & 12 deletions ifrs17-template/Test/MapTemplateAndImportTest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"\n .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
"\n .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync();",
"\n",
"\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
Expand All @@ -184,7 +184,7 @@
"\n .GroupofContractConfiguration<GroupOfReinsuranceContract>(typeof(ReinsurancePortfolio))",
"\n .GroupofContractConfiguration<GroupOfInsuranceContract>(typeof(InsurancePortfolio))",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync()"
],
"metadata": {},
Expand Down Expand Up @@ -266,7 +266,7 @@
"\n .StateEnumConfiguration() ",
"\n .DataNodeStateConfiguration(dataNodeStates)",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync();",
"\n",
"\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
Expand All @@ -283,7 +283,7 @@
"\n .StateEnumConfiguration() ",
"\n .DataNodeStateConfiguration(dataNodeStates)",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync()"
],
"metadata": {},
Expand Down Expand Up @@ -360,7 +360,7 @@
"\n .WithSource(Workspace)",
"\n .DataNodeParameterConfiguration(dataNodeParameters)",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync();",
"\n",
"\nexportResult.ActivityLog.Status.Should().Be(ActivityLogStatus.Succeeded);"
Expand All @@ -376,7 +376,7 @@
"\n .WithSource(Workspace)",
"\n .DataNodeParameterConfiguration(dataNodeParameters)",
"\n .MainTabConfiguration(partition)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync()"
],
"metadata": {},
Expand Down Expand Up @@ -542,11 +542,10 @@
{
"cell_type": "code",
"source": [
"public async Task<ActivityLog> CheckErrors(string inputFileName, List<string> errorBms)",
"public async Task<ActivityLog> CheckErrors(string inputFileName, List<string> errorBms, IWorkspace workspace)",
"\n{",
"\n Activity.Start();",
"\n var log = await Import.FromFile(inputFileName).WithFormat(ImportFormats.DataNodeParameter).WithTarget(Workspace).ExecuteAsync();",
"\n Workspace.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());",
"\n var log = await Import.FromFile(inputFileName).WithFormat(ImportFormats.DataNodeParameter).WithTarget(workspace).ExecuteAsync();",
"\n errorBms.Intersect(log.Errors.Select(x => x.ToString().Substring(0,x.ToString().Length-2).Substring(40)).ToArray()).Count().Should().Be(errorBms.Count());",
"\n return Activity.Finish();",
"\n}"
Expand All @@ -555,39 +554,69 @@
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var ws1 = Workspace.CreateNew();",
"\nws1.InitializeFrom(DataSource);"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var inputFileName = \"Data/DataNodeParameter_InvalidDataNode.csv\";",
"\nvar errorsBm = new List<string>(){Get(Error.InvalidDataNode, \"DataNodeInvalid0\"),",
"\n Get(Error.InvalidDataNode, \"DataNodeInvalid1\"),",
"\n Get(Error.InvalidDataNode, \"DataNodeInvalid2\")};",
"\nvar activity = await CheckErrors(inputFileName, errorsBm);",
"\nvar activity = await CheckErrors(inputFileName, errorsBm, ws1);",
"\nactivity"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var ws2 = Workspace.CreateNew();",
"\nws2.InitializeFrom(DataSource);"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var inputFileName = \"Data/DataNodeParameter_Duplicate.csv\";",
"\nvar errorsBm = new List<string>(){Get(Error.DuplicateSingleDataNode, \"DT1.1\"),",
"\n Get(Error.DuplicateInterDataNode, \"DT1.1\",\"DTR1.1\"),};",
"\nvar activity = await CheckErrors(inputFileName, errorsBm);",
"\nvar activity = await CheckErrors(inputFileName, errorsBm, ws2);",
"\nactivity"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var ws3 = Workspace.CreateNew();",
"\nws3.InitializeFrom(DataSource);"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"var inputFileName = \"Data/DataNodeParameter_InvalidReinsCov.csv\";",
"\nvar errorsBm = new List<string>(){Get(Error.ReinsuranceCoverageDataNode, \"DT1.1\",\"DT1.1\")};",
"\nvar activity = await CheckErrors(inputFileName, errorsBm);",
"\nvar activity = await CheckErrors(inputFileName, errorsBm, ws3);",
"\nactivity"
],
"metadata": {},
Expand Down
4 changes: 2 additions & 2 deletions ifrs17-template/Test/ReimportWithDifferentScopeTest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"await Import.FromFile(\"../Files/TransactionalData/NominalCashflows_CH_2020_12.csv\")",
"\n .WithFormat(ImportFormats.Cashflow)",
"\n .WithTarget(DataSource)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync()"
],
"metadata": {},
Expand Down Expand Up @@ -86,7 +86,7 @@
"await Import.FromFile(\"Data/NominalCashflows_CH_2020_12_DT1.1NoPrem.csv\")",
"\n .WithFormat(ImportFormats.Cashflow)",
"\n .WithTarget(DataSource)",
"\n .WithActivityLog(Session, DataSource, DataSetReader)",
"\n .WithActivityLog()",
"\n .ExecuteAsync()"
],
"metadata": {},
Expand Down
20 changes: 0 additions & 20 deletions ifrs17-template/Test/SequenceImportTest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,6 @@
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"ws1.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());",
"\nws1.Initialize(x => x.FromSource(DataSource));"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
Expand Down Expand Up @@ -153,16 +143,6 @@
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
"ws2.Reset(x => x.ResetInitializationRules().ResetCurrentPartitions());",
"\nws2.Initialize(x => x.FromSource(DataSource));"
],
"metadata": {},
"execution_count": 0,
"outputs": []
},
{
"cell_type": "code",
"source": [
Expand Down
Loading