Refactor request records and handlers to use consistent property casing and simplify object initialization

Author: mm-omdi

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

@@ -17,10 +17,10 @@ public class SubmodelRepositoryHandler(
 {
     public Task<ISubmodel> GetSubmodel(GetSubmodelRequest request, CancellationToken cancellationToken)
     {
-        var queryOptions = request?.level is not null || request?.extent is not null ? new SubmodelQueryOptions(request.level?.ToString(), request.extent?.ToString()) : null;
+        var queryOptions = new SubmodelQueryOptions(request?.Level.ToString(), request?.Extent.ToString());
 
         return GetResourceByIdAsync(
-            request?.submodelId,
+            request?.SubmodelId,
             "submodel",
             id => submodelRepositoryService.GetSubmodelAsync(id, queryOptions, cancellationToken)!);
     }
@@ -30,9 +30,7 @@ public Task<ISubmodelElement> GetSubmodelElement(GetSubmodelElementRequest reque
         var decodedIdShortPath = Uri.UnescapeDataString(request?.IdShortPath ?? string.Empty);
         decodedIdShortPath.ValidateIdShortPath(nameof(request.IdShortPath), logger);
 
-        var queryOptions = request?.level is not null || request?.extent is not null
-            ? new SubmodelQueryOptions(request.level?.ToString(), request.extent?.ToString())
-            : null;
+        var queryOptions = new SubmodelQueryOptions(request?.Level.ToString(), request?.Extent.ToString());
 
         return GetResourceByIdAsync(
             request?.SubmodelId,
@@ -51,7 +49,7 @@ public async Task<SubmodelsDto> GetAllSubmodels(GetAllSubmodelsRequest request,
             IdShort = request?.IdShort
         };
 
-        var queryOptions = request?.Level is not null || request?.Extent is not null ? new SubmodelQueryOptions(request.Level?.ToString(), request.Extent?.ToString()) : null;
+        var queryOptions = new SubmodelQueryOptions(request?.Level.ToString(), request?.Extent.ToString());
 
         var result = await submodelRepositoryService.GetAllSubmodelsAsync(filter, queryOptions, request?.Limit, request?.Cursor, cancellationToken).ConfigureAwait(false);
 
@@ -63,9 +61,7 @@ public async Task<SubmodelElementsDto> GetAllSubmodelElements(GetAllSubmodelElem
         request?.Limit.ValidateLimit(logger);
         request?.Cursor?.ValidateCursor(logger);
 
-        var queryOptions = request?.Level is not null || request?.Extent is not null
-            ? new SubmodelQueryOptions(request.Level?.ToString(), request.Extent?.ToString())
-            : null;
+        var queryOptions = new SubmodelQueryOptions(request?.Level.ToString(), request?.Extent.ToString());
 
         var result = await GetResourceByIdAsync(
             request?.SubmodelId,

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/Requests/GetAllSubmodelElementsRequest.cs

@@ -1,23 +1,3 @@
 namespace AAS.TwinEngine.DataEngine.Api.SubmodelRepository.Requests;
 
-public record GetAllSubmodelElementsRequest
-{
-    public string? SubmodelId { get; init; }
-
-    public int? Limit { get; init; }
-
-    public string? Cursor { get; init; }
-
-    public Level? Level { get; init; }
-
-    public Extent? Extent { get; init; }
-
-    public GetAllSubmodelElementsRequest(string? submodelId, int? limit, string? cursor, Level? level = null, Extent? extent = null)
-    {
-        SubmodelId = submodelId;
-        Limit = limit;
-        Cursor = cursor;
-        Level = level;
-        Extent = extent;
-    }
-}
+public record GetAllSubmodelElementsRequest(string? SubmodelId, int? Limit, string? Cursor, Level Level, Extent Extent);

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/Requests/GetAllSubmodelsRequest.cs

@@ -1,19 +1,6 @@
 namespace AAS.TwinEngine.DataEngine.Api.SubmodelRepository.Requests;
 
-public record GetAllSubmodelsRequest
-{
-    public string? SemanticId { get; set; }
-
-    public string? IdShort { get; set; }
-
-    public int? Limit { get; set; }
-
-    public string? Cursor { get; set; }
-
-    public Level? Level { get; set; }
-
-    public Extent? Extent { get; set; }
-}
+public record GetAllSubmodelsRequest(string? SemanticId, string? IdShort, int? Limit, string? Cursor, Level Level, Extent Extent);
 
 public enum Level
 {

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/Requests/GetSubmodelElementRequest.cs

@@ -1,3 +1,3 @@
 namespace AAS.TwinEngine.DataEngine.Api.SubmodelRepository.Requests;
 
-public record GetSubmodelElementRequest(string SubmodelId, string IdShortPath, Level? level = Level.deep, Extent? extent = Extent.withoutBlobValue);
+public record GetSubmodelElementRequest(string SubmodelId, string IdShortPath, Level? Level = Level.deep, Extent? Extent = Extent.withoutBlobValue);

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/Requests/GetSubmodelRequest.cs

@@ -1,3 +1,3 @@
 namespace AAS.TwinEngine.DataEngine.Api.SubmodelRepository.Requests;
 
-public record GetSubmodelRequest(string submodelId, Level? level = Level.deep, Extent? extent = Extent.withoutBlobValue);
+public record GetSubmodelRequest(string SubmodelId, Level? Level = Level.deep, Extent? Extent = Extent.withoutBlobValue);

source/AAS.TwinEngine.DataEngine/Api/SubmodelRepository/SubmodelRepositoryController.cs

@@ -56,15 +56,7 @@ public async Task<ActionResult<SubmodelsDto>> GetAllSubmodelsAsync(
     {
         logger.LogInformation("Get All Submodels");
 
-        var request = new GetAllSubmodelsRequest
-        {
-            SemanticId = semanticId,
-            IdShort = idShort,
-            Limit = limit,
-            Cursor = cursor,
-            Level = level,
-            Extent = extent
-        };
+        var request = new GetAllSubmodelsRequest(semanticId, idShort, limit, cursor, level, extent);
 
         var response = await submodelRepositoryHandler
             .GetAllSubmodels(request, cancellationToken)
@@ -90,9 +82,9 @@ public async Task<ActionResult<SubmodelsDto>> GetAllSubmodelsAsync(
     [ProducesResponseType(typeof(ServiceErrorResponse), (int)HttpStatusCode.InternalServerError)]
     public async Task<ActionResult<JsonObject>> GetSubmodelAsync(
         [FromRoute] string submodelIdentifier,
-        [FromQuery] Level? level,
-        [FromQuery] Extent? extent,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        [FromQuery] Level level = Level.deep,
+        [FromQuery] Extent extent = Extent.withoutBlobValue)
     {
         logger.LogInformation("Get Submodel");
         var request = new GetSubmodelRequest(submodelIdentifier, level, extent);
@@ -123,8 +115,7 @@ public async Task<ActionResult<SubmodelElementsDto>> GetAllSubmodelElementsAsync
         [FromQuery] string? cursor,
         CancellationToken cancellationToken,
         [FromQuery] Level level = Level.deep,
-        [FromQuery] Extent extent = Extent.withoutBlobValue
-        )
+        [FromQuery] Extent extent = Extent.withoutBlobValue)
     {
         logger.LogInformation("Get All Submodel Elements");
         var request = new GetAllSubmodelElementsRequest(submodelIdentifier, limit, cursor, level, extent);
@@ -151,9 +142,9 @@ public async Task<ActionResult<SubmodelElementsDto>> GetAllSubmodelElementsAsync
     public async Task<ActionResult<JsonObject>> GetSubmodelElementAsync(
         [FromRoute] string submodelIdentifier,
         [FromRoute] string idShortPath,
-        [FromQuery] Level? level,
-        [FromQuery] Extent? extent,
-        CancellationToken cancellationToken)
+        CancellationToken cancellationToken,
+        [FromQuery] Level level = Level.deep,
+        [FromQuery] Extent extent = Extent.withoutBlobValue)
     {
         logger.LogInformation("Get Submodel Element");
         var request = new GetSubmodelElementRequest(submodelIdentifier, idShortPath, level, extent);