Skip to content

Commit

Permalink
114: Moved Correlation package to SOFTURE project
Browse files Browse the repository at this point in the history
  • Loading branch information
@jarmatys
jarmatys committed Aug 13, 2024
1 parent dfe2b6e commit 15ace8c
Show file tree
Hide file tree
Showing 46 changed files with 47 additions and 143 deletions.
1 change: 0 additions & 1 deletion API/ASSISTENTE.API/ASSISTENTE.API.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

<ItemGroup>
<ProjectReference Include="..\ASSISTENTE.Common.Authentication\ASSISTENTE.Common.Authentication.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Correlation\ASSISTENTE.Common.Correlation.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Logging\ASSISTENTE.Common.Logging.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Observability\ASSISTENTE.Common.Observability.csproj" />
<ProjectReference Include="..\ASSISTENTE.Contract.Requests.Internal\ASSISTENTE.Contract.Requests.Internal.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion API/ASSISTENTE.API/Common/Extensions/CommonExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using ASSISTENTE.Common.Authentication;
using ASSISTENTE.Common.Authentication.Settings;
using ASSISTENTE.Common.Correlation;
using ASSISTENTE.Common.Logging;
using ASSISTENTE.Common.Logging.Settings;
using ASSISTENTE.Common.Observability;
using ASSISTENTE.Common.Observability.Settings;
using ASSISTENTE.MessageBroker.Rabbit;
using ASSISTENTE.MessageBroker.Rabbit.Settings;
using SOFTURE.Common.Correlation;
using SOFTURE.Settings.Extensions;

namespace ASSISTENTE.API.Common.Extensions;
Expand Down
8 changes: 4 additions & 4 deletions API/ASSISTENTE.API/Common/Middlewares/RequestContextLoggingMiddleware.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using ASSISTENTE.Common.Correlation.Consts;
using ASSISTENTE.Common.Correlation.Generators;
using ASSISTENTE.Common.Correlation.Providers;
using ASSISTENTE.Common.Correlation.ValueObjects;
using Serilog.Context;
using SOFTURE.Common.Correlation.Consts;
using SOFTURE.Common.Correlation.Generators;
using SOFTURE.Common.Correlation.Providers;
using SOFTURE.Common.Correlation.ValueObjects;

namespace ASSISTENTE.API.Common.Middlewares;

Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.Application.Abstractions/ASSISTENTE.Application.Abstractions.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Application.Middlewares/ASSISTENTE.Application.Middlewares.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Client.Internal/ASSISTENTE.Client.Internal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Common.Authentication/ASSISTENTE.Common.Authentication.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

</Project>
14 changes: 0 additions & 14 deletions API/ASSISTENTE.Common.Correlation/ASSISTENTE.Common.Correlation.csproj
View file

This file was deleted.

6 changes: 0 additions & 6 deletions API/ASSISTENTE.Common.Correlation/Consts/CorrelationConsts.cs
View file

This file was deleted.

15 changes: 0 additions & 15 deletions API/ASSISTENTE.Common.Correlation/DependencyInjection.cs
View file

This file was deleted.

8 changes: 0 additions & 8 deletions API/ASSISTENTE.Common.Correlation/Generators/CorrelationGenerator.cs
View file

This file was deleted.

18 changes: 0 additions & 18 deletions API/ASSISTENTE.Common.Correlation/Providers/CorrelationProvider.cs
View file

This file was deleted.

10 changes: 0 additions & 10 deletions API/ASSISTENTE.Common.Correlation/ValueObjects/CorrelationId.cs
View file

This file was deleted.

4 changes: 2 additions & 2 deletions API/ASSISTENTE.Common.Logging/ASSISTENTE.Common.Logging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.0"/>
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Common.Observability/ASSISTENTE.Common.Observability.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Contract.Messages.Internal/ASSISTENTE.Contract.Messages.Internal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.7" />
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Contract.Requests.Internal/ASSISTENTE.Contract.Requests.Internal.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.4" />
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.9" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion API/ASSISTENTE.DB.Upgrade/ASSISTENTE.DB.Upgrade.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Npgsql" Version="8.0.3" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Domain/ASSISTENTE.Domain.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="MediatR.Contracts" Version="2.0.1" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="Stateless" Version="5.16.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Infrastructure.CodeParser/ASSISTENTE.Infrastructure.CodeParser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.9.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.Infrastructure.Embeddings/ASSISTENTE.Infrastructure.Embeddings.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="OpenAI-DotNet" Version="8.1.0" />
<PackageReference Include="SharpToken" Version="2.0.1" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.Infrastructure.LLM/ASSISTENTE.Infrastructure.LLM.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="OpenAI-DotNet" Version="8.1.0" />
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Infrastructure.MarkDownParser/ASSISTENTE.Infrastructure.MarkDownParser.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Markdig" Version="0.35.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...SSISTENTE.Infrastructure.PromptGenerator/ASSISTENTE.Infrastructure.PromptGenerator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions API/ASSISTENTE.Infrastructure.Qdrant/ASSISTENTE.Infrastructure.Qdrant.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<ItemGroup>
<PackageReference Include="Qdrant.Client" Version="1.8.0" />
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion API/ASSISTENTE.Language/ASSISTENTE.Language.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Language.Common" Version="0.0.4" />
<PackageReference Include="SOFTURE.Language.Common" Version="0.0.9" />
</ItemGroup>

