Вынес переменные для подключения к БД в environment.json. Сделал подг…

…рузку этих переменных на старте приложения. Попытка установить dotnet-fm и накатывать миграции (пока неудачно)

docker/core/Dockerfile

@@ -2,4 +2,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:2.2
 
 WORKDIR /app
 
+# Cli для миграций
+RUN dotnet tool install -g FluentMigrator.DotNet.Cli
+
 CMD ["dotnet", "run"]

src/Application/Http/Token/TokenController.cs

@@ -1,3 +1,4 @@
+using app.Infrastructure.NHibernate;
 using Microsoft.AspNetCore.Mvc;
 
 namespace app.Application.Http.Token
@@ -10,8 +11,7 @@ public class TokenController : Controller
         public JsonResult Index()
         {
             var foo = new Foo();
-
-            return Json("Ok!");
+            return Json(DbAccessor.ConnectionString);
         }
     }
 }

src/DependencyInjection/Kernel.cs

@@ -1,7 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using app.DependencyInjection.ServiceRecorder;
+using app.Infrastructure.NHibernate;
+using FluentMigrator.Runner;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 
 namespace app.DependencyInjection
 {
@@ -10,9 +15,16 @@ namespace app.DependencyInjection
     /// </summary>
     public class Kernel : AbstractAssemblyAware
     {
+        /// <summary>
+        /// По дефолту, файл с переменными окружения.
+        /// </summary>
+        private const string EnvFile = "environment.json";
+
         public static void Boot(IServiceCollection services)
         {
+            RegisterEnvironment();
             RecordServices(services);
+            RegisterMigrations(services);
         }
 
         /// <summary>
@@ -30,5 +42,31 @@ private static void RecordServices(IServiceCollection services)
                     .Invoke(Activator.CreateInstance(recorder), new object[] { services });
             }
         }
+
+        /// <summary>
+        /// Регистрирует все перменные окружения из файла environment.json (по-умолчанию).
+        /// </summary>
+        private static void RegisterEnvironment()
+        {
+            using (var reader = new StreamReader(EnvFile))
+            {
+                var json = JsonConvert.DeserializeObject<Dictionary<string, string>>(reader.ReadToEnd());
+
+                foreach (var (key, value) in json)
+                {
+                    Environment.SetEnvironmentVariable(key, value);
+                }
+            }
+        }
+
+        private static void RegisterMigrations(IServiceCollection services)
+        {
+            services.AddFluentMigratorCore()
+                .ConfigureRunner(runner => runner
+                    .AddPostgres()
+                    .WithGlobalConnectionString(DbAccessor.ConnectionString)
+                    .ScanIn(GetAssembly()).For.Migrations())
+                .AddLogging(logBuilder => logBuilder.AddFluentMigratorConsole());
+        }
     }
 }

src/DependencyInjection/ServiceRecorder/InjectedAttributeRecorder/InjectedAttributeRecorder.cs

@@ -1,14 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Reflection;
 using app.Common.Annotation;
-using app.Infrastructure.NHibernate.Repository;
 using FluentNHibernate.Conventions;
