From 7ccf8cb01834b0ffb7f50d60cca2e0bfcfd65355 Mon Sep 17 00:00:00 2001
From: shept <sheptikhinv@gmail.com>
Date: Sat, 31 May 2025 01:32:50 +0500
Subject: [PATCH] Update SurveyLib and moved all AddScoped to DI methods

---
 SurveyBackend/SurveyBackend.API/Program.cs    | 24 ++++-------------
 .../DependencyInjection.cs                    | 16 +++++++++++
 .../DependencyInjection.cs                    | 27 +++++++++++++++++++
 SurveyLib                                     |  2 +-
 4 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 SurveyBackend/SurveyBackend.Infrastructure/DependencyInjection.cs
 create mode 100644 SurveyBackend/SurveyBackend.Services/DependencyInjection.cs

diff --git a/SurveyBackend/SurveyBackend.API/Program.cs b/SurveyBackend/SurveyBackend.API/Program.cs
index 4e09b03..49a209a 100644
--- a/SurveyBackend/SurveyBackend.API/Program.cs
+++ b/SurveyBackend/SurveyBackend.API/Program.cs
@@ -8,6 +8,7 @@ using SurveyBackend.Core.Contexts;
 using SurveyBackend.Core.Repositories;
 using SurveyBackend.Core.Services;
 using SurveyBackend.Filters;
+using SurveyBackend.Infrastructure;
 using SurveyBackend.Infrastructure.Data;
 using SurveyBackend.Infrastructure.Repositories;
 using SurveyBackend.Middlewares;
@@ -16,6 +17,7 @@ using SurveyBackend.Services.Helpers;
 using SurveyBackend.Services.Services;
 using SurveyLib.Core.Repositories;
 using SurveyLib.Core.Services;
+using SurveyLib.Infrastructure.EFCore;
 using SurveyLib.Infrastructure.EFCore.Data;
 using SurveyLib.Infrastructure.EFCore.Repositories;
 
@@ -40,25 +42,9 @@ public class Program
 
         builder.Services.AddScoped<IUserContext, UserContext>();
 
-        builder.Services.AddScoped<IUserRepository, UserRepository>();
-        builder.Services.AddScoped<IUserService, UserService>();
-
-        builder.Services.AddScoped<IPasswordHasher, Sha256PasswordHasher>();
-
-        builder.Services.AddScoped<IAuthorizationService, AuthorizationService>();
-
-        builder.Services.AddScoped<ISurveyRepository, SurveyRepository>();
-        builder.Services.AddScoped<IQuestionRepository, QuestionRepository>();
-        builder.Services.AddScoped<IAnswerVariantsRepository, AnswerVariantsRepository>();
-        builder.Services.AddScoped<ICompletionRepository, CompletionRepository>();
-        builder.Services.AddScoped<IAnswerRepository, AnswerRepository>();
-
-        builder.Services.AddScoped<ISurveyService, SurveyService>();
-        builder.Services.AddScoped<IQuestionService, QuestionService>();
-        builder.Services.AddScoped<IAnswerVariantsService, AnswerVariantsService>();
-        builder.Services.AddScoped<ICompletionService, CompletionService>();
-        builder.Services.AddScoped<IAnswerService, AnswerService>();
-
+        builder.Services.AddSurveyBackendInfrastructure();
+        builder.Services.AddSurveyLibInfrastructure();
+        builder.Services.AddSurveyBackendServices();
 
         builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             .AddJwtBearer(options =>
diff --git a/SurveyBackend/SurveyBackend.Infrastructure/DependencyInjection.cs b/SurveyBackend/SurveyBackend.Infrastructure/DependencyInjection.cs
new file mode 100644
index 0000000..896c129
--- /dev/null
+++ b/SurveyBackend/SurveyBackend.Infrastructure/DependencyInjection.cs
@@ -0,0 +1,16 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using SurveyBackend.Core.Repositories;
+using SurveyBackend.Infrastructure.Repositories;
+
+namespace SurveyBackend.Infrastructure;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddSurveyBackendInfrastructure(this IServiceCollection services)
+    {
+        services.AddScoped<IUserRepository, UserRepository>();
+        
+        return services;
+    }
+}
\ No newline at end of file
diff --git a/SurveyBackend/SurveyBackend.Services/DependencyInjection.cs b/SurveyBackend/SurveyBackend.Services/DependencyInjection.cs
new file mode 100644
index 0000000..6523f4f
--- /dev/null
+++ b/SurveyBackend/SurveyBackend.Services/DependencyInjection.cs
@@ -0,0 +1,27 @@
+using Microsoft.Extensions.DependencyInjection;
+using SurveyBackend.Core.Services;
+using SurveyBackend.Services.Helpers;
+using SurveyBackend.Services.Services;
+using SurveyLib.Core.Services;
+
+namespace SurveyBackend.Services;
+
+public static class DependencyInjection
+{
+    public static IServiceCollection AddSurveyBackendServices(this IServiceCollection services)
+    {
+        services.AddScoped<IUserService, UserService>();
+
+        services.AddScoped<IPasswordHasher, Sha256PasswordHasher>();
+
+        services.AddScoped<IAuthorizationService, AuthorizationService>();
+        
+        services.AddScoped<ISurveyService, SurveyService>();
+        services.AddScoped<IQuestionService, QuestionService>();
+        services.AddScoped<IAnswerVariantsService, AnswerVariantsService>();
+        services.AddScoped<ICompletionService, CompletionService>();
+        services.AddScoped<IAnswerService, AnswerService>();
+        
+        return services;
+    }
+}
\ No newline at end of file
diff --git a/SurveyLib b/SurveyLib
index f02a36d..d9f16ee 160000
--- a/SurveyLib
+++ b/SurveyLib
@@ -1 +1 @@
-Subproject commit f02a36dd85184c31a58e1d84081220a08b1c5d99
+Subproject commit d9f16ee761e31bb7af7a067c38f5fa02083f9d6c