Skip to content

Commit da1f4e8

Browse files
mm-omdimm-omdi
committed
Refactor submodel repository handling: replace SubmodelRepository.Providers with Shared.Providers and update related services
1 parent a7bd89e commit da1f4e8

12 files changed

Lines changed: 96 additions & 108 deletions

File tree

‎source/AAS.TwinEngine.DataEngine.ModuleTests/Api/Services/AasRepository/AasRepositoryControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasEnvironment.Providers;
99
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin;
1010
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin.Providers;
11-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
11+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
1212
using AAS.TwinEngine.DataEngine.Infrastructure.Http.Clients;
1313
using AAS.TwinEngine.DataEngine.ModuleTests.Common;
1414
using AAS.TwinEngine.DataEngine.ServiceConfiguration.Config;

‎source/AAS.TwinEngine.DataEngine.ModuleTests/Api/Services/SubmodelRepository/SubmodelRepositoryControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasEnvironment.Providers;
99
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin;
1010
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin.Providers;
11-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
11+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
1212
using AAS.TwinEngine.DataEngine.Infrastructure.Http.Clients;
1313
using AAS.TwinEngine.DataEngine.ModuleTests.Common;
1414

‎source/AAS.TwinEngine.DataEngine.UnitTests/Api/AasRepository/AasRepositoryControllerTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using AAS.TwinEngine.DataEngine.Api.Shared.Results;
1111
using AAS.TwinEngine.DataEngine.ApplicationLogic.Extensions;
1212
using AAS.TwinEngine.DataEngine.DomainModel.Shared;
13-
using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
1413

1514
using AasCore.Aas3_1;
1615

‎source/AAS.TwinEngine.DataEngine.UnitTests/Api/AasRepository/Handler/AasRepositoryHandlerTests.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
88
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
99
using AAS.TwinEngine.DataEngine.DomainModel.Shared;
10-
using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
1110

1211
using AasCore.Aas3_1;
1312

@@ -22,14 +21,11 @@ public class AasRepositoryHandlerTests
2221
{
2322
private readonly IAasRepositoryService _aasRepositoryService = Substitute.For<IAasRepositoryService>();
2423
private readonly ILogger<AasRepositoryHandler> _logger = Substitute.For<ILogger<AasRepositoryHandler>>();
25-
private readonly IHttpContextAccessor _httpContextAccessor = Substitute.For<IHttpContextAccessor>();
2624
private readonly AasRepositoryHandler _sut;
2725

2826
public AasRepositoryHandlerTests()
2927
{
30-
var httpContext = new DefaultHttpContext();
31-
_httpContextAccessor.HttpContext.Returns(httpContext);
32-
_sut = new AasRepositoryHandler(_logger, _httpContextAccessor, _aasRepositoryService);
28+
_sut = new AasRepositoryHandler(_logger, _aasRepositoryService);
3329
}
3430

3531
[Fact]

‎source/AAS.TwinEngine.DataEngine.UnitTests/ApplicationLogic/Services/AasRepository/AasRepositoryServiceTests.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using AAS.TwinEngine.DataEngine.ApplicationLogic.Extensions;
44
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
55
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin;
6+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
67
using AAS.TwinEngine.DataEngine.DomainModel.AasRegistry;
78
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
89
using AAS.TwinEngine.DataEngine.DomainModel.Plugin;
@@ -14,10 +15,6 @@
1415
using Microsoft.Extensions.Logging;
1516
using Microsoft.Extensions.Options;
1617

17-
using System.Net;
18-
using System.Net.Http;
19-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
20-
using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
2118
using NSubstitute;
2219
using NSubstitute.ExceptionExtensions;
2320

‎source/AAS.TwinEngine.DataEngine.UnitTests/ApplicationLogic/Services/SubmodelRepository/SubmodelRepositoryServiceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
66
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin;
77
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository;
8-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
8+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
99
using AAS.TwinEngine.DataEngine.DomainModel.AasRegistry;
1010
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
1111
using AAS.TwinEngine.DataEngine.DomainModel.Plugin;

‎source/AAS.TwinEngine.DataEngine/Api/AasRepository/Handler/AasRepositoryHandler.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
1010
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
1111
using AAS.TwinEngine.DataEngine.DomainModel.Shared;
12-
using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
1312

1413
using AasCore.Aas3_1;
1514

1615
namespace AAS.TwinEngine.DataEngine.Api.AasRepository.Handler;
1716

1817
public class AasRepositoryHandler(
1918
ILogger<AasRepositoryHandler> logger,
20-
IHttpContextAccessor httpContextAccessor,
2119
IAasRepositoryService aasRepositoryService) : IAasRepositoryHandler
2220
{
2321
public async Task<ShellsDto> GetShellsByAssetIdsAsync(
@@ -78,7 +76,7 @@ public async Task<FileAttachmentResult> GetThumbnailAsync(GetThumbnailRequest re
7876
return await GetResourceByIdAsync(
7977
request?.AasIdentifier,
8078
"thumbnail",
81-
id => aasRepositoryService.GetThumbnailAsync(decodedId!, cancellationToken))
79+
id => aasRepositoryService.GetThumbnailAsync(decodedId, cancellationToken))
8280
.ConfigureAwait(false);
8381
}
8482

‎source/AAS.TwinEngine.DataEngine/ApplicationLogic/Services/AasRepository/AasRepositoryService.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
77
using AAS.TwinEngine.DataEngine.DomainModel.Shared;
88
using AAS.TwinEngine.DataEngine.ServiceConfiguration.Config;
9-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
10-
using AAS.TwinEngine.DataEngine.DomainModel.SubmodelRepository;
9+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
1110

1211
using AasCore.Aas3_1;
1312

1413
using Microsoft.Extensions.Options;
1514

1615
using UnauthorizedAccessException = AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Infrastructure.UnauthorizedAccessException;
17-
using AAS.TwinEngine.DataEngine.Infrastructure.Providers.FileContentProvider.Services;
1816

1917
namespace AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
2018

source/AAS.TwinEngine.DataEngine/ApplicationLogic/Services/SubmodelRepository/Providers/IFileContentProvider.cs renamed to source/AAS.TwinEngine.DataEngine/ApplicationLogic/Services/Shared/Providers/IFileContentProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using AAS.TwinEngine.DataEngine.DomainModel.Shared;
22

3-
namespace AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
3+
namespace AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
44

55
public interface IFileContentProvider
66
{

‎source/AAS.TwinEngine.DataEngine/ApplicationLogic/Services/SubmodelRepository/SubmodelRepositoryService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Application;
1+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Application;
22
using AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Infrastructure;
33
using AAS.TwinEngine.DataEngine.ApplicationLogic.Extensions;
44
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.AasRepository;
55
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Plugin;
6-
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.SubmodelRepository.Providers;
6+
using AAS.TwinEngine.DataEngine.ApplicationLogic.Services.Shared.Providers;
77
using AAS.TwinEngine.DataEngine.DomainModel.AasRegistry;
88
using AAS.TwinEngine.DataEngine.DomainModel.AasRepository;
99
using AAS.TwinEngine.DataEngine.DomainModel.Shared;

0 commit comments

Comments
 (0)