</Project>
7 changes: 2 additions & 5 deletions API/ASSISTENTE.MessageBroker.Rabbit/ASSISTENTE.MessageBroker.Rabbit.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
<PackageReference Include="MassTransit" Version="8.2.1"/>
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.1"/>
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="SOFTURE.Common.Correlation" Version="0.0.5" />
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Results" Version="0.0.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ASSISTENTE.Common.Correlation\ASSISTENTE.Common.Correlation.csproj" />
<PackageReference Include="SOFTURE.Results" Version="0.0.9" />
</ItemGroup>

</Project>
9 changes: 4 additions & 5 deletions API/ASSISTENTE.MessageBroker.Rabbit/Filters/ContextConsumeLoggingFilter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using ASSISTENTE.Common.Correlation.Consts;
using ASSISTENTE.Common.Correlation.Generators;
using ASSISTENTE.Common.Correlation.Providers;
using ASSISTENTE.Common.Correlation.ValueObjects;
using MassTransit;

using SOFTURE.Common.Correlation.Consts;
using SOFTURE.Common.Correlation.Generators;
using SOFTURE.Common.Correlation.Providers;
using SOFTURE.Common.Correlation.ValueObjects;
using LogContext = Serilog.Context.LogContext;

namespace ASSISTENTE.MessageBroker.Rabbit.Filters;
Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.MessageBroker.Rabbit/Filters/ContextPublishLoggingFilter.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ASSISTENTE.Common.Correlation.Consts;
using ASSISTENTE.Common.Correlation.Providers;
using MassTransit;
using SOFTURE.Common.Correlation.Consts;
using SOFTURE.Common.Correlation.Providers;

namespace ASSISTENTE.MessageBroker.Rabbit.Filters;

Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.Persistence.Configuration/ASSISTENTE.Persistence.Configuration.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1"/>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0"/>
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.2" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.7" />
<PackageReference Include="SOFTURE.Common.HealthCheck" Version="0.0.4" />
<PackageReference Include="SOFTURE.Settings" Version="0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions API/ASSISTENTE.UI.Brokers/ASSISTENTE.UI.Brokers.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0"/>
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.4" />
<PackageReference Include="SOFTURE.Language.Common" Version="0.0.4" />
<PackageReference Include="SOFTURE.Contract.Common" Version="0.0.9" />
<PackageReference Include="SOFTURE.Language.Common" Version="0.0.9" />
</ItemGroup>

</Project>
5 changes: 4 additions & 1 deletion API/ASSISTENTE.UI.Http/ASSISTENTE.UI.Http.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ASSISTENTE.Common.Correlation\ASSISTENTE.Common.Correlation.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Resilience\ASSISTENTE.Common.Resilience.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SOFTURE.Common.Correlation" Version="0.0.5" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions API/ASSISTENTE.UI.Http/Middlewares/RequestContextLoggingMiddleware.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using ASSISTENTE.Common.Correlation.Consts;
using ASSISTENTE.Common.Correlation.Generators;
using SOFTURE.Common.Correlation.Consts;
using SOFTURE.Common.Correlation.Generators;

namespace ASSISTENTE.UI.Http.Middlewares;

Expand Down
1 change: 0 additions & 1 deletion API/ASSISTENTE.Worker.Sync/ASSISTENTE.Worker.Sync.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</Target>

<ItemGroup>
<ProjectReference Include="..\ASSISTENTE.Common.Correlation\ASSISTENTE.Common.Correlation.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Logging\ASSISTENTE.Common.Logging.csproj" />
<ProjectReference Include="..\ASSISTENTE.Common.Observability\ASSISTENTE.Common.Observability.csproj" />
<ProjectReference Include="..\ASSISTENTE.Contract.Messages.Internal\ASSISTENTE.Contract.Messages.Internal.csproj" />
Expand Down
2 changes: 0 additions & 2 deletions API/ASSISTENTE.Worker.Sync/Common/Bases/ResultConsumerBase.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
using System.Threading.Tasks;
using ASSISTENTE.Worker.Sync.Common.Exceptions;
using CSharpFunctionalExtensions;
using MassTransit;
using MediatR;
using Microsoft.Extensions.Logging;
using SOFTURE.Contract.Common.Messaging;

namespace ASSISTENTE.Worker.Sync.Common.Bases;
Expand Down
2 changes: 0 additions & 2 deletions API/ASSISTENTE.Worker.Sync/Common/Exceptions/ConsumeException.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using System;

namespace ASSISTENTE.Worker.Sync.Common.Exceptions;

internal sealed class ConsumeException(string message) : Exception($"Consumed failed: {message}");
Loading

0 comments on commit 15ace8c

Please sign in to comment.