116: Moved common packages to SOFTURE project

jarmatys · Sep 21, 2024 · 7c25f95 · 7c25f95
1 parent 7586af0
commit 7c25f95
Show file tree

Hide file tree

Showing 31 changed files with 29 additions and 279 deletions.
diff --git a/API/ASSISTENTE.API/ASSISTENTE.API.csproj b/API/ASSISTENTE.API/ASSISTENTE.API.csproj
@@ -19,12 +19,12 @@
         <PackageReference Include="FastEndpoints.Swagger" Version="5.26.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1"/>
         <PackageReference Include="NSwag.AspNetCore" Version="14.0.7" />
+        <PackageReference Include="SOFTURE.Common.Authentication" Version="0.0.10" />
+        <PackageReference Include="SOFTURE.Common.Observability" Version="0.0.10" />
         <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.5.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\ASSISTENTE.Common.Authentication\ASSISTENTE.Common.Authentication.csproj" />
-      <ProjectReference Include="..\ASSISTENTE.Common.Observability\ASSISTENTE.Common.Observability.csproj" />
       <ProjectReference Include="..\ASSISTENTE.Contract.Requests.Internal\ASSISTENTE.Contract.Requests.Internal.csproj" />
       <ProjectReference Include="..\ASSISTENTE.Module\ASSISTENTE.Module.csproj" />
     </ItemGroup>

diff --git a/API/ASSISTENTE.API/ApiSettings.cs b/API/ASSISTENTE.API/ApiSettings.cs
@@ -1,12 +1,12 @@
 using ASSISTENTE.Client.Internal.Settings;
-using ASSISTENTE.Common.Authentication.Settings;
-using ASSISTENTE.Common.Observability.Settings;
 using ASSISTENTE.Infrastructure.Embeddings.Settings;
 using ASSISTENTE.Infrastructure.LLM.Settings;
 using ASSISTENTE.Infrastructure.Qdrant.Settings;
 using ASSISTENTE.Module;
 using ASSISTENTE.Persistence.Configuration.Settings;
+using SOFTURE.Common.Authentication.Settings;
 using SOFTURE.Common.Logging.Settings;
+using SOFTURE.Common.Observability.Settings;
 using SOFTURE.MessageBroker.Rabbit.Settings;
 
 namespace ASSISTENTE.API;

diff --git a/API/ASSISTENTE.API/Common/Extensions/CommonExtensions.cs b/API/ASSISTENTE.API/Common/Extensions/CommonExtensions.cs
@@ -1,10 +1,10 @@
-using ASSISTENTE.Common.Authentication;
-using ASSISTENTE.Common.Authentication.Settings;
-using ASSISTENTE.Common.Observability;
-using ASSISTENTE.Common.Observability.Settings;
+using SOFTURE.Common.Authentication;
+using SOFTURE.Common.Authentication.Settings;
 using SOFTURE.Common.Correlation;
 using SOFTURE.Common.Logging;
 using SOFTURE.Common.Logging.Settings;
+using SOFTURE.Common.Observability;
+using SOFTURE.Common.Observability.Settings;
 using SOFTURE.MessageBroker.Rabbit;
 using SOFTURE.MessageBroker.Rabbit.Settings;
 using SOFTURE.Settings.Extensions;

diff --git a/API/ASSISTENTE.API/Program.cs b/API/ASSISTENTE.API/Program.cs
@@ -1,7 +1,7 @@
 using ASSISTENTE.API;
 using ASSISTENTE.API.Common.Extensions;
-using ASSISTENTE.Common.Observability;
 using SOFTURE.Common.HealthCheck;
+using SOFTURE.Common.Observability;
 using SOFTURE.Settings.Extensions;
 
 var configuration = new ConfigurationBuilder()

