Merge pull request #2 from granstel/remove-autofac

Remove autofac

src/GranSteL.Chatbot.Api/DependencyConfiguration.cs

@@ -1,72 +1,43 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Linq;
 using System.Reflection;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
 using GranSteL.Chatbot.Api.DependencyModules;
 using GranSteL.Chatbot.Services.Configuration;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GranSteL.Chatbot.Api
 {
     internal static class DependencyConfiguration
     {
-        internal static IContainer Configure(IServiceCollection services, IConfiguration appConfiguration)
+        internal static void Configure(IServiceCollection services, IConfiguration appConfiguration)
         {
-            var containerBuilder = new ContainerBuilder();
-
-            containerBuilder.Populate(services);
-
             var configuration = appConfiguration.GetSection($"{nameof(AppConfiguration)}").Get<AppConfiguration>();
 
-            containerBuilder.RegisterInstance(configuration).SingleInstance();
-            containerBuilder.RegisterInstance(configuration.HttpLog).SingleInstance();
-            containerBuilder.RegisterInstance(configuration.Redis).SingleInstance();
-            containerBuilder.RegisterInstance(configuration.Dialogflow).SingleInstance();
+            services.AddSingleton(configuration);
+            services.AddSingleton(configuration.HttpLog);
+            services.AddSingleton(configuration.Redis);
+            services.AddSingleton(configuration.Dialogflow);
 
-            containerBuilder.RegisterModule<InternalServicesModule>();
-            containerBuilder.RegisterModule<ExternalServicesModule>();
+            services.AddInternalServices();
+            services.AddExternalServices();
 
             var names = GetAssembliesNames();
-            containerBuilder.RegisterModule(new MappingModule(names));
-            RegisterFromMessengersAssemblies(containerBuilder, names);
-
-            return containerBuilder.Build();
+            services.AddMapping(names);
         }
 
-        private static void RegisterFromMessengersAssemblies(ContainerBuilder containerBuilder, string[] names)
-        {
-            foreach (var name in names)
-            {
-                var assembly = Assembly.Load(name);
-
-                containerBuilder.RegisterAssemblyModules(assembly);
-            }
-        }
 
-        private static string[] GetAssembliesNames()
+        public static ICollection<string> GetAssembliesNames()
         {
-            var result = new List<string>();
-
-            var files = Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "GranSteL.Chatbot*.dll");
-
-            foreach (var file in files)
-            {
-                var info = new FileInfo(file);
-
-                var name = info.Name.Replace(info.Extension, string.Empty);
-
-                if (name.Equals(AppDomain.CurrentDomain.FriendlyName, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    continue;
-                }
+            var callingAssemble = Assembly.GetCallingAssembly();
 
-                result.Add(name);
-            }
+            var names = callingAssemble.GetCustomAttributes<ApplicationPartAttribute>()
+                .Where(a => a.AssemblyName.Contains("GranSteL.Chatbot", StringComparison.InvariantCultureIgnoreCase))
+                .Select(a => a.AssemblyName).ToList();
 
-            return result.ToArray();
+            return names;
         }
     }
 }

src/GranSteL.Chatbot.Api/DependencyModules/ExternalServicesRegistration.cs

@@ -0,0 +1,61 @@
+using System;
+using Google.Apis.Auth.OAuth2;
+using Google.Cloud.Dialogflow.V2;
+using GranSteL.Chatbot.Services.Configuration;
+using GranSteL.Helpers.Redis;
+using Grpc.Auth;
+using Microsoft.Extensions.DependencyInjection;
+using StackExchange.Redis;
+
+namespace GranSteL.Chatbot.Api.DependencyModules
+{
+    internal static class ExternalServicesRegistration
+    {
+        internal static void AddExternalServices(this IServiceCollection services)
+        {
+            services.AddSingleton<SessionsClient>(RegisterDialogflowSessionsClient);
+
+            services.AddSingleton<IDatabase>(RegisterRedisClient);
+
+            services.AddSingleton<IRedisCacheService>(RegisterCacheService);
+        }
+
+        private static SessionsClient RegisterDialogflowSessionsClient(IServiceProvider provider)
+        {
+            var configuration = provider.GetService<DialogflowConfiguration>();
+
+            var credential = GoogleCredential.FromFile(configuration.JsonPath).CreateScoped(SessionsClient.DefaultScopes);
+
+            var clientBuilder = new SessionsClientBuilder
+            {
+                ChannelCredentials = credential.ToChannelCredentials()
+            };
+
+            var client = clientBuilder.Build();
+
+            return client;
+        }
+
+        private static IDatabase RegisterRedisClient(IServiceProvider provider)
+        {
+            var configuration = provider.GetService<RedisConfiguration>();
+
+            var redisClient = ConnectionMultiplexer.Connect(configuration.ConnectionString);
+
+            var dataBase = redisClient.GetDatabase();
+
+            return dataBase;
+        }
+
+        private static RedisCacheService RegisterCacheService(IServiceProvider provider)
+        {
+            var configuration = provider.GetService<RedisConfiguration>();
+
+            var db = provider.GetService<IDatabase>();
+
+            var service = new RedisCacheService(db, configuration.KeyPrefix);
+
+            return service;
+        }
+    }
+}

src/GranSteL.Chatbot.Api/DependencyModules/InternalServicesRegistration.cs

@@ -0,0 +1,14 @@
+using GranSteL.Chatbot.Services;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GranSteL.Chatbot.Api.DependencyModules
+{
+    internal static class InternalServicesRegistration
+    {
+        internal static void AddInternalServices(this IServiceCollection services)
+        {
+            services.AddTransient<IConversationService, ConversationService>();
+            services.AddScoped<IDialogflowService, DialogflowService>();
+        }
+    }
+}

src/GranSteL.Chatbot.Api/DependencyModules/MappingRegistration.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using AutoMapper;
+using GranSteL.Chatbot.Services.Mappings;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace GranSteL.Chatbot.Api.DependencyModules
+{
+    internal static class MappingRegistration
+    {
+        internal static void AddMapping(this IServiceCollection services, IEnumerable<string> names)
+        {
+            services.AddSingleton<IMapper>(p => new Mapper(new MapperConfiguration(c =>
+            {
+                c.AddMaps(names);
+
+                c.AddProfile<InternalMapping>();
+                c.AddProfile<DialogflowMapping>();
+            })));
+        }
+    }
+}

src/GranSteL.Chatbot.Api/GranSteL.Chatbot.Api.csproj

@@ -5,10 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="6.*" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.*" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.*" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.*" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.*" />
     <PackageReference Include="NLog" Version="4.*" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.*" />
   </ItemGroup>