Merge pull request #24 from IliyanIlievPH/20

Closes #20

.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.CustomerProfile.Client/MAVN.Service.CustomerProfile.Client.csproj

@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.CustomerProfile.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="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>

src/MAVN.Service.CustomerProfile.Domain/MAVN.Service.CustomerProfile.Domain.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.0" />
   </ItemGroup>
 </Project>

src/MAVN.Service.CustomerProfile.Domain/Repositories/ICustomerProfileRepository.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;
 

src/MAVN.Service.CustomerProfile.DomainServices/CustomerProfileService.cs

@@ -1,13 +1,13 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Common;
 using Common.Log;
 using MAVN.Common;
 using Lykke.Common.Log;
-using MAVN.Common.MsSql;
 using Lykke.RabbitMqBroker.Publisher;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.CustomerProfile.Contract;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.Domain.Models;

src/MAVN.Service.CustomerProfile.DomainServices/MAVN.Service.CustomerProfile.DomainServices.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -9,14 +9,13 @@
     <ProjectReference Include="..\MAVN.Service.CustomerProfile.Domain\MAVN.Service.CustomerProfile.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
-    <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
+    <PackageReference Include="Lykke.Sdk" Version="5.18.0" />
     <PackageReference Include="MAVN.Common" Version="1.0.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="MAVN.Service.AdminManagement.Contract" Version="1.1.1" />
+    <PackageReference Include="MAVN.Service.AdminManagement.Contract" Version="1.4.1" />
     <PackageReference Include="MAVN.Service.CustomerManagement.Contract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.Dictionaries.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.Dictionaries.Client" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.Tiers.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.Tiers.Contract" Version="1.1.1" />
   </ItemGroup>
 </Project>

src/MAVN.Service.CustomerProfile.MsSqlRepositories/CustomerProfileContext.cs

@@ -1,14 +1,14 @@
-using System.Data.Common;
+using System.Data.Common;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.CustomerProfile.Domain.Enums;
 using MAVN.Service.CustomerProfile.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace MAVN.Service.CustomerProfile.MsSqlRepositories
 {
-    public class CustomerProfileContext : MsSqlContext
+    public class CustomerProfileContext : PostgreSQLContext
     {
         private const string Schema = "customer_profile";
 
@@ -69,7 +69,7 @@ public CustomerProfileContext(DbContextOptions contextOptions, bool isPhoneVerif
             _isPhoneVerificationDisabled = isPhoneVerificationDisabled;
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             // configuring admin_profiles table
             modelBuilder.Entity<AdminProfileEntity>()

src/MAVN.Service.CustomerProfile.MsSqlRepositories/MAVN.Service.CustomerProfile.MsSqlRepositories.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
     <RootNamespace>MAVN.Service.CustomerProfile.MsSqlRepositories</RootNamespace>
   </PropertyGroup>
@@ -10,17 +10,14 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="MAVN.Common" Version="1.0.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4">
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.CustomerProfile.Domain\MAVN.Service.CustomerProfile.Domain.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Migrations" />
-  </ItemGroup>
 </Project>