diff --git a/API/ASSISTENTE.Application/Handlers/Bases/QuestionCommandBase.cs b/API/ASSISTENTE.Application/Handlers/Bases/QuestionCommandBase.cs
@@ -10,7 +10,7 @@
 namespace ASSISTENTE.Application.Handlers.Bases;
 
 public abstract class QuestionCommandBase<TCommand>(
-    ILogger logger,
+    ILogger<TCommand> logger,
     IAssistenteClientInternal clientInternal) : IRequestHandler<TCommand, Result>
     where TCommand : IRequest<Result>
 {

diff --git a/API/ASSISTENTE.Application/Handlers/Knowledge/Commands/LearnCommand.cs b/API/ASSISTENTE.Application/Handlers/Knowledge/Commands/LearnCommand.cs
@@ -21,7 +21,7 @@ public static LearnCommand Create()
     public class LearnCommandHandler(
         IFileParser fileParser, 
         IKnowledgeService knowledgeService,
-        ILogger logger)
+        ILogger<LearnCommandHandler> logger)
         : IRequestHandler<LearnCommand, Result>
     {
         public async Task<Result> Handle(LearnCommand request, CancellationToken cancellationToken)

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/CreateEmbeddingsCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/CreateEmbeddingsCommand.cs
@@ -29,7 +29,7 @@ public class CreateEmbeddingsCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger) : QuestionCommandBase<CreateEmbeddingsCommand>(logger, clientInternal)
+        ILogger<CreateEmbeddingsCommand> logger) : QuestionCommandBase<CreateEmbeddingsCommand>(logger, clientInternal)
     {
         protected override async Task<Result> HandleAsync(Question question)
             => await questionOrchestrator.CreateEmbedding(question);

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/CreateQuestionCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/CreateQuestionCommand.cs
@@ -25,7 +25,7 @@ public static CreateQuestionCommand Create(CreateQuestionRequest payload)
 
     public class CreateQuestionCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
-        ILogger logger)
+        ILogger<CreateQuestionCommand> logger)
         : IRequestHandler<CreateQuestionCommand, Result>
     {
         public async Task<Result> Handle(CreateQuestionCommand request, CancellationToken cancellationToken)

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/FindFilesCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/FindFilesCommand.cs
@@ -29,7 +29,7 @@ public class FindFilesCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger) : QuestionCommandBase<FindFilesCommand>(logger, clientInternal)
+        ILogger<FindFilesCommand> logger) : QuestionCommandBase<FindFilesCommand>(logger, clientInternal)
     {
         protected override async Task<Result> HandleAsync(Question question)
             => await questionOrchestrator.FindFiles(question);

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/FindResourcesCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/FindResourcesCommand.cs
@@ -29,7 +29,7 @@ public class FindResourcesCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger) : QuestionCommandBase<FindResourcesCommand>(logger, clientInternal)
+        ILogger<FindResourcesCommand> logger) : QuestionCommandBase<FindResourcesCommand>(logger, clientInternal)
     {
         protected override async Task<Result> HandleAsync(Question question)
             => await questionOrchestrator.FindResources(question);

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/GenerateAnswerCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/GenerateAnswerCommand.cs
@@ -29,7 +29,7 @@ public class GenerateAnswerCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger) : QuestionCommandBase<GenerateAnswerCommand>(logger, clientInternal)
+        ILogger<GenerateAnswerCommand> logger) : QuestionCommandBase<GenerateAnswerCommand>(logger, clientInternal)
     {
         protected override async Task<Result> HandleAsync(Question question)
             => await questionOrchestrator.GenerateAnswer(question);

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/NotifyQuestionReadinessCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/NotifyQuestionReadinessCommand.cs
@@ -28,7 +28,7 @@ public static NotifyQuestionReadinessCommand Create(QuestionId questionId)
     public class NotifyQuestionReadinessCommandHandler(
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger)
+        ILogger<NotifyQuestionReadinessCommand> logger)
         : IRequestHandler<NotifyQuestionReadinessCommand, Result>
     {
         public async Task<Result> Handle(NotifyQuestionReadinessCommand request, CancellationToken cancellationToken)

diff --git a/API/ASSISTENTE.Application/Handlers/Questions/Commands/ResolveContextCommand.cs b/API/ASSISTENTE.Application/Handlers/Questions/Commands/ResolveContextCommand.cs
@@ -29,7 +29,7 @@ public class ResolveQuestionCommandHandler(
         IQuestionOrchestrator questionOrchestrator,
         IQuestionRepository questionRepository,
         IAssistenteClientInternal clientInternal,
-        ILogger logger) : QuestionCommandBase<ResolveContextCommand>(logger, clientInternal)
+        ILogger<ResolveContextCommand> logger) : QuestionCommandBase<ResolveContextCommand>(logger, clientInternal)
     {
         protected override async Task<Result> HandleAsync(Question question)
             => await questionOrchestrator.ResolveContext(question);

diff --git a/API/ASSISTENTE.Common.Authentication/ASSISTENTE.Common.Authentication.csproj b/API/ASSISTENTE.Common.Authentication/ASSISTENTE.Common.Authentication.csproj
diff --git a/API/ASSISTENTE.Common.Authentication/DependencyInjection.cs b/API/ASSISTENTE.Common.Authentication/DependencyInjection.cs
diff --git a/API/ASSISTENTE.Common.Authentication/Settings/AuthenticationSettings.cs b/API/ASSISTENTE.Common.Authentication/Settings/AuthenticationSettings.cs
diff --git a/API/ASSISTENTE.Common.Authentication/Settings/IAuthenticationSettings.cs b/API/ASSISTENTE.Common.Authentication/Settings/IAuthenticationSettings.cs
diff --git a/API/ASSISTENTE.Common.Observability/ASSISTENTE.Common.Observability.csproj b/API/ASSISTENTE.Common.Observability/ASSISTENTE.Common.Observability.csproj
diff --git a/API/ASSISTENTE.Common.Observability/DependencyInjection.cs b/API/ASSISTENTE.Common.Observability/DependencyInjection.cs
diff --git a/API/ASSISTENTE.Common.Observability/DiagnosticConfig.cs b/API/ASSISTENTE.Common.Observability/DiagnosticConfig.cs
diff --git a/API/ASSISTENTE.Common.Observability/Settings/IObservabilitySettings.cs b/API/ASSISTENTE.Common.Observability/Settings/IObservabilitySettings.cs
diff --git a/API/ASSISTENTE.Common.Observability/Settings/ObservabilitySettings.cs b/API/ASSISTENTE.Common.Observability/Settings/ObservabilitySettings.cs
diff --git a/API/ASSISTENTE.Common.Resilience/ASSISTENTE.Common.Resilience.csproj b/API/ASSISTENTE.Common.Resilience/ASSISTENTE.Common.Resilience.csproj
diff --git a/API/ASSISTENTE.Common.Resilience/DependencyInjection.cs b/API/ASSISTENTE.Common.Resilience/DependencyInjection.cs
diff --git a/API/ASSISTENTE.UI.Http/ASSISTENTE.UI.Http.csproj b/API/ASSISTENTE.UI.Http/ASSISTENTE.UI.Http.csproj
@@ -7,10 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\ASSISTENTE.Common.Resilience\ASSISTENTE.Common.Resilience.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
       <PackageReference Include="SOFTURE.Common.Correlation" Version="0.0.5" />
     </ItemGroup>