Merge pull request #22 from granstel/refactoring-mapping

Refactoring mapping

Author: granstel

src/FillInTheTextBot.Api/DI/ConfigurationRegistration.cs

@@ -0,0 +1,20 @@
+using FillInTheTextBot.Services.Configuration;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FillInTheTextBot.Api.DI
+{
+    internal static class ConfigurationRegistration
+    {
+        internal static void AddAppConfiguration(this IServiceCollection services, IConfiguration appConfiguration)
+        {
+            var configuration = appConfiguration.GetSection($"{nameof(AppConfiguration)}").Get<AppConfiguration>();
+
+            services.AddSingleton(configuration);
+            services.AddSingleton(configuration.HttpLog);
+            services.AddSingleton(configuration.Redis);
+            services.AddSingleton(configuration.DialogflowScopes);
+            services.AddSingleton(configuration.Tracing);
+        }
+    }
+}

src/FillInTheTextBot.Api/DI/ExternalServicesRegistration.cs

@@ -6,6 +6,7 @@
 using FillInTheTextBot.Services.Configuration;
 using Google.Apis.Auth.OAuth2;
 using Google.Cloud.Dialogflow.V2;
+using GranSteL.Helpers.Redis;
 using GranSteL.Tools.ScopeSelector;
 using Grpc.Auth;
 using Jaeger;
@@ -28,6 +29,7 @@ internal static void AddExternalServices(this IServiceCollection services)
             services.AddSingleton(RegisterContextsClientScopes);
             services.AddSingleton(RegisterRedisClient);
             services.AddSingleton(RegisterTracer);
+            services.AddSingleton(RegisterCacheService);
 
             services.AddSingleton<IScopeBindingStorage, ScopeBindingStorage>();
         }
@@ -138,5 +140,16 @@ private static ITracer RegisterTracer(IServiceProvider provider)
             GlobalTracer.Register(tracer);
             return tracer;
         }
+        
+        private static IRedisCacheService RegisterCacheService(IServiceProvider provider)
+        {
+            var configuration = provider.GetService<RedisConfiguration>();
+
+            var db = provider.GetService<IDatabase>();
+
+            var service = new RedisCacheService(db, configuration?.KeyPrefix);
+
+            return service;
+        }
     }
 }

src/FillInTheTextBot.Api/DI/InternalServicesRegistration.cs

@@ -1,9 +1,5 @@
-using System;
-using FillInTheTextBot.Services;
-using FillInTheTextBot.Services.Configuration;
-using GranSteL.Helpers.Redis;
+using FillInTheTextBot.Services;
 using Microsoft.Extensions.DependencyInjection;
-using StackExchange.Redis;
 
 namespace FillInTheTextBot.Api.DI
 {
@@ -13,19 +9,6 @@ internal static void AddInternalServices(this IServiceCollection services)
         {
             services.AddTransient<IConversationService, ConversationService>();
             services.AddScoped<IDialogflowService, DialogflowService>();
-
-            services.AddSingleton(RegisterCacheService);
-        }
-
-        private static IRedisCacheService RegisterCacheService(IServiceProvider provider)
-        {
-            var configuration = provider.GetService<RedisConfiguration>();
-
-            var db = provider.GetService<IDatabase>();
-
-            var service = new RedisCacheService(db, configuration.KeyPrefix);
-
-            return service;
         }
     }
 }

src/FillInTheTextBot.Api/DI/MappingRegistration.cs

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.15.1</Version>
+    <Version>1.16.0</Version>
     <PackageReleaseNotes>net6.0</PackageReleaseNotes>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>

src/FillInTheTextBot.Api/DependencyConfiguration.cs

@@ -1,7 +1,11 @@
-using Microsoft.AspNetCore;
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using NLog.Web;
 using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
 
 namespace FillInTheTextBot.Api
 {
@@ -19,7 +23,7 @@ public static IWebHost BuildWebHost(string[] args)
             var hostingStartupAssemblies = builder.GetSetting(WebHostDefaults.HostingStartupAssembliesKey) ?? string.Empty;
             var hostingStartupAssembliesList = hostingStartupAssemblies.Split(';');
 
-            var names = DependencyConfiguration.GetAssembliesNames();
+            var names = GetAssembliesNames();
             var fullList = hostingStartupAssembliesList.Concat(names).Distinct().ToList();
             var concatenatedNames = string.Join(';', fullList);
 
@@ -32,5 +36,15 @@ public static IWebHost BuildWebHost(string[] args)
             return host;
         }
 
