Merge pull request #11 from IliyanIlievPH/10

Closes #10
OpenMAVN · Jul 21, 2020 · 2f21c11 · 2f21c11
2 parents defed2a + 8f116b9
commit 2f21c11
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 40 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 2.2.207
+          dotnet-version: 3.1.302
       - name: Install dependencies
         run: dotnet restore
       - name: Build solution

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.2.207
+        dotnet-version: 3.1.302
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/client/MAVN.Service.SmsProviderMock.Client/MAVN.Service.SmsProviderMock.Client.csproj b/client/MAVN.Service.SmsProviderMock.Client/MAVN.Service.SmsProviderMock.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Version>1.0.0</Version>
@@ -14,8 +14,8 @@
     <None Remove="Lykke.Service.SmsProviderMock.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.HttpClientGenerator" Version="3.1.0" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
     <PackageReference Include="MAVN.Service.NotificationSystemBroker.SmsProviderClient" Version="1.1.1" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.SmsProviderMock.Domain/MAVN.Service.SmsProviderMock.Domain.csproj b/src/MAVN.Service.SmsProviderMock.Domain/MAVN.Service.SmsProviderMock.Domain.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...Service.SmsProviderMock.DomainServices/MAVN.Service.SmsProviderMock.DomainServices.csproj b/...Service.SmsProviderMock.DomainServices/MAVN.Service.SmsProviderMock.DomainServices.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...e.SmsProviderMock.MsSqlRepositories/MAVN.Service.SmsProviderMock.MsSqlRepositories.csproj b/...e.SmsProviderMock.MsSqlRepositories/MAVN.Service.SmsProviderMock.MsSqlRepositories.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
 
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Repositories/SmsRepository.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/Repositories/SmsRepository.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Common.Log;
 using Lykke.Common.Log;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.SmsProviderMock.Domain.Entities;
 using MAVN.Service.SmsProviderMock.Domain.Models;
 using MAVN.Service.SmsProviderMock.Domain.Repositories;