-using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.IdentityModel.Tokens.Saml;
 
 namespace app.DependencyInjection.ServiceRecorder.InjectedAttributeRecorder
 {
@@ -23,7 +19,7 @@ private IEnumerable<TypeInfo> FindClasses()
         {
             return GetAssembly()
                 .DefinedTypes
-                .Where(type => { return !type.IsInterface && GetFieldsWithInjected(type).IsNotEmpty(); });
+                .Where(type => !type.IsInterface && GetPropertiesWithInjectedAttribute(type).IsNotEmpty());
         }
 
         /// <summary>
@@ -34,7 +30,7 @@ private void TryInjectServices(IEnumerable<TypeInfo> classes, IServiceProvider p
         {
             foreach (var @class in classes)
             {
-                var properties = GetFieldsWithInjected(@class);
+                var properties = GetPropertiesWithInjectedAttribute(@class);
 
                 foreach (var property in properties)
                 {
@@ -54,9 +50,9 @@ private void InjectProperty(object @class, PropertyInfo property, IServiceProvid
             try
             {
                 var propertyType = property.PropertyType;
-                var service = provider.GetService(propertyType) ?? Activator.CreateInstance(propertyType);
-//                It doesn't work. Idk
-//                property.SetValue(@class, service);
+                //var service = provider.GetService(propertyType) ?? Activator.CreateInstance(propertyType);
+                // todo: Not working. Fix in future.
+                //  property.SetValue(@class, service);
             }
             catch (Exception e)
             {
@@ -71,10 +67,10 @@ private void InjectProperty(object @class, PropertyInfo property, IServiceProvid
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        private IEnumerable<PropertyInfo> GetFieldsWithInjected(TypeInfo type)
+        private IEnumerable<PropertyInfo> GetPropertiesWithInjectedAttribute(TypeInfo type)
         {
             return type.GetRuntimeProperties()
-                .Where(field => field.GetCustomAttributes().Contains(new InjectedAttribute()));
+                .Where(prop => prop.GetCustomAttributes().Contains(new InjectedAttribute()));
         }
 
         protected override IEnumerable<AbstractServiceRecorder> GetDependencies()

src/Infrastructure/NHibernate/DbAccessor.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace app.Infrastructure.NHibernate
+{
+    /// <summary>
+    /// Класс, знающий о данных для подключения к БД.
+    /// Данные задаются в файле environment.json (по умолчанию)
+    /// </summary>
+    public static class DbAccessor
+    {
+        // Хост базы данных
+        public static string Host { get; } = Environment.GetEnvironmentVariable("DB_HOST");
+
+        // Имя базы данных
+        public static string Database { get; } = Environment.GetEnvironmentVariable("DB_NAME");
+
+        // Пользовать
+        public static string User { get; } = Environment.GetEnvironmentVariable("DB_USER");
+
+        // Пароль
+        public static string Password { get; } = Environment.GetEnvironmentVariable("DB_PASSWORD");
+
+        // Готовая страка для connecion к БД.
+        public static string ConnectionString { get; } = $"Server={Host};Port=5432;Database={Database};User Id={User};Password={Password};";
+    }
+}

src/Infrastructure/NHibernate/NHibernateHelper.cs

@@ -5,8 +5,6 @@
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
 using NHibernate;
-using NHibernate.Criterion;
-using NHibernate.Tool.hbm2ddl;
 
 namespace app.Infrastructure.NHibernate
 {
@@ -28,14 +26,13 @@ private static ISessionFactory SessionFactory
                                 .PostgreSQL82
                                 //Понятия не имею что это и для чего. Но без этого не работает ¯\_(ツ)_/¯
                                 .Raw("hbm2ddl.keywords", "none")
-                                .ConnectionString(
-                                    "Server=localhost;Port=5432;Database=zobor;User Id=root;Password=root;"));
+                                .ConnectionString(DbAccessor.ConnectionString));
 
                         RegisterEntitiesRecursively(fluentConfiguration, typeof(AbstractEntity));
 
                         _sessionFactory = fluentConfiguration
-                            .ExposeConfiguration(cfg => new SchemaUpdate(cfg)
-                                .Execute(false, true))
+//                            .ExposeConfiguration(cfg => new SchemaUpdate(cfg)
+//                                .Execute(false, true))
                             .BuildSessionFactory();
                     }
                 }

src/app.csproj

@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentMigrator" Version="3.2.1" />
     <PackageReference Include="FluentMigrator.Console" Version="3.2.1" />
     <PackageReference Include="FluentMigrator.Generator" Version="1.0.5" />
     <PackageReference Include="FluentMigrator.Runner" Version="3.2.1" />
     <PackageReference Include="FluentMigrator.Runner.Core" Version="3.2.1" />
     <PackageReference Include="FluentMigrator.Runner.Postgres" Version="3.2.1" />
-    <PackageReference Include="FluentMigrator.Tools" Version="3.2.1" />
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />

src/appsettings.json

@@ -1,8 +1,8 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

src/bin/Debug/netcoreapp2.2/app.deps.json

@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v2.2",
-    "signature": "ae7c2cd254d45d86da10df44ece48b4b82c411e7"
+    "signature": "965cccb0f4eaf6579b8894c2090c598e8042a864"
   },
   "compilationOptions": {
     "defines": [
@@ -24,12 +24,12 @@
     ".NETCoreApp,Version=v2.2": {
       "app/1.0.0": {
         "dependencies": {
+          "FluentMigrator": "3.2.1",
           "FluentMigrator.Console": "3.2.1",
           "FluentMigrator.Generator": "1.0.5",
           "FluentMigrator.Runner": "3.2.1",
           "FluentMigrator.Runner.Core": "3.2.1",
           "FluentMigrator.Runner.Postgres": "3.2.1",
-          "FluentMigrator.Tools": "3.2.1",
           "FluentNHibernate": "2.1.2",
           "Microsoft.AspNetCore.App": "2.2.0",
           "Microsoft.AspNetCore.Razor.Design": "2.2.0",
@@ -354,7 +354,6 @@
           "lib/netstandard2.0/System.Data.SqlServerCe.dll": {}
         }
       },
-      "FluentMigrator.Tools/3.2.1": {},
       "FluentNHibernate/2.1.2": {
         "dependencies": {
           "NHibernate": "5.2.5"
@@ -3820,13 +3819,6 @@
       "path": "fluentmigrator.runner.sqlserverce/3.2.1",
       "hashPath": "fluentmigrator.runner.sqlserverce.3.2.1.nupkg.sha512"
     },
-    "FluentMigrator.Tools/3.2.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-UKbhx7uhGFRrt1BBIKTkMVbKlGjEkoufCwpbeP2Pe9LjTYW3olKtaIriGUhZ4K0IGiGZsWIdUwneNiJ+6gzvZQ==",
-      "path": "fluentmigrator.tools/3.2.1",
-      "hashPath": "fluentmigrator.tools.3.2.1.nupkg.sha512"
-    },
     "FluentNHibernate/2.1.2": {
       "type": "package",
       "serviceable": true,