Merge pull request #15 from IliyanIlievPH/14

Closes #14
OpenMAVN · Jul 20, 2020 · 8248d46 · 8248d46
2 parents 7e6b006 + 34a6827
commit 8248d46
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 36 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -53,7 +53,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.NotificationSystem.Client/MAVN.Service.NotificationSystem.Client.csproj b/client/MAVN.Service.NotificationSystem.Client/MAVN.Service.NotificationSystem.Client.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <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="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/...ficationSystem.AzureRepositories/MAVN.Service.NotificationSystem.AzureRepositories.csproj b/...ficationSystem.AzureRepositories/MAVN.Service.NotificationSystem.AzureRepositories.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/MAVN.Service.NotificationSystem.Domain/MAVN.Service.NotificationSystem.Domain.csproj b/src/MAVN.Service.NotificationSystem.Domain/MAVN.Service.NotificationSystem.Domain.csproj
@@ -1,6 +1,6 @@
 <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.NotificationSystem.DomainServices/MAVN.Service.NotificationSystem.DomainServices.csproj b/...e.NotificationSystem.DomainServices/MAVN.Service.NotificationSystem.DomainServices.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="MAVN.Service.NotificationSystemAdapter.Client" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/MAVN.Service.NotificationSystem.MsSqlRepositories/AutofacModule.cs b/src/MAVN.Service.NotificationSystem.MsSqlRepositories/AutofacModule.cs
@@ -1,5 +1,5 @@
-using Autofac;
-using MAVN.Common.MsSql;
+using Autofac;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.NotificationSystem.Domain.Repositories;
 
 namespace MAVN.Service.NotificationSystem.MsSqlRepositories
@@ -15,7 +15,7 @@ public AutofacModule(string connectionString)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(
+            builder.RegisterPostgreSQL(
                 _connectionString,
                 connString => new NotificationSystemContext(connString, false),
                 dbConn => new NotificationSystemContext(dbConn));

diff --git a/...ficationSystem.MsSqlRepositories/MAVN.Service.NotificationSystem.MsSqlRepositories.csproj b/...ficationSystem.MsSqlRepositories/MAVN.Service.NotificationSystem.MsSqlRepositories.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.NotificationSystem.Domain\MAVN.Service.NotificationSystem.Domain.csproj" />

diff --git a/src/MAVN.Service.NotificationSystem.MsSqlRepositories/NotificationSystemContext.cs b/src/MAVN.Service.NotificationSystem.MsSqlRepositories/NotificationSystemContext.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.NotificationSystem.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.NotificationSystem.MsSqlRepositories
 {
-    public class NotificationSystemContext : MsSqlContext
+    public class NotificationSystemContext : PostgreSQLContext
     {
         private const string Schema = "notification_system";
 
@@ -34,7 +34,7 @@ public NotificationSystemContext(DbConnection dbConnection)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<TemplateEntity>().HasIndex(x => x.Name).IsUnique();
         }

diff --git a/src/MAVN.Service.NotificationSystem.MsSqlRepositories/TemplateRepository.cs b/src/MAVN.Service.NotificationSystem.MsSqlRepositories/TemplateRepository.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.NotificationSystem.Domain.Models;
 using MAVN.Service.NotificationSystem.Domain.Repositories;
 using MAVN.Service.NotificationSystem.MsSqlRepositories.Entities;
@@ -11,9 +11,9 @@ namespace MAVN.Service.NotificationSystem.MsSqlRepositories
 {
     public class TemplateRepository : ITemplateRepository
     {
-        private readonly MsSqlContextFactory<NotificationSystemContext> _msSqlContextFactory;
+        private readonly PostgreSQLContextFactory<NotificationSystemContext> _msSqlContextFactory;
 
-        public TemplateRepository(MsSqlContextFactory<NotificationSystemContext> msSqlContextFactory)
+        public TemplateRepository(PostgreSQLContextFactory<NotificationSystemContext> msSqlContextFactory)
         {
             _msSqlContextFactory = msSqlContextFactory;
         }

diff --git a/src/MAVN.Service.NotificationSystem/Controllers/NotificationTemplateController.cs b/src/MAVN.Service.NotificationSystem/Controllers/NotificationTemplateController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
@@ -15,7 +15,6 @@ namespace MAVN.Service.NotificationSystem.Controllers
     /// <summary>
     /// NotificationSystem client API interface for work with templates. 
     /// </summary>
-    [ApiVersion("1.0")]
     [Route("/api/templates")]
     [ApiController]
     [Produces("application/json")]

diff --git a/src/MAVN.Service.NotificationSystem/Dockerfile b/src/MAVN.Service.NotificationSystem/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.NotificationSystem.dll"]
diff --git a/src/MAVN.Service.NotificationSystem/MAVN.Service.NotificationSystem.csproj b/src/MAVN.Service.NotificationSystem/MAVN.Service.NotificationSystem.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <Version>1.0.0</Version>
   </PropertyGroup>
@@ -24,11 +24,8 @@
   <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.2" />
-    <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="3.1.2" />
+    <PackageReference Include="Lykke.Logs" Version="7.4.0" />
+    <PackageReference Include="Lykke.Sdk" Version="5.18.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\client\MAVN.Service.NotificationSystem.Client\MAVN.Service.NotificationSystem.Client.csproj" />

diff --git a/tests/MAVN.Service.NotificationSystem.Tests/MAVN.Service.NotificationSystem.Tests.csproj b/tests/MAVN.Service.NotificationSystem.Tests/MAVN.Service.NotificationSystem.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.11.0" />
+    <PackageReference Include="AutoFixture" Version="4.12.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <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.5.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</IncludeAssets>
     </PackageReference>