Skip to content

Commit f350b01

Browse files
committed
Refactor Submodel repository methods to utilize SubmodelQueryOptions for improved parameter handling
1 parent b17f1e4 commit f350b01

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

source/AAS.TwinEngine.DataEngine.ModuleTests/Api/Services/SubmodelRepository/GetAllSubmodelElementsControllerTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public async Task GetAllSubmodelElementsAsync_WithNoQueryParams_ReturnsOkWithEmp
8080
};
8181

8282
_ = _mockSubmodelRepositoryService
83-
.GetAllSubmodelElementsAsync(SubmodelId, null, null, null, Arg.Any<CancellationToken>())
83+
.GetAllSubmodelElementsAsync(SubmodelId, Arg.Any<SubmodelQueryOptions?>(), null, null, Arg.Any<CancellationToken>())
8484
.Returns(elementList);
8585

8686
// Act
@@ -105,7 +105,7 @@ public async Task GetAllSubmodelElementsAsync_WithElements_ReturnsPopulatedResul
105105
};
106106

107107
_ = _mockSubmodelRepositoryService
108-
.GetAllSubmodelElementsAsync(SubmodelId, null, null, null, Arg.Any<CancellationToken>())
108+
.GetAllSubmodelElementsAsync(SubmodelId, Arg.Any<SubmodelQueryOptions?>(), null, null, Arg.Any<CancellationToken>())
109109
.Returns(elementList);
110110

111111
// Act

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/Handler/SubmodelRepositoryHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Task<ISubmodelElement> GetSubmodelElement(GetSubmodelElementRequest reque
3737
return GetResourceByIdAsync(
3838
request?.SubmodelId,
3939
"submodel element",
40-
id => submodelRepositoryService.GetSubmodelElementAsync(id, decodedIdShortPath, queryOptions, cancellationToken)!);
40+
id => submodelRepositoryService.GetSubmodelElementAsync(id, decodedIdShortPath, queryOptions, cancellationToken));
4141
}
4242

4343
public async Task<SubmodelsDto> GetAllSubmodels(GetAllSubmodelsRequest request, CancellationToken cancellationToken)

source/AAS.TwinEngine.DataEngine/ApplicationLogic/Services/SubmodelRepository/SubmodelTemplateService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task<ISubmodel> GetSubmodelTemplateAsync(string submodelId, string
5959
ValidateSubmodelId(submodelId);
6060

6161
var templateId = _submodelTemplateMappingProvider.GetTemplateId(submodelId);
62-
var submodel = await _templateProvider.GetFilteredSubmodelTemplateAsync(templateId!, queryOptions, cancellationToken).ConfigureAwait(false);
62+
var submodel = await _templateProvider.GetFilteredSubmodelTemplateAsync(templateId, queryOptions, cancellationToken).ConfigureAwait(false);
6363

6464
return BuildSubmodel(submodel, idShortPath);
6565
}

0 commit comments

Comments
 (0)