Merge pull request #13 from IliyanIlievPH/8

Closes #8
OpenMAVN · Jul 21, 2020 · c3435c4 · c3435c4
2 parents 76b0ead + 19a87b7
commit c3435c4
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/client/MAVN.Service.Kyc.Client/MAVN.Service.Kyc.Client.csproj b/client/MAVN.Service.Kyc.Client/MAVN.Service.Kyc.Client.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.Kyc.DomainServices/MAVN.Service.Kyc.DomainServices.csproj b/src/MAVN.Service.Kyc.DomainServices/MAVN.Service.Kyc.DomainServices.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
-    <PackageReference Include="MAVN.Service.AdminManagement.Client" Version="1.4.0" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
+    <PackageReference Include="MAVN.Service.AdminManagement.Client" Version="1.4.1" />
     <PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="2.12.0" />
-    <PackageReference Include="MAVN.Service.PartnerManagement.Contract" Version="2.3.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="2.14.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Contract" Version="2.14.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.Kyc.Contract\MAVN.Service.Kyc.Contract.csproj" />

diff --git a/src/MAVN.Service.Kyc.MsSqlRepositories/KycContext.cs b/src/MAVN.Service.Kyc.MsSqlRepositories/KycContext.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Data.Common;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Kyc.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.Kyc.MsSqlRepositories
 {
-    public class KycContext : MsSqlContext
+    public class KycContext : PostgreSQLContext
     {
         private const string Schema = "kyc";
 
@@ -37,7 +37,7 @@ public KycContext(DbConnection dbConnection)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
         }
     }

diff --git a/src/MAVN.Service.Kyc.MsSqlRepositories/MAVN.Service.Kyc.MsSqlRepositories.csproj b/src/MAVN.Service.Kyc.MsSqlRepositories/MAVN.Service.Kyc.MsSqlRepositories.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
+    <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>

diff --git a/src/MAVN.Service.Kyc.MsSqlRepositories/Repositories/KycInformationRepository.cs b/src/MAVN.Service.Kyc.MsSqlRepositories/Repositories/KycInformationRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Kyc.Domain.Models;
 using MAVN.Service.Kyc.Domain.Repositories;
 using MAVN.Service.Kyc.MsSqlRepositories.Entities;

diff --git a/src/MAVN.Service.Kyc.MsSqlRepositories/Repositories/KycStatusChangeRepository.cs b/src/MAVN.Service.Kyc.MsSqlRepositories/Repositories/KycStatusChangeRepository.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Kyc.Domain.Models;
 using MAVN.Service.Kyc.Domain.Repositories;
 using Microsoft.EntityFrameworkCore;

diff --git a/src/MAVN.Service.Kyc/MAVN.Service.Kyc.csproj b/src/MAVN.Service.Kyc/MAVN.Service.Kyc.csproj
@@ -26,8 +26,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="LykkeBiz.Sdk" Version="1.0.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.1" />
+    <PackageReference Include="Lykke.Logs" Version="7.4.0" />
+    <PackageReference Include="LykkeBiz.Sdk" Version="5.18.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\client\MAVN.Service.Kyc.Client\MAVN.Service.Kyc.Client.csproj" />

diff --git a/src/MAVN.Service.Kyc/Modules/DbModule.cs b/src/MAVN.Service.Kyc/Modules/DbModule.cs
@@ -5,7 +5,7 @@
 using JetBrains.Annotations;
 using Lykke.Common.Log;
 using Lykke.SettingsReader;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Kyc.Domain.Repositories;
 using MAVN.Service.Kyc.MsSqlRepositories;
 using MAVN.Service.Kyc.MsSqlRepositories.Repositories;
@@ -26,7 +26,7 @@ public DbModule(IReloadingManager<AppSettings> appSettings)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(
+            builder.RegisterPostgreSQL(
                 _connectionString,
                 connString => new KycContext(connString, false),
                 dbConn => new KycContext(dbConn));

diff --git a/tests/MAVN.Service.Kyc.Tests/MAVN.Service.Kyc.Tests.csproj b/tests/MAVN.Service.Kyc.Tests/MAVN.Service.Kyc.Tests.csproj
@@ -4,11 +4,17 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <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; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MAVN.Service.Kyc\MAVN.Service.Kyc.csproj" />