@@ -15,10 +15,10 @@ namespace MAVN.Service.SmsProviderMock.MsSqlRepositories.Repositories
 {
     public class SmsRepository : ISmsRepository
     {
-        private readonly MsSqlContextFactory<SmsContext> _contextFactory;
+        private readonly PostgreSQLContextFactory<SmsContext> _contextFactory;
         private readonly ILog _log;
 
-        public SmsRepository(MsSqlContextFactory<SmsContext> contextFactory, ILogFactory logFactory)
+        public SmsRepository(PostgreSQLContextFactory<SmsContext> contextFactory, ILogFactory logFactory)
         {
             _contextFactory = contextFactory;
             _log = logFactory.CreateLog(this);

diff --git a/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/SmsContext.cs b/src/MAVN.Service.SmsProviderMock.MsSqlRepositories/SmsContext.cs
@@ -1,12 +1,12 @@
-using System.Data.Common;
+using System.Data.Common;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.SmsProviderMock.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.SmsProviderMock.MsSqlRepositories
 {
-    public class SmsContext : MsSqlContext
+    public class SmsContext : PostgreSQLContext
     {
         private const string Schema = "sms";
 
@@ -29,7 +29,7 @@ public SmsContext(DbConnection dbConnection)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             var smsEntityBuilder = modelBuilder.Entity<SmsEntity>();
 

diff --git a/src/MAVN.Service.SmsProviderMock/Dockerfile b/src/MAVN.Service.SmsProviderMock/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime
+FROM microsoft/dotnet:3.1-aspnetcore-runtime
 WORKDIR /app
 COPY . .
 ENTRYPOINT ["dotnet", "MAVN.Service.SmsProviderMock.dll"]
diff --git a/src/MAVN.Service.SmsProviderMock/MAVN.Service.SmsProviderMock.csproj b/src/MAVN.Service.SmsProviderMock/MAVN.Service.SmsProviderMock.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <Version>1.0.0</Version>
   </PropertyGroup>
@@ -23,10 +23,9 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Lykke.Common.ApiLibrary" Version="2.4.1" />
-    <PackageReference Include="Lykke.Sdk" Version="5.14.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+    <PackageReference Include="Lykke.Logs" Version="7.4.0" />
+    <PackageReference Include="LykkeBiz.Sdk" Version="5.18.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\client\MAVN.Service.SmsProviderMock.Client\MAVN.Service.SmsProviderMock.Client.csproj" />

diff --git a/src/MAVN.Service.SmsProviderMock/Modules/DataLayerModule.cs b/src/MAVN.Service.SmsProviderMock/Modules/DataLayerModule.cs
@@ -1,7 +1,7 @@
-using Autofac;
+using Autofac;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
 using Lykke.SettingsReader;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.SmsProviderMock.Domain.Repositories;
 using MAVN.Service.SmsProviderMock.MsSqlRepositories;
 using MAVN.Service.SmsProviderMock.MsSqlRepositories.Repositories;
@@ -21,7 +21,7 @@ public DataLayerModule(IReloadingManager<AppSettings> appSettings)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(
+            builder.RegisterPostgreSQL(
                 _connectionString,
                 connString => new SmsContext(connString, false),
                 dbConn => new SmsContext(dbConn));

diff --git a/src/MAVN.Service.SmsProviderMock/Startup.cs b/src/MAVN.Service.SmsProviderMock/Startup.cs
@@ -1,28 +1,35 @@
-using System;
+using System;
+using Autofac;
 using AutoMapper;
 using JetBrains.Annotations;
 using Lykke.Common.ApiLibrary.Filters;
 using Lykke.Sdk;
+using Lykke.SettingsReader;
 using MAVN.Service.SmsProviderMock.Profiles;
 using MAVN.Service.SmsProviderMock.Settings;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace MAVN.Service.SmsProviderMock
 {
     [UsedImplicitly]
     public class Startup
     {
+        private IConfigurationRoot _configurationRoot;
+        private IReloadingManager<AppSettings> _settingsManager;
         private readonly LykkeSwaggerOptions _swaggerOptions = new LykkeSwaggerOptions
         {
             ApiTitle = "SmsProviderMock API",
             ApiVersion = "v1"
         };
 
         [UsedImplicitly]
-        public IServiceProvider ConfigureServices(IServiceCollection services)
+        public void ConfigureServices(IServiceCollection services)
         {
-            return services.BuildServiceProvider<AppSettings>(options =>
+            services.AddMvc().AddNewtonsoftJson();
+            (_configurationRoot, _settingsManager) = services.BuildServiceProvider<AppSettings>(options =>
             {
                 options.Extend = (serviceCollection, settings) =>
                 {
@@ -38,13 +45,28 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                     logs.AzureTableName = "SmsProviderMockLog";
                     logs.AzureTableConnectionStringResolver = settings => settings.SmsProviderMockService.Db.LogsConnString;
                 };
+
             });
         }
 
         [UsedImplicitly]
-        public void Configure(IApplicationBuilder app, IMapper mapper)
+        public void ConfigureContainer(ContainerBuilder builder)
+        {
+            {
+                builder.ConfigureLykkeContainer(
+                    _configurationRoot,
+                    _settingsManager);
+            }
+        }
+
+        [UsedImplicitly]
+        public void Configure(
+            IApplicationBuilder app,
+            IMapper mapper,
+            IApplicationLifetime appLifetime)
         {
-            app.UseLykkeConfiguration(options =>
+            app.UseRouting().UseEndpoints(endpoints => { endpoints.MapControllers(); });
+            app.UseLykkeConfiguration(appLifetime, options =>
             {
                 options.SwaggerOptions = _swaggerOptions;
             });

diff --git a/tests/MAVN.Service.SmsProviderMock.Tests/MAVN.Service.SmsProviderMock.Tests.csproj b/tests/MAVN.Service.SmsProviderMock.Tests/MAVN.Service.SmsProviderMock.Tests.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1">
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>