Closes #12

OpenMAVN · Jul 20, 2020 · 3e3cbc4 · 3e3cbc4
1 parent e7d1bcc
commit 3e3cbc4
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 328 deletions.
diff --git a/...N.Job.QuorumTransactionWatcher.Contract/MAVN.Job.QuorumTransactionWatcher.Contract.csproj b/...N.Job.QuorumTransactionWatcher.Contract/MAVN.Job.QuorumTransactionWatcher.Contract.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
     <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
   </ItemGroup>
 

diff --git a/...TransactionWatcher.DomainServices/MAVN.Job.QuorumTransactionWatcher.DomainServices.csproj b/...TransactionWatcher.DomainServices/MAVN.Job.QuorumTransactionWatcher.DomainServices.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Version>1.0.0</Version>
@@ -7,7 +7,7 @@
     <ProjectReference Include="..\MAVN.Job.QuorumTransactionWatcher.Domain\MAVN.Job.QuorumTransactionWatcher.Domain.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="LykkeBiz.Logs.Nethereum" Version="1.0.3" />
     <PackageReference Include="MAVN.PrivateBlockchain.CustomerRegistry" Version="1.0.0-beta.1" />
     <PackageReference Include="MAVN.PrivateBlockchain.MVNToken" Version="1.0.0-beta.1" />

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

diff --git a/src/MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories/IndexingStateRepository.cs b/src/MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories/IndexingStateRepository.cs
@@ -1,19 +1,19 @@
-using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using System.Threading.Tasks;
 using MAVN.Job.QuorumTransactionWatcher.Domain.Repositories;
 using MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories.Constants;
 using MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories.Contexts;
 using MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories.Entities;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories
 {
     public class IndexingStateRepository : IIndexingStateRepository
     {
-        private readonly MsSqlContextFactory<QtwContext> _contextFactory;
+        private readonly PostgreSQLContextFactory<QtwContext> _contextFactory;
 
         public IndexingStateRepository(
-            MsSqlContextFactory<QtwContext> contextFactory)
+            PostgreSQLContextFactory<QtwContext> contextFactory)
         {
             _contextFactory = contextFactory;
         }

diff --git a/...ctionWatcher.MsSqlRepositories/MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories.csproj b/...ctionWatcher.MsSqlRepositories/MAVN.Job.QuorumTransactionWatcher.MsSqlRepositories.csproj
@@ -5,15 +5,16 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="2.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>
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.52" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Job.QuorumTransactionWatcher.Domain\MAVN.Job.QuorumTransactionWatcher.Domain.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Migrations" />
-  </ItemGroup>
 
 </Project>
diff --git a/...TransactionWatcher.MsSqlRepositories/Migrations/20190613144817_Initialization.Designer.cs b/...TransactionWatcher.MsSqlRepositories/Migrations/20190613144817_Initialization.Designer.cs
diff --git a/...her.MsSqlRepositories/Migrations/20190620090318_StoreOnlyLastIndexedBlockInDB.Designer.cs b/...her.MsSqlRepositories/Migrations/20190620090318_StoreOnlyLastIndexedBlockInDB.Designer.cs
diff --git a/...ctionWatcher.MsSqlRepositories/Migrations/20190620090318_StoreOnlyLastIndexedBlockInDB.cs b/...ctionWatcher.MsSqlRepositories/Migrations/20190620090318_StoreOnlyLastIndexedBlockInDB.cs
diff --git a/...uorumTransactionWatcher.MsSqlRepositories/Migrations/20190620111211_AddIdAsPK.Designer.cs b/...uorumTransactionWatcher.MsSqlRepositories/Migrations/20190620111211_AddIdAsPK.Designer.cs
diff --git a/...AVN.Job.QuorumTransactionWatcher.MsSqlRepositories/Migrations/20190620111211_AddIdAsPK.cs b/...AVN.Job.QuorumTransactionWatcher.MsSqlRepositories/Migrations/20190620111211_AddIdAsPK.cs
diff --git a/...tcher.MsSqlRepositories/Migrations/20190620120331_AddGeneralKeyValueTableForBlocksData.cs b/...tcher.MsSqlRepositories/Migrations/20190620120331_AddGeneralKeyValueTableForBlocksData.cs