Merge pull request #25 from IliyanIlievPH/24

Closes #24
OpenMAVN · Jul 20, 2020 · f85eec5 · f85eec5
2 parents 92feae0 + 62ac90d
commit f85eec5
Show file tree

Hide file tree

Showing 33 changed files with 274 additions and 973 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/...nt/MAVN.Service.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj b/...nt/MAVN.Service.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj
@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.DashboardStatistics.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.Numerics" Version="1.0.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>

diff --git a/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.Domain.csproj b/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.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/...DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj b/...DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.2" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="MAVN.Service.PartnersPayments.Contract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.SmartVouchers.Contract" Version="2.7.0" />
+    <PackageReference Include="MAVN.Service.SmartVouchers.Contract" Version="2.18.0" />
     <PackageReference Include="MAVN.Service.WalletManagement.Contract" Version="1.1.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.1.30" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.DashboardStatistics.Domain\MAVN.Service.DashboardStatistics.Domain.csproj" />

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

diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Data.Common;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.DashboardStatistics.Domain.Enums;
 using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.DashboardStatistics.MsSqlRepositories
 {
-    public class DashboardStatisticsContext : MsSqlContext
+    public class DashboardStatisticsContext : PostgreSQLContext
     {
         private const string Schema = "dashboard_statistic";
 
@@ -34,11 +34,11 @@ public DashboardStatisticsContext(DbConnection dbConnection)
 
         public DbSet<PartnerVouchersDailyStatsEntity> PartnerVouchersDailyStatistics { get; set; }
 
-        protected override void OnLykkeConfiguring(DbContextOptionsBuilder optionsBuilder)
+        protected override void OnMAVNConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<CustomerStatisticEntity>()
                 .HasIndex(c => c.CustomerId);

diff --git a/...ardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj b/...ardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj
@@ -1,12 +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="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
+    <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>

diff --git a/...rvice.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.Designer.cs b/...rvice.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.Designer.cs
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.cs
diff --git a/...dStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.Designer.cs b/...dStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.Designer.cs
diff --git a/....DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.cs b/....DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.cs
diff --git a/...Statistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.Designer.cs b/...Statistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.Designer.cs