+        private static ICollection<string> GetAssembliesNames()
+        {
+            var callingAssemble = Assembly.GetCallingAssembly();
+
+            var names = callingAssemble.GetCustomAttributes<ApplicationPartAttribute>()
+                .Where(a => a.AssemblyName.Contains("FillInTheTextBot", StringComparison.InvariantCultureIgnoreCase))
+                .Select(a => a.AssemblyName).ToList();
+
+            return names;
+        }
     }
 }

src/FillInTheTextBot.Api/FillInTheTextBot.Api.csproj

@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
+using FillInTheTextBot.Api.DI;
 
 namespace FillInTheTextBot.Api
 {
@@ -34,7 +35,9 @@ public void ConfigureServices(IServiceCollection services)
                 o.LoggingFields = Microsoft.AspNetCore.HttpLogging.HttpLoggingFields.All;
             });
 
-            DependencyConfiguration.Configure(services, _configuration);
+            services.AddAppConfiguration(_configuration);
+            services.AddInternalServices();
+            services.AddExternalServices();
         }
 
 

src/FillInTheTextBot.Api/Program.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using FillInTheTextBot.Models;
+using MailRu.Marusia.Models;
+using MailRu.Marusia.Models.Buttons;
+using MailRu.Marusia.Models.Input;
+using MarusiaModels = MailRu.Marusia.Models;
+
+namespace FillInTheTextBot.Messengers.Marusia
+{
+    public static class MarusiaMapping
+    {
+        public static Models.Request ToRequest(this InputModel source)
+        {
+            if (source == null) return null;
+
+            var destinaton = new Models.Request();
+
+            destinaton.ChatHash = source.Session?.SkillId;
+            destinaton.UserHash = source.Session?.UserId;
+            destinaton.Text = source.Request?.OriginalUtterance;
+            destinaton.SessionId = source.Session?.SessionId;
+            destinaton.NewSession = source.Session?.New;
+            destinaton.Language = source.Meta?.Locale;
+            destinaton.HasScreen = string.Equals(source?.Session?.Application?.ApplicationType, MarusiaModels.ApplicationTypes.Mobile);
+            destinaton.ClientId = source?.Meta?.ClientId;
+            destinaton.Source = Source.Marusia;
+            destinaton.Appeal = Appeal.NoOfficial;
+
+            return destinaton;
+        }
+
+        public static OutputModel FillOutput(this InputModel source, OutputModel destination)
+        {
+            if (source == null) return null;
+            if (destination == null) return null;
+
+            destination.Session = source.Session;
+            destination.Version = source.Version;
+
+            return destination;
+        }
+
+        public static OutputModel ToOutput(this Models.Response source)
+        {
+            if (source == null) return null;
+
+            var destination = new OutputModel();
+
+            destination.Response = source.ToResponse();
+            destination.Session = source.ToSession();
+
+            return destination;
+        }
+
+        public static MarusiaModels.Response ToResponse(this Models.Response source)
+        {
+            if (source == null) return null;
+
+            var destination = new MarusiaModels.Response();
+
+            destination.Text = source.Text?.Replace(Environment.NewLine, "\n");
+            destination.Tts = source.AlternativeText?.Replace(Environment.NewLine, "\n");
+            destination.EndSession = source.Finished;
+            destination.Buttons = source.Buttons?.ToResponseButtons();
+
+            return destination;
+        }
+
+        public static Session ToSession(this Models.Response source)
+        {
+            if (source == null) return null;
+
+            var destination = new Session
+            {
+                UserId = source.UserHash
+            };
+
+            return destination;
+        }
+
+        public static ResponseButton[] ToResponseButtons(this ICollection<Models.Button> source)
+        {
+            if (source == null) return null;
+
+            var responseButtons = new List<ResponseButton>();
+
+            foreach (var button in source)
+            {
+                var responseButton = new ResponseButton();
+
+                responseButton.Title = button?.Text;
+                responseButton.Url = !string.IsNullOrEmpty(button?.Url) ? button?.Url : null;
+                responseButton.Hide = button.IsQuickReply;
+
+                responseButtons.Add(responseButton);
+            }
+
+            return responseButtons.ToArray();
+        }
+    }
+}