diff --git a/src/database/PolicyHub.DbAccess/PolicyHub.DbAccess.csproj b/src/database/PolicyHub.DbAccess/PolicyHub.DbAccess.csproj index f46e14b..f7876d6 100644 --- a/src/database/PolicyHub.DbAccess/PolicyHub.DbAccess.csproj +++ b/src/database/PolicyHub.DbAccess/PolicyHub.DbAccess.csproj @@ -33,8 +33,8 @@ - - + + diff --git a/src/database/PolicyHub.Migrations/PolicyHub.Migrations.csproj b/src/database/PolicyHub.Migrations/PolicyHub.Migrations.csproj index 6edaecb..fa2ecd2 100644 --- a/src/database/PolicyHub.Migrations/PolicyHub.Migrations.csproj +++ b/src/database/PolicyHub.Migrations/PolicyHub.Migrations.csproj @@ -45,9 +45,8 @@ - - - + + diff --git a/src/hub/PolicyHub.Service/BusinessLogic/PolicyHubBusinessLogic.cs b/src/hub/PolicyHub.Service/BusinessLogic/PolicyHubBusinessLogic.cs index 9c4093c..18f641e 100644 --- a/src/hub/PolicyHub.Service/BusinessLogic/PolicyHubBusinessLogic.cs +++ b/src/hub/PolicyHub.Service/BusinessLogic/PolicyHubBusinessLogic.cs @@ -20,12 +20,10 @@ using Org.Eclipse.TractusX.PolicyHub.DbAccess; using Org.Eclipse.TractusX.PolicyHub.DbAccess.Models; using Org.Eclipse.TractusX.PolicyHub.DbAccess.Repositories; -using Org.Eclipse.TractusX.PolicyHub.Entities.Entities; using Org.Eclipse.TractusX.PolicyHub.Entities.Enums; using Org.Eclipse.TractusX.PolicyHub.Service.Extensions; using Org.Eclipse.TractusX.PolicyHub.Service.Models; using Org.Eclipse.TractusX.Portal.Backend.Framework.ErrorHandling; -using Org.Eclipse.TractusX.Portal.Backend.Framework.Linq; using System.Text.RegularExpressions; namespace Org.Eclipse.TractusX.PolicyHub.Service.BusinessLogic; @@ -68,10 +66,10 @@ private static (object rightOperand, AdditionalAttributes? additionalAttribute) _ => operatorId == OperatorId.Equals ? rightOperands.Count() > 1 ? ($"@{leftOperand}{(useCase != null ? - useCase.ToString().Insert(0, ".") : + useCase.Value.ToString().Insert(0, ".") : string.Empty)}-{attributes.Key}", new AdditionalAttributes($"@{leftOperand}{(useCase != null ? - useCase.ToString().Insert(0, ".") : + useCase.Value.ToString().Insert(0, ".") : string.Empty)}-{attributes.Key}", rightOperands)) : (rightOperands.Single(), null) : (rightOperands, null) diff --git a/src/hub/PolicyHub.Service/PolicyHub.Service.csproj b/src/hub/PolicyHub.Service/PolicyHub.Service.csproj index e96ff48..83fd06b 100644 --- a/src/hub/PolicyHub.Service/PolicyHub.Service.csproj +++ b/src/hub/PolicyHub.Service/PolicyHub.Service.csproj @@ -36,7 +36,7 @@ - + diff --git a/src/hub/PolicyHub.Service/Program.cs b/src/hub/PolicyHub.Service/Program.cs index 1b7664b..e71d0bf 100644 --- a/src/hub/PolicyHub.Service/Program.cs +++ b/src/hub/PolicyHub.Service/Program.cs @@ -26,8 +26,8 @@ const string Version = "v2"; -WebApplicationBuildRunner - .BuildAndRunWebApplication(args, "policy-hub", Version, ".Hub", +await WebApplicationBuildRunner + .BuildAndRunWebApplicationAsync(args, "policy-hub", Version, ".Hub", builder => { builder.Services.AddTransient(); @@ -47,4 +47,4 @@ app.MapGroup("/api") .WithOpenApi() .MapPolicyHubApi(); - }); + }).ConfigureAwait(ConfigureAwaitOptions.None); diff --git a/tests/database/PolicyHub.Entities.Tests/PolicyHub.Entities.Tests.csproj b/tests/database/PolicyHub.Entities.Tests/PolicyHub.Entities.Tests.csproj index bb42047..0ce74eb 100644 --- a/tests/database/PolicyHub.Entities.Tests/PolicyHub.Entities.Tests.csproj +++ b/tests/database/PolicyHub.Entities.Tests/PolicyHub.Entities.Tests.csproj @@ -32,12 +32,12 @@ - - + + - + diff --git a/tests/hub/PolicyHub.Service.Tests/PolicyHub.Service.Tests.csproj b/tests/hub/PolicyHub.Service.Tests/PolicyHub.Service.Tests.csproj index ba58f5f..7edfe95 100644 --- a/tests/hub/PolicyHub.Service.Tests/PolicyHub.Service.Tests.csproj +++ b/tests/hub/PolicyHub.Service.Tests/PolicyHub.Service.Tests.csproj @@ -32,9 +32,9 @@ - - - + + +