Merge pull request #12 from IliyanIlievPH/11

Closes #11
OpenMAVN · Jul 21, 2020 · cdb8d3d · cdb8d3d
2 parents 465d452 + 3daf13f
commit cdb8d3d
Show file tree

Hide file tree

Showing 29 changed files with 226 additions and 676 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.CustomerManagement.Client/MAVN.Service.CustomerManagement.Client.csproj b/client/MAVN.Service.CustomerManagement.Client/MAVN.Service.CustomerManagement.Client.csproj
@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.CustomerManagement.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>
diff --git a/src/MAVN.Service.CustomerManagement.Domain/MAVN.Service.CustomerManagement.Domain.csproj b/src/MAVN.Service.CustomerManagement.Domain/MAVN.Service.CustomerManagement.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.CustomerManagement.DomainServices/MAVN.Service.CustomerManagement.DomainServices.csproj b/...e.CustomerManagement.DomainServices/MAVN.Service.CustomerManagement.DomainServices.csproj
@@ -1,18 +1,18 @@
 <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="MAVN.Service.Credentials.Client" Version="1.0.1" />
-    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.2.0" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
+    <PackageReference Include="MAVN.Service.Credentials.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="2.2.0" />
     <PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.0.1" />
-    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.1.0" />
+    <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.Sessions.Client" Version="1.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.CustomerManagement.Contract\MAVN.Service.CustomerManagement.Contract.csproj" />

diff --git a/src/MAVN.Service.CustomerManagement.MsSqlRepositories/Contexts/CmContext.cs b/src/MAVN.Service.CustomerManagement.MsSqlRepositories/Contexts/CmContext.cs
@@ -1,11 +1,11 @@
-using System.Data.Common;
-using MAVN.Common.MsSql;
+using System.Data.Common;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.CustomerManagement.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.CustomerManagement.MsSqlRepositories.Contexts
 {
-    public class CmContext : MsSqlContext
+    public class CmContext : PostgreSQLContext
     {
         private const string Schema = "customer_management";
 
@@ -31,7 +31,7 @@ public CmContext(DbConnection dbConnection)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             var verificationCodeEntityBuilder = modelBuilder.Entity<EmailVerificationCodeEntity>();
             verificationCodeEntityBuilder.HasIndex(c => c.VerificationCode).IsUnique();

diff --git a/...omerManagement.MsSqlRepositories/MAVN.Service.CustomerManagement.MsSqlRepositories.csproj b/...omerManagement.MsSqlRepositories/MAVN.Service.CustomerManagement.MsSqlRepositories.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
     <RootNamespace>MAVN.Service.CustomerManagement.MsSqlRepositories</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.AzureStorage" Version="8.13.4" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <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>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.CustomerManagement.Domain\MAVN.Service.CustomerManagement.Domain.csproj" />

diff --git a/...ervice.CustomerManagement.MsSqlRepositories/Migrations/20190610091228_Initial.Designer.cs b/...ervice.CustomerManagement.MsSqlRepositories/Migrations/20190610091228_Initial.Designer.cs
diff --git a/src/MAVN.Service.CustomerManagement.MsSqlRepositories/Migrations/20190610091228_Initial.cs b/src/MAVN.Service.CustomerManagement.MsSqlRepositories/Migrations/20190610091228_Initial.cs
diff --git a/...tomerManagement.MsSqlRepositories/Migrations/20190610125127_AddRequiredFields.Designer.cs b/...tomerManagement.MsSqlRepositories/Migrations/20190610125127_AddRequiredFields.Designer.cs
diff --git a/...rvice.CustomerManagement.MsSqlRepositories/Migrations/20190610125127_AddRequiredFields.cs b/...rvice.CustomerManagement.MsSqlRepositories/Migrations/20190610125127_AddRequiredFields.cs
diff --git a/....CustomerManagement.MsSqlRepositories/Migrations/20190724075532_CustomerFlags.Designer.cs b/....CustomerManagement.MsSqlRepositories/Migrations/20190724075532_CustomerFlags.Designer.cs