Skip to content

Enhance Submodel.Kind handling #88

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
mm-hsh merged 5 commits into from
Apr 1, 2026
Merged

Enhance Submodel.Kind handling #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfbeb32
set Submodel.Kind and Serialize enums as strings in DTOs
mm-hsh Mar 30, 2026
adfd1b9
Use global JsonStringEnumConverter for enums in API
mm-hsh Mar 30, 2026
12e67cf
Merge branch 'develop' into feature/626-kind-Instance
mm-hsh Mar 31, 2026
56907d5
Update assetKind/assetType to string "Type" in test data
mm-hsh Mar 31, 2026
915a665
Update test JSONs to use string enums and fix submodel kind
mm-mcn Mar 31, 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
12 changes: 6 additions & 6 deletions source/AAS.TwinEngine.DataEngine.ModuleTests/Api/Services/AasRegistry/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ public static string CreateShellDescriptors() => """
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand All @@ -159,8 +159,8 @@ public static string CreateShellDescriptors() => """
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand Down Expand Up @@ -191,8 +191,8 @@ public static string CreateShellDescriptor() => """
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand Down
4 changes: 3 additions & 1 deletion ...DataEngine.UnitTests/Api/AasRegistry/MappingProfiles/ShellDescriptorMapperProfileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using AAS.TwinEngine.DataEngine.Api.AasRegistry.MappingProfiles;
using System.Text.Json;

using AAS.TwinEngine.DataEngine.Api.AasRegistry.MappingProfiles;
using AAS.TwinEngine.DataEngine.DomainModel.AasRegistry;
using AAS.TwinEngine.DataEngine.UnitTests.Api.Shared.MappingProfiles;

Expand Down
3 changes: 3 additions & 0 deletions ...ine.UnitTests/Infrastructure/Providers/TemplateProvider/Services/TemplateProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
using AAS.TwinEngine.DataEngine.DomainModel.AasRegistry;
using AAS.TwinEngine.DataEngine.Infrastructure.Http.Clients;

using AasCore.Aas3_0;

using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;

Expand Down Expand Up @@ -44,6 +46,7 @@ public async Task GetSubmodelTemplateAsync_ReturnsSubmodel_WhenValidResponse()

Assert.Equal("TestId", result.Id);
Assert.Equal("Test", result.IdShort);
Assert.Equal(ModellingKind.Instance, result.Kind);
}

[Fact]
Expand Down
6 changes: 5 additions & 1 deletion ...nEngine.DataEngine/Infrastructure/Providers/TemplateProvider/Services/TemplateProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ public async Task<ISubmodel> GetSubmodelTemplateAsync(string templateId, Cancell
try
{
var jsonNode = JsonNode.Parse(content);
return Jsonization.Deserialize.SubmodelFrom(jsonNode!);
var submodel = Jsonization.Deserialize.SubmodelFrom(jsonNode!);
UpdateSubmodelTemplateKind(submodel);
return submodel;
}
catch (JsonException ex)
{
Expand Down Expand Up @@ -245,4 +247,6 @@ private async Task<HttpResponseMessage> SendGetRequestAsync(string url, string h
throw new ValidationFailedException();
}
}

private static void UpdateSubmodelTemplateKind(ISubmodel submodel) => submodel.Kind = ModellingKind.Instance;
}
10 changes: 8 additions & 2 deletions source/AAS.TwinEngine.DataEngine/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Infrastructure;
using System.Text.Json.Serialization;

using AAS.TwinEngine.DataEngine.ApplicationLogic.Exceptions.Infrastructure;
using AAS.TwinEngine.DataEngine.Infrastructure.Http.Authorization.Middleware;
using AAS.TwinEngine.DataEngine.Infrastructure.Monitoring;
using AAS.TwinEngine.DataEngine.Infrastructure.Providers.PluginDataProvider.Services;
Expand Down Expand Up @@ -33,7 +35,11 @@ public static async Task Main(string[] args)
builder.Services.ConfigureResponseCompression();
_ = builder.Services.AddAuthorization();

_ = builder.Services.AddControllers();
_ = builder.Services.AddControllers()
.AddJsonOptions(options =>
{
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
});

_ = builder.Services.AddEndpointsApiExplorer();
_ = builder.Services.AddOpenApiDocument(settings =>
Expand Down
12 changes: 6 additions & 6 deletions ...ugin.TestPlugin.PlaywrightTests/AasRegistry/TestData/GetAllShellDescriptors_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand All @@ -35,8 +35,8 @@
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand All @@ -62,8 +62,8 @@
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand Down
4 changes: 2 additions & 2 deletions ...ugin.TestPlugin.PlaywrightTests/AasRegistry/TestData/GetShellDescriptorById_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"displayName": null,
"extensions": null,
"administration": null,
"assetKind": 0,
"assetType": 0,
"assetKind": "Type",
"assetType": "Type",
"endpoints": [
{
"interface": "AAS-3.0",
Expand Down
2 changes: 1 addition & 1 deletion ...PlaywrightTests/SubmodelRegistry/TestData/GetSubmodelDescriptorById_Contact_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"idShort": "ContactInformations",
"id": "https://mm-software.com/submodel/000-001/ContactInformation",
"semanticId": {
"type": 0,
"type": "ExternalReference",
"referredSemanticId": null,
"keys": null
},
Expand Down
2 changes: 1 addition & 1 deletion ...ghtTests/SubmodelRegistry/TestData/GetSubmodelDescriptorById_CustomSubmodel_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"idShort": "CustomSubmodel",
"id": "https://mm-software.com/submodel/000-001/CustomSubmodel",
"semanticId": {
"type": 0,
"type": "ExternalReference",
"referredSemanticId": null,
"keys": null
},
Expand Down
4 changes: 2 additions & 2 deletions ...s/SubmodelRegistry/TestData/GetSubmodelDescriptorById_HandoverDocumentation_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"idShort": "HandoverDocumentation",
"id": "https://mm-software.com/submodel/000-001/HandoverDocumentation",
"semanticId": {
"type": 0,
"type": "ExternalReference",
"referredSemanticId": null,
"keys": null
},
"supplementalSemanticId": [
{
"type": 0,
"type": "ExternalReference",
"referredSemanticId": null,
"keys": null
}
Expand Down
2 changes: 1 addition & 1 deletion ...tPlugin.PlaywrightTests/SubmodelRepository/TestData/GetSubmodel_ContactInfo_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"idShort": "ContactInformations",
"id": "https://mm-software.com/submodel/000-001/ContactInformation",
"kind": "Template",
"kind": "Instance",
"semanticId": {
"type": "ModelReference",
"keys": [
Expand Down
2 changes: 1 addition & 1 deletion ...ugin.PlaywrightTests/SubmodelRepository/TestData/GetSubmodel_CustomSubmodel_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
],
"id": "https://mm-software.com/submodel/000-001/CustomSubmodel",
"kind": "Template",
"kind": "Instance",
"semanticId": {
"type": "ExternalReference",
"keys": [
Expand Down
2 changes: 1 addition & 1 deletion ...aywrightTests/SubmodelRepository/TestData/GetSubmodel_HandoverDocumentation_Expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"templateId": "https://admin-shell.io/idta-02004-2-0"
},
"id": "https://mm-software.com/submodel/000-001/HandoverDocumentation",
"kind": "Template",
"kind": "Instance",
"semanticId": {
"type": "ModelReference",
"keys": [
Expand Down
Loading