Skip to content

Add root node filtering to Cnmm data source #471

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
likp merged 10 commits into from
Jan 27, 2026
Merged

Add root node filtering to Cnmm data source #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6ac9224
Add root node filtering to Cnmm data source logic
likp Nov 13, 2025
50cf20b
Fixed unit tests
likp Nov 13, 2025
97214eb
Merge remote-tracking branch 'origin/main' into feature/virtual-root
likp Jan 16, 2026
fd97e7a
Removed todo
likp Jan 16, 2026
f96c03d
Added unit tests
likp Jan 16, 2026
e188c98
Fixed error in data
likp Jan 16, 2026
6d94f19
Fixed test data
likp Jan 16, 2026
b9d8129
Try to fix coverage
likp Jan 16, 2026
4453766
Add unit tests for ItemSelectionResolverCnmm ResolveTable
likp Jan 16, 2026
a07ced1
Refactor to use TryGetValue instead of ContainsKey
likp Jan 16, 2026
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
31 changes: 21 additions & 10 deletions PxWeb.UnitTests/DataSource/CnmmDataSourceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
var memorymock = new Mock<IPxCache>();
var configMock = new Mock<IPxApiConfigurationService>();
var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();
cnmmConfigMock.Setup(x => x.Value).Returns(new CnmmConfigurationOptions());

var testFactory = new TestFactory();
var dict = testFactory.GetMenuLookupFolders();
Expand All @@ -21,7 +23,7 @@

pcAxisFactory.Setup(x => x.GetMenuLookupFolders(language)).Returns(dict);

var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);

bool selectionExists;

Expand All @@ -40,6 +42,8 @@
var memorymock = new Mock<IPxCache>();
var configMock = new Mock<IPxApiConfigurationService>();
var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();
cnmmConfigMock.Setup(x => x.Value).Returns(new CnmmConfigurationOptions());

var testFactory = new TestFactory();
var dict = testFactory.GetMenuLookupFolders();
Expand All @@ -49,7 +53,7 @@

pcAxisFactory.Setup(x => x.GetMenuLookupFolders(language)).Returns(dict);

var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);

bool selectionExists;

Expand All @@ -60,7 +64,7 @@
}


[Ignore]

Check warning on line 67 in PxWeb.UnitTests/DataSource/CnmmDataSourceTest.cs

View workflow job for this annotation

GitHub Actions / build 

Either remove this 'Ignore' attribute or add an explanation about why this test is ignored. (https://rules.sonarsource.com/csharp/RSPEC-1607)
[TestMethod]
public void ShouldReturnMenu()
{
Expand All @@ -71,6 +75,7 @@
var configServiceMock = new Mock<ICnmmConfigurationService>();
var codelistMapperMock = new Mock<ICodelistMapper>();
var pxApiConfig = new Mock<IOptions<PxApiConfigurationOptions>>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();

var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();

Expand All @@ -82,11 +87,11 @@

pcAxisFactory.Setup(x => x.GetMenuLookupFolders(language)).Returns(dict);

var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);
var tablePathResolver = new TablePathResolverCnmm(configServiceMock.Object, resolver);
pxApiConfig.Setup(x => x.Value).Returns(config);

var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object);
var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object, cnmmConfigMock.Object);

bool selectionExists;

Expand All @@ -95,7 +100,7 @@
Assert.IsNotNull(result);
}

[Ignore]

Check warning on line 103 in PxWeb.UnitTests/DataSource/CnmmDataSourceTest.cs

View workflow job for this annotation

GitHub Actions / build 

Either remove this 'Ignore' attribute or add an explanation about why this test is ignored. (https://rules.sonarsource.com/csharp/RSPEC-1607)
[TestMethod]
public void TableExistsCNMMShouldReturnTrue()
{
Expand All @@ -106,6 +111,7 @@
var configServiceMock = new Mock<ICnmmConfigurationService>();
var codelistMapperMock = new Mock<ICodelistMapper>();
var pxApiConfig = new Mock<IOptions<PxApiConfigurationOptions>>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();

var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();

Expand All @@ -117,12 +123,12 @@

pcAxisFactory.Setup(x => x.GetMenuLookupTables(language)).Returns(dict);

var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);
var tablePathResolver = new TablePathResolverCnmm(configServiceMock.Object, resolver);

pxApiConfig.Setup(x => x.Value).Returns(config);

var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object);
var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object, cnmmConfigMock.Object);

var result = datasource.TableExists("Befolkning", language);

Expand All @@ -140,6 +146,7 @@
var configServiceMock = new Mock<ICnmmConfigurationService>();
var codelistMapperMock = new Mock<ICodelistMapper>();
var pxApiConfig = new Mock<IOptions<PxApiConfigurationOptions>>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();

var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();

Expand All @@ -151,11 +158,11 @@

pcAxisFactory.Setup(x => x.GetMenuLookupTables(language)).Returns(dict);

var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);
var tablePathResolver = new TablePathResolverCnmm(configServiceMock.Object, resolver);
pxApiConfig.Setup(x => x.Value).Returns(config);

var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object);
var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object, cnmmConfigMock.Object);

var result = datasource.TableExists("select * from Befolkning", language);

Expand All @@ -173,15 +180,19 @@
var codelistMapperMock = new Mock<ICodelistMapper>();
var pxApiConfig = new Mock<IOptions<PxApiConfigurationOptions>>();
var pcAxisFactory = new Mock<IItemSelectionResolverFactory>();
var cnmmConfigMock = new Mock<IOptions<CnmmConfigurationOptions>>();
cnmmConfigMock.Setup(x => x.Value).Returns(new CnmmConfigurationOptions());


var testFactory = new TestFactory();
var dict = testFactory.GetMenuLookupTables();
var config = testFactory.GetPxApiConfiguration();
configMock.Setup(x => x.GetConfiguration()).Returns(config);
pcAxisFactory.Setup(x => x.GetMenuLookupTables(language)).Returns(dict);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object);
var resolver = new ItemSelectionResolverCnmm(memorymock.Object, pcAxisFactory.Object, configMock.Object, cnmmConfigMock.Object);
var tablePathResolver = new TablePathResolverCnmm(configServiceMock.Object, resolver);
pxApiConfig.Setup(x => x.Value).Returns(config);
var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object);
var datasource = new CnmmDataSource(configServiceMock.Object, resolver, tablePathResolver, codelistMapperMock.Object, pxApiConfig.Object, cnmmConfigMock.Object);

//Act
var mapping = datasource.GetTableLanguages();
Expand Down
Loading