Merge pull request #12 from IliyanIlievPH/11

Closes #11

.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

.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

client/MAVN.Service.Vouchers.Client/MAVN.Service.Vouchers.Client.csproj

@@ -8,8 +8,8 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <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.Numerics" Version="1.0.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>

src/MAVN.Service.Vouchers.Domain/MAVN.Service.Vouchers.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>

src/MAVN.Service.Vouchers.DomainServices/MAVN.Service.Vouchers.DomainServices.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>
     <ProjectReference Include="..\MAVN.Service.Vouchers.Domain\MAVN.Service.Vouchers.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="MAVN.Job.QuorumTransactionWatcher.Contract" Version="1.1.0" />
     <PackageReference Include="MAVN.PrivateBlockchain.BasicRedeemGateway" Version="1.0.0-beta.1" />
     <PackageReference Include="MAVN.Service.Campaign.Client" Version="1.1.1" />
     <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
     <PackageReference Include="MAVN.Service.EligibilityEngine.Client" Version="1.1.1" />
     <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.1.1" />
   </ItemGroup>
 </Project>

src/MAVN.Service.Vouchers.MsSqlRepositories/AutofacModule.cs

@@ -1,5 +1,5 @@
 using Autofac;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Vouchers.Domain.Repositories;
 using MAVN.Service.Vouchers.MsSqlRepositories.Context;
 
@@ -16,7 +16,7 @@ public AutofacModule(string connectionString)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(_connectionString,
+            builder.RegisterPostgreSQL(_connectionString,
                 connectionString => new DataContext(connectionString, false),
                 dbConnection => new DataContext(dbConnection));
 

src/MAVN.Service.Vouchers.MsSqlRepositories/Context/DataContext.cs

@@ -1,13 +1,13 @@
 using System.Data.Common;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Vouchers.Domain.Entities;
 using MAVN.Service.Vouchers.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace MAVN.Service.Vouchers.MsSqlRepositories.Context
 {
-    public class DataContext : MsSqlContext
+    public class DataContext : PostgreSQLContext
     {
         private const string Schema = "vouchers";
 
@@ -34,11 +34,7 @@ public DataContext(DbConnection dbConnection)
 
         public DbSet<OperationEntity> Operations { get; set; }
 
-        protected override void OnLykkeConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-        }
-
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             // Vouchers
 

src/MAVN.Service.Vouchers.MsSqlRepositories/MAVN.Service.Vouchers.MsSqlRepositories.csproj

@@ -1,11 +1,15 @@
 <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.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>