diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0275e87..0331364 100644 --- 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 index 2ddf717..c283976 100644 --- 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.PrivateBlockchainFacade.Client/MAVN.Service.PrivateBlockchainFacade.Client.csproj b/client/MAVN.Service.PrivateBlockchainFacade.Client/MAVN.Service.PrivateBlockchainFacade.Client.csproj index 05e3d81..6d4644c 100644 --- a/client/MAVN.Service.PrivateBlockchainFacade.Client/MAVN.Service.PrivateBlockchainFacade.Client.csproj +++ b/client/MAVN.Service.PrivateBlockchainFacade.Client/MAVN.Service.PrivateBlockchainFacade.Client.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/contract/MAVN.Service.PrivateBlockchainFacade.Contract/MAVN.Service.PrivateBlockchainFacade.Contract.csproj b/contract/MAVN.Service.PrivateBlockchainFacade.Contract/MAVN.Service.PrivateBlockchainFacade.Contract.csproj index 1fe198a..1338310 100644 --- a/contract/MAVN.Service.PrivateBlockchainFacade.Contract/MAVN.Service.PrivateBlockchainFacade.Contract.csproj +++ b/contract/MAVN.Service.PrivateBlockchainFacade.Contract/MAVN.Service.PrivateBlockchainFacade.Contract.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/MAVN.Service.PrivateBlockchainFacade.Domain/MAVN.Service.PrivateBlockchainFacade.Domain.csproj b/src/MAVN.Service.PrivateBlockchainFacade.Domain/MAVN.Service.PrivateBlockchainFacade.Domain.csproj index dd5a454..c18e680 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.Domain/MAVN.Service.PrivateBlockchainFacade.Domain.csproj +++ b/src/MAVN.Service.PrivateBlockchainFacade.Domain/MAVN.Service.PrivateBlockchainFacade.Domain.csproj @@ -1,13 +1,13 @@ - netcoreapp2.2 + netcoreapp3.1 1.0.0 - + diff --git a/src/MAVN.Service.PrivateBlockchainFacade.DomainServices/MAVN.Service.PrivateBlockchainFacade.DomainServices.csproj b/src/MAVN.Service.PrivateBlockchainFacade.DomainServices/MAVN.Service.PrivateBlockchainFacade.DomainServices.csproj index 5dc1806..a0c3c3f 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.DomainServices/MAVN.Service.PrivateBlockchainFacade.DomainServices.csproj +++ b/src/MAVN.Service.PrivateBlockchainFacade.DomainServices/MAVN.Service.PrivateBlockchainFacade.DomainServices.csproj @@ -1,15 +1,15 @@ - netcoreapp2.2 + netcoreapp3.1 1.0.0 latest - + - + diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/BonusRewardDeduplicationLogRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/BonusRewardDeduplicationLogRepository.cs index fe4abc7..5b7d3f2 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/BonusRewardDeduplicationLogRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/BonusRewardDeduplicationLogRepository.cs @@ -1,20 +1,19 @@ -using System; -using System.Data.SqlClient; +using System; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; using Microsoft.EntityFrameworkCore; +using Npgsql; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class BonusRewardDeduplicationLogRepository : IDeduplicationLogRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; - public BonusRewardDeduplicationLogRepository(MsSqlContextFactory contextFactory) + public BonusRewardDeduplicationLogRepository(PostgreSQLContextFactory contextFactory) { _contextFactory = contextFactory; } @@ -33,8 +32,8 @@ public async Task IsDuplicateAsync(string key) } catch (DbUpdateException e) { - if (e.InnerException is SqlException sqlException && - sqlException.Number == MsSqlErrorCodes.PrimaryKeyConstraintViolation) + if (e.InnerException is PostgresException sqlException && + sqlException.SqlState == PostgresErrorCodes.UniqueViolation) { return true; } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Contexts/PbfContext.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Contexts/PbfContext.cs index 0d0805e..e4c3ab8 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Contexts/PbfContext.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Contexts/PbfContext.cs @@ -1,14 +1,14 @@ -using System.Data.Common; +using System.Data.Common; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Operations; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts { - public class PbfContext : MsSqlContext + public class PbfContext : PostgreSQLContext { private const string Schema = "private_blockchain_facade"; @@ -48,7 +48,7 @@ public PbfContext(DbConnection dbConnection) { } - protected override void OnLykkeModelCreating(ModelBuilder modelBuilder) + protected override void OnMAVNModelCreating(ModelBuilder modelBuilder) { var operationEntityBuilder = modelBuilder.Entity(); operationEntityBuilder.Property(c => c.Type).HasConversion(new EnumToStringConverter()); diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.csproj b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.csproj index 74919eb..86e915b 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.csproj +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.csproj @@ -1,14 +1,16 @@ - netcoreapp2.2 + netcoreapp3.1 1.0.0 MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.Designer.cs deleted file mode 100644 index 9673459..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.Designer.cs +++ /dev/null @@ -1,103 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190606152253_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.cs deleted file mode 100644 index a8bda35..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190606152253_Initial.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class Initial : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.EnsureSchema( - name: "private_blockchain_facade"); - - migrationBuilder.CreateTable( - name: "nonce_counters", - schema: "private_blockchain_facade", - columns: table => new - { - master_wallet_address = table.Column(nullable: false), - counter_value = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_nonce_counters", x => x.master_wallet_address); - }); - - migrationBuilder.CreateTable( - name: "operations", - schema: "private_blockchain_facade", - columns: table => new - { - id = table.Column(nullable: false), - transaction_hash = table.Column(nullable: true), - customer_id = table.Column(nullable: false), - master_wallet_address = table.Column(nullable: false), - nonce = table.Column(nullable: false), - timestamp = table.Column(nullable: false), - type = table.Column(nullable: false), - status = table.Column(nullable: false), - context_json = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_operations", x => x.id); - }); - - migrationBuilder.CreateTable( - name: "wallet_owners", - schema: "private_blockchain_facade", - columns: table => new - { - owner_id = table.Column(nullable: false), - wallet_id = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_wallet_owners", x => x.owner_id); - }); - - migrationBuilder.CreateIndex( - name: "IX_operations_transaction_hash", - schema: "private_blockchain_facade", - table: "operations", - column: "transaction_hash", - unique: true, - filter: "[transaction_hash] IS NOT NULL"); - - migrationBuilder.CreateIndex( - name: "IX_wallet_owners_wallet_id", - schema: "private_blockchain_facade", - table: "wallet_owners", - column: "wallet_id", - unique: true); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "nonce_counters", - schema: "private_blockchain_facade"); - - migrationBuilder.DropTable( - name: "operations", - schema: "private_blockchain_facade"); - - migrationBuilder.DropTable( - name: "wallet_owners", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.Designer.cs deleted file mode 100644 index 392a4da..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.Designer.cs +++ /dev/null @@ -1,117 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190618121843_BonusRewardDeduplicationStorage")] - partial class BonusRewardDeduplicationStorage - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_charge_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.cs deleted file mode 100644 index 465652f..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190618121843_BonusChargeDeduplicationStorage.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class BonusRewardDeduplicationStorage : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "bonus_charge_deduplication_log", - schema: "private_blockchain_facade", - columns: table => new - { - deduplication_key = table.Column(nullable: false), - retention_starts_at = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_bonus_charge_deduplication_log", x => x.deduplication_key); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "bonus_charge_deduplication_log", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.Designer.cs deleted file mode 100644 index b364062..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.Designer.cs +++ /dev/null @@ -1,117 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190619142840_RenameChargeToReward")] - partial class RenameChargeToReward - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.cs deleted file mode 100644 index 21f6a3c..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190619142840_RenameChargeToReward.cs +++ /dev/null @@ -1,47 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class RenameChargeToReward : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropPrimaryKey( - name: "PK_bonus_charge_deduplication_log", - schema: "private_blockchain_facade", - table: "bonus_charge_deduplication_log"); - - migrationBuilder.RenameTable( - name: "bonus_charge_deduplication_log", - schema: "private_blockchain_facade", - newName: "bonus_reward_deduplication_log", - newSchema: "private_blockchain_facade"); - - migrationBuilder.AddPrimaryKey( - name: "PK_bonus_reward_deduplication_log", - schema: "private_blockchain_facade", - table: "bonus_reward_deduplication_log", - column: "deduplication_key"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropPrimaryKey( - name: "PK_bonus_reward_deduplication_log", - schema: "private_blockchain_facade", - table: "bonus_reward_deduplication_log"); - - migrationBuilder.RenameTable( - name: "bonus_reward_deduplication_log", - schema: "private_blockchain_facade", - newName: "bonus_charge_deduplication_log", - newSchema: "private_blockchain_facade"); - - migrationBuilder.AddPrimaryKey( - name: "PK_bonus_charge_deduplication_log", - schema: "private_blockchain_facade", - table: "bonus_charge_deduplication_log", - column: "deduplication_key"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.Designer.cs deleted file mode 100644 index 297b42e..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.Designer.cs +++ /dev/null @@ -1,131 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190621151114_AddTransferDeduplicationRepository")] - partial class AddTransferDeduplicationRepository - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.cs deleted file mode 100644 index 529c147..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190621151114_AddTransferDeduplicationRepository.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddTransferDeduplicationRepository : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "transfer_deduplication_log", - schema: "private_blockchain_facade", - columns: table => new - { - deduplication_key = table.Column(nullable: false), - retention_starts_at = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_transfer_deduplication_log", x => x.deduplication_key); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "transfer_deduplication_log", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.Designer.cs deleted file mode 100644 index f7e9fed..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.Designer.cs +++ /dev/null @@ -1,134 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190625075026_AddImmutableCreatedAtField")] - partial class AddImmutableCreatedAtField - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.cs deleted file mode 100644 index a71f4e8..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190625075026_AddImmutableCreatedAtField.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddImmutableCreatedAtField : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "created_at", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "created_at", - schema: "private_blockchain_facade", - table: "operations"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.Designer.cs deleted file mode 100644 index 2a2d273..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.Designer.cs +++ /dev/null @@ -1,136 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190716112733_AddOperationsIndexByStatus")] - partial class AddOperationsIndexByStatus - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.cs deleted file mode 100644 index cb8addc..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190716112733_AddOperationsIndexByStatus.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddOperationsIndexByStatus : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "status", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.CreateIndex( - name: "IX_operations_status", - schema: "private_blockchain_facade", - table: "operations", - column: "status"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_operations_status", - schema: "private_blockchain_facade", - table: "operations"); - - migrationBuilder.AlterColumn( - name: "status", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.Designer.cs deleted file mode 100644 index 565cea2..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.Designer.cs +++ /dev/null @@ -1,138 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190717081806_OperationsAddIndexByTimestamp")] - partial class OperationsAddIndexByTimestamp - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.cs deleted file mode 100644 index adac9ce..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190717081806_OperationsAddIndexByTimestamp.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class OperationsAddIndexByTimestamp : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateIndex( - name: "IX_operations_timestamp", - schema: "private_blockchain_facade", - table: "operations", - column: "timestamp"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_operations_timestamp", - schema: "private_blockchain_facade", - table: "operations"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.Designer.cs deleted file mode 100644 index 3375f0d..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.Designer.cs +++ /dev/null @@ -1,137 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190718151233_MakeCustomerIdNotNullableInOperations")] - partial class MakeCustomerIdNotNullableInOperations - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.cs deleted file mode 100644 index bba88bf..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190718151233_MakeCustomerIdNotNullableInOperations.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class MakeCustomerIdNotNullableInOperations : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operations", - nullable: true, - oldClrType: typeof(string)); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string), - oldNullable: true); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.Designer.cs deleted file mode 100644 index f30ad32..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.Designer.cs +++ /dev/null @@ -1,181 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190722131211_AddOperationRequestEntity")] - partial class AddOperationRequestEntity - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .IsRequired() - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.cs deleted file mode 100644 index e2efcab..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190722131211_AddOperationRequestEntity.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddOperationRequestEntity : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "operation_requests", - schema: "private_blockchain_facade", - columns: table => new - { - id = table.Column(nullable: false), - transaction_hash = table.Column(nullable: true), - customer_id = table.Column(nullable: false), - master_wallet_address = table.Column(nullable: false), - nonce = table.Column(nullable: false), - timestamp = table.Column(nullable: false), - type = table.Column(nullable: false), - status = table.Column(nullable: false), - context_json = table.Column(nullable: false), - created_at = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_operation_requests", x => x.id); - }); - - migrationBuilder.Sql(@" - insert into private_blockchain_facade.operation_requests( - id, transaction_hash, customer_id, - master_wallet_address, nonce, timestamp, - type, status, context_json - ) - select - id, - transaction_hash, - customer_id, - master_wallet_address, - nonce, - timestamp, - type, - status, - context_json - from - private_blockchain_facade.operations - where - status = 'Created'; - - delete from - private_blockchain_facade.operations - where - status = 'Created'; - - commit; - "); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.Sql(@" - insert into private_blockchain_facade.operations( - id, transaction_hash, customer_id, - master_wallet_address, nonce, timestamp, - type, status, context_json - ) - select - id, - transaction_hash, - customer_id, - master_wallet_address, - nonce, - timestamp, - type, - status, - context_json - from - private_blockchain_facade.operation_requests; - - delete from - private_blockchain_facade.operation_requests; - - commit; - "); - - migrationBuilder.DropTable( - name: "operation_requests", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.Designer.cs deleted file mode 100644 index a7f4ddb..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.Designer.cs +++ /dev/null @@ -1,179 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20190726082141_OperationRequestEntityCustomerIdNotRequired")] - partial class OperationRequestEntityCustomerIdNotRequired - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.cs deleted file mode 100644 index 0c3fee0..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20190726082141_OperationRequestEntityCustomerIdNotRequired.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class OperationRequestEntityCustomerIdNotRequired : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operation_requests", - nullable: true, - oldClrType: typeof(string)); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operation_requests", - nullable: false, - oldClrType: typeof(string), - oldNullable: true); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.Designer.cs deleted file mode 100644 index a9dc244..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.Designer.cs +++ /dev/null @@ -1,193 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20191029175648_OperationDeduplicationEntity")] - partial class OperationDeduplicationEntity - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("operation_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.cs deleted file mode 100644 index 6a72cb0..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191029175648_OperationDeduplicationEntity.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class OperationDeduplicationEntity : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "operation_deduplication_log", - schema: "private_blockchain_facade", - columns: table => new - { - deduplication_key = table.Column(nullable: false), - retention_starts_at = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_operation_deduplication_log", x => x.deduplication_key); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "operation_deduplication_log", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.Designer.cs deleted file mode 100644 index 7a899e2..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.Designer.cs +++ /dev/null @@ -1,207 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20191106130348_AddDeduplicationTableForWalletLinking")] - partial class AddDeduplicationTableForWalletLinking - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("operation_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.WalletLinkingDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("wallet_linking_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.cs deleted file mode 100644 index 71577b5..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191106130348_AddDeduplicationTableForWalletLinking.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddDeduplicationTableForWalletLinking : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "wallet_linking_deduplication_log", - schema: "private_blockchain_facade", - columns: table => new - { - deduplication_key = table.Column(nullable: false), - retention_starts_at = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_wallet_linking_deduplication_log", x => x.deduplication_key); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "wallet_linking_deduplication_log", - schema: "private_blockchain_facade"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.Designer.cs deleted file mode 100644 index 9185518..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.Designer.cs +++ /dev/null @@ -1,209 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20191209154644_AddTimestampIndexForRequests")] - partial class AddTimestampIndexForRequests - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("operation_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.WalletLinkingDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("wallet_linking_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Timestamp"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.cs deleted file mode 100644 index 307680c..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191209154644_AddTimestampIndexForRequests.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddTimestampIndexForRequests : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateIndex( - name: "IX_operation_requests_timestamp", - schema: "private_blockchain_facade", - table: "operation_requests", - column: "timestamp"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_operation_requests_timestamp", - schema: "private_blockchain_facade", - table: "operation_requests"); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.Designer.cs deleted file mode 100644 index 104537e..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.Designer.cs +++ /dev/null @@ -1,215 +0,0 @@ -// -using System; -using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - [DbContext(typeof(PbfContext))] - [Migration("20191211083158_AddIndexesToOperationsTable")] - partial class AddIndexesToOperationsTable - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("bonus_reward_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("operation_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("transfer_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.WalletLinkingDeduplicationLogEntity", b => - { - b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); - - b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); - - b.HasKey("DeduplicationKey"); - - b.ToTable("wallet_linking_deduplication_log"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => - { - b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); - - b.Property("CounterValue") - .HasColumnName("counter_value"); - - b.HasKey("MasterWalletAddress"); - - b.ToTable("nonce_counters"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("MasterWalletAddress"); - - b.HasIndex("Status"); - - b.HasIndex("Timestamp"); - - b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); - - b.HasIndex("Type"); - - b.HasIndex("MasterWalletAddress", "Type", "Status"); - - b.ToTable("operations"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.OperationRequestEntity", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnName("id"); - - b.Property("ContextJson") - .IsRequired() - .HasColumnName("context_json"); - - b.Property("CreatedAt") - .HasColumnName("created_at"); - - b.Property("CustomerId") - .HasColumnName("customer_id"); - - b.Property("MasterWalletAddress") - .IsRequired() - .HasColumnName("master_wallet_address"); - - b.Property("Nonce") - .HasColumnName("nonce"); - - b.Property("Status") - .IsRequired() - .HasColumnName("status"); - - b.Property("Timestamp") - .HasColumnName("timestamp"); - - b.Property("TransactionHash") - .HasColumnName("transaction_hash"); - - b.Property("Type") - .IsRequired() - .HasColumnName("type"); - - b.HasKey("Id"); - - b.HasIndex("Timestamp"); - - b.ToTable("operation_requests"); - }); - - modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => - { - b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); - - b.Property("WalletId") - .IsRequired() - .HasColumnName("wallet_id"); - - b.HasKey("OwnerId"); - - b.HasIndex("WalletId") - .IsUnique(); - - b.ToTable("wallet_owners"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.cs deleted file mode 100644 index 8313dd6..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211083158_AddIndexesToOperationsTable.cs +++ /dev/null @@ -1,74 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddIndexesToOperationsTable : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "type", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn( - name: "master_wallet_address", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.CreateIndex( - name: "IX_operations_master_wallet_address", - schema: "private_blockchain_facade", - table: "operations", - column: "master_wallet_address"); - - migrationBuilder.CreateIndex( - name: "IX_operations_type", - schema: "private_blockchain_facade", - table: "operations", - column: "type"); - - migrationBuilder.CreateIndex( - name: "IX_operations_master_wallet_address_type_status", - schema: "private_blockchain_facade", - table: "operations", - columns: new[] { "master_wallet_address", "type", "status" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_operations_master_wallet_address", - schema: "private_blockchain_facade", - table: "operations"); - - migrationBuilder.DropIndex( - name: "IX_operations_type", - schema: "private_blockchain_facade", - table: "operations"); - - migrationBuilder.DropIndex( - name: "IX_operations_master_wallet_address_type_status", - schema: "private_blockchain_facade", - table: "operations"); - - migrationBuilder.AlterColumn( - name: "type", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - - migrationBuilder.AlterColumn( - name: "master_wallet_address", - schema: "private_blockchain_facade", - table: "operations", - nullable: false, - oldClrType: typeof(string)); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.cs deleted file mode 100644 index c8f668f..0000000 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations -{ - public partial class AddAnotherToOperationsTable : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operations", - nullable: true, - oldClrType: typeof(string), - oldNullable: true); - - migrationBuilder.CreateIndex( - name: "IX_operations_customer_id_type_status", - schema: "private_blockchain_facade", - table: "operations", - columns: new[] { "customer_id", "type", "status" }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_operations_customer_id_type_status", - schema: "private_blockchain_facade", - table: "operations"); - - migrationBuilder.AlterColumn( - name: "customer_id", - schema: "private_blockchain_facade", - table: "operations", - nullable: true, - oldClrType: typeof(string), - oldNullable: true); - } - } -} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.Designer.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.Designer.cs similarity index 59% rename from src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.Designer.cs rename to src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.Designer.cs index 04d774e..54db4b4 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20191211093232_AddAnotherToOperationsTable.Designer.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.Designer.cs @@ -1,35 +1,36 @@ -// +// using System; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations { [DbContext(typeof(PbfContext))] - [Migration("20191211093232_AddAnotherToOperationsTable")] - partial class AddAnotherToOperationsTable + [Migration("20200703061208_Initial")] + partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) + .HasAnnotation("ProductVersion", "3.1.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -39,11 +40,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -53,11 +55,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -67,11 +70,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.WalletLinkingDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -81,11 +85,12 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => { b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("CounterValue") - .HasColumnName("counter_value"); + .HasColumnName("counter_value") + .HasColumnType("bigint"); b.HasKey("MasterWalletAddress"); @@ -96,38 +101,48 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnName("id"); + .HasColumnName("id") + .HasColumnType("uuid"); b.Property("ContextJson") .IsRequired() - .HasColumnName("context_json"); + .HasColumnName("context_json") + .HasColumnType("text"); b.Property("CreatedAt") - .HasColumnName("created_at"); + .HasColumnName("created_at") + .HasColumnType("timestamp without time zone"); b.Property("CustomerId") - .HasColumnName("customer_id"); + .HasColumnName("customer_id") + .HasColumnType("text"); b.Property("MasterWalletAddress") .IsRequired() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("Nonce") - .HasColumnName("nonce"); + .HasColumnName("nonce") + .HasColumnType("bigint"); b.Property("Status") .IsRequired() - .HasColumnName("status"); + .HasColumnName("status") + .HasColumnType("text"); b.Property("Timestamp") - .HasColumnName("timestamp"); + .HasColumnName("timestamp") + .HasColumnType("timestamp without time zone"); b.Property("TransactionHash") - .HasColumnName("transaction_hash"); + .HasColumnName("transaction_hash") + .HasColumnType("text"); b.Property("Type") .IsRequired() - .HasColumnName("type"); + .HasColumnName("type") + .HasColumnType("text"); b.HasKey("Id"); @@ -138,8 +153,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.HasIndex("Timestamp"); b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); + .IsUnique(); b.HasIndex("Type"); @@ -154,38 +168,48 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnName("id"); + .HasColumnName("id") + .HasColumnType("uuid"); b.Property("ContextJson") .IsRequired() - .HasColumnName("context_json"); + .HasColumnName("context_json") + .HasColumnType("text"); b.Property("CreatedAt") - .HasColumnName("created_at"); + .HasColumnName("created_at") + .HasColumnType("timestamp without time zone"); b.Property("CustomerId") - .HasColumnName("customer_id"); + .HasColumnName("customer_id") + .HasColumnType("text"); b.Property("MasterWalletAddress") .IsRequired() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("Nonce") - .HasColumnName("nonce"); + .HasColumnName("nonce") + .HasColumnType("bigint"); b.Property("Status") .IsRequired() - .HasColumnName("status"); + .HasColumnName("status") + .HasColumnType("text"); b.Property("Timestamp") - .HasColumnName("timestamp"); + .HasColumnName("timestamp") + .HasColumnType("timestamp without time zone"); b.Property("TransactionHash") - .HasColumnName("transaction_hash"); + .HasColumnName("transaction_hash") + .HasColumnType("text"); b.Property("Type") .IsRequired() - .HasColumnName("type"); + .HasColumnName("type") + .HasColumnType("text"); b.HasKey("Id"); @@ -197,12 +221,13 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => { b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); + .HasColumnName("owner_id") + .HasColumnType("text"); b.Property("WalletId") .IsRequired() - .HasColumnName("wallet_id"); + .HasColumnName("wallet_id") + .HasColumnType("text"); b.HasKey("OwnerId"); diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.cs new file mode 100644 index 0000000..c57edc6 --- /dev/null +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/20200703061208_Initial.cs @@ -0,0 +1,225 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations +{ + public partial class Initial : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.EnsureSchema( + name: "private_blockchain_facade"); + + migrationBuilder.CreateTable( + name: "bonus_reward_deduplication_log", + schema: "private_blockchain_facade", + columns: table => new + { + deduplication_key = table.Column(nullable: false), + retention_starts_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_bonus_reward_deduplication_log", x => x.deduplication_key); + }); + + migrationBuilder.CreateTable( + name: "nonce_counters", + schema: "private_blockchain_facade", + columns: table => new + { + master_wallet_address = table.Column(nullable: false), + counter_value = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_nonce_counters", x => x.master_wallet_address); + }); + + migrationBuilder.CreateTable( + name: "operation_deduplication_log", + schema: "private_blockchain_facade", + columns: table => new + { + deduplication_key = table.Column(nullable: false), + retention_starts_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_operation_deduplication_log", x => x.deduplication_key); + }); + + migrationBuilder.CreateTable( + name: "operation_requests", + schema: "private_blockchain_facade", + columns: table => new + { + id = table.Column(nullable: false), + transaction_hash = table.Column(nullable: true), + customer_id = table.Column(nullable: true), + master_wallet_address = table.Column(nullable: false), + nonce = table.Column(nullable: false), + timestamp = table.Column(nullable: false), + type = table.Column(nullable: false), + status = table.Column(nullable: false), + context_json = table.Column(nullable: false), + created_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_operation_requests", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "operations", + schema: "private_blockchain_facade", + columns: table => new + { + id = table.Column(nullable: false), + transaction_hash = table.Column(nullable: true), + customer_id = table.Column(nullable: true), + master_wallet_address = table.Column(nullable: false), + nonce = table.Column(nullable: false), + timestamp = table.Column(nullable: false), + type = table.Column(nullable: false), + status = table.Column(nullable: false), + context_json = table.Column(nullable: false), + created_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_operations", x => x.id); + }); + + migrationBuilder.CreateTable( + name: "transfer_deduplication_log", + schema: "private_blockchain_facade", + columns: table => new + { + deduplication_key = table.Column(nullable: false), + retention_starts_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_transfer_deduplication_log", x => x.deduplication_key); + }); + + migrationBuilder.CreateTable( + name: "wallet_linking_deduplication_log", + schema: "private_blockchain_facade", + columns: table => new + { + deduplication_key = table.Column(nullable: false), + retention_starts_at = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_wallet_linking_deduplication_log", x => x.deduplication_key); + }); + + migrationBuilder.CreateTable( + name: "wallet_owners", + schema: "private_blockchain_facade", + columns: table => new + { + owner_id = table.Column(nullable: false), + wallet_id = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_wallet_owners", x => x.owner_id); + }); + + migrationBuilder.CreateIndex( + name: "IX_operation_requests_timestamp", + schema: "private_blockchain_facade", + table: "operation_requests", + column: "timestamp"); + + migrationBuilder.CreateIndex( + name: "IX_operations_master_wallet_address", + schema: "private_blockchain_facade", + table: "operations", + column: "master_wallet_address"); + + migrationBuilder.CreateIndex( + name: "IX_operations_status", + schema: "private_blockchain_facade", + table: "operations", + column: "status"); + + migrationBuilder.CreateIndex( + name: "IX_operations_timestamp", + schema: "private_blockchain_facade", + table: "operations", + column: "timestamp"); + + migrationBuilder.CreateIndex( + name: "IX_operations_transaction_hash", + schema: "private_blockchain_facade", + table: "operations", + column: "transaction_hash", + unique: true); + + migrationBuilder.CreateIndex( + name: "IX_operations_type", + schema: "private_blockchain_facade", + table: "operations", + column: "type"); + + migrationBuilder.CreateIndex( + name: "IX_operations_customer_id_type_status", + schema: "private_blockchain_facade", + table: "operations", + columns: new[] { "customer_id", "type", "status" }); + + migrationBuilder.CreateIndex( + name: "IX_operations_master_wallet_address_type_status", + schema: "private_blockchain_facade", + table: "operations", + columns: new[] { "master_wallet_address", "type", "status" }); + + migrationBuilder.CreateIndex( + name: "IX_wallet_owners_wallet_id", + schema: "private_blockchain_facade", + table: "wallet_owners", + column: "wallet_id", + unique: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "bonus_reward_deduplication_log", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "nonce_counters", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "operation_deduplication_log", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "operation_requests", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "operations", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "transfer_deduplication_log", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "wallet_linking_deduplication_log", + schema: "private_blockchain_facade"); + + migrationBuilder.DropTable( + name: "wallet_owners", + schema: "private_blockchain_facade"); + } + } +} diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/PbfContextModelSnapshot.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/PbfContextModelSnapshot.cs index 32f0ed9..5d72ca6 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/PbfContextModelSnapshot.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/Migrations/PbfContextModelSnapshot.cs @@ -1,10 +1,10 @@ -// +// using System; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Migrations { @@ -16,18 +16,19 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("private_blockchain_facade") - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn) + .HasAnnotation("ProductVersion", "3.1.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.BonusRewardDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -37,11 +38,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.OperationDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -51,11 +53,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.TransferDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -65,11 +68,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication.WalletLinkingDeduplicationLogEntity", b => { b.Property("DeduplicationKey") - .ValueGeneratedOnAdd() - .HasColumnName("deduplication_key"); + .HasColumnName("deduplication_key") + .HasColumnType("text"); b.Property("RetentionStartsAt") - .HasColumnName("retention_starts_at"); + .HasColumnName("retention_starts_at") + .HasColumnType("timestamp without time zone"); b.HasKey("DeduplicationKey"); @@ -79,11 +83,12 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.NonceCounterEntity", b => { b.Property("MasterWalletAddress") - .ValueGeneratedOnAdd() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("CounterValue") - .HasColumnName("counter_value"); + .HasColumnName("counter_value") + .HasColumnType("bigint"); b.HasKey("MasterWalletAddress"); @@ -94,38 +99,48 @@ protected override void BuildModel(ModelBuilder modelBuilder) { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnName("id"); + .HasColumnName("id") + .HasColumnType("uuid"); b.Property("ContextJson") .IsRequired() - .HasColumnName("context_json"); + .HasColumnName("context_json") + .HasColumnType("text"); b.Property("CreatedAt") - .HasColumnName("created_at"); + .HasColumnName("created_at") + .HasColumnType("timestamp without time zone"); b.Property("CustomerId") - .HasColumnName("customer_id"); + .HasColumnName("customer_id") + .HasColumnType("text"); b.Property("MasterWalletAddress") .IsRequired() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("Nonce") - .HasColumnName("nonce"); + .HasColumnName("nonce") + .HasColumnType("bigint"); b.Property("Status") .IsRequired() - .HasColumnName("status"); + .HasColumnName("status") + .HasColumnType("text"); b.Property("Timestamp") - .HasColumnName("timestamp"); + .HasColumnName("timestamp") + .HasColumnType("timestamp without time zone"); b.Property("TransactionHash") - .HasColumnName("transaction_hash"); + .HasColumnName("transaction_hash") + .HasColumnType("text"); b.Property("Type") .IsRequired() - .HasColumnName("type"); + .HasColumnName("type") + .HasColumnType("text"); b.HasKey("Id"); @@ -136,8 +151,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasIndex("Timestamp"); b.HasIndex("TransactionHash") - .IsUnique() - .HasFilter("[transaction_hash] IS NOT NULL"); + .IsUnique(); b.HasIndex("Type"); @@ -152,38 +166,48 @@ protected override void BuildModel(ModelBuilder modelBuilder) { b.Property("Id") .ValueGeneratedOnAdd() - .HasColumnName("id"); + .HasColumnName("id") + .HasColumnType("uuid"); b.Property("ContextJson") .IsRequired() - .HasColumnName("context_json"); + .HasColumnName("context_json") + .HasColumnType("text"); b.Property("CreatedAt") - .HasColumnName("created_at"); + .HasColumnName("created_at") + .HasColumnType("timestamp without time zone"); b.Property("CustomerId") - .HasColumnName("customer_id"); + .HasColumnName("customer_id") + .HasColumnType("text"); b.Property("MasterWalletAddress") .IsRequired() - .HasColumnName("master_wallet_address"); + .HasColumnName("master_wallet_address") + .HasColumnType("text"); b.Property("Nonce") - .HasColumnName("nonce"); + .HasColumnName("nonce") + .HasColumnType("bigint"); b.Property("Status") .IsRequired() - .HasColumnName("status"); + .HasColumnName("status") + .HasColumnType("text"); b.Property("Timestamp") - .HasColumnName("timestamp"); + .HasColumnName("timestamp") + .HasColumnType("timestamp without time zone"); b.Property("TransactionHash") - .HasColumnName("transaction_hash"); + .HasColumnName("transaction_hash") + .HasColumnType("text"); b.Property("Type") .IsRequired() - .HasColumnName("type"); + .HasColumnName("type") + .HasColumnType("text"); b.HasKey("Id"); @@ -195,12 +219,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) modelBuilder.Entity("MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.WalletOwnerEntity", b => { b.Property("OwnerId") - .ValueGeneratedOnAdd() - .HasColumnName("owner_id"); + .HasColumnName("owner_id") + .HasColumnType("text"); b.Property("WalletId") .IsRequired() - .HasColumnName("wallet_id"); + .HasColumnName("wallet_id") + .HasColumnType("text"); b.HasKey("OwnerId"); diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationDeduplicationLogRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationDeduplicationLogRepository.cs index d87157e..2050e7e 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationDeduplicationLogRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationDeduplicationLogRepository.cs @@ -1,19 +1,19 @@ -using System; -using System.Data.SqlClient; +using System; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; using Microsoft.EntityFrameworkCore; +using Npgsql; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class OperationDeduplicationLogRepository : IDeduplicationLogRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; - public OperationDeduplicationLogRepository(MsSqlContextFactory contextFactory) + public OperationDeduplicationLogRepository(PostgreSQLContextFactory contextFactory) { _contextFactory = contextFactory; } @@ -32,8 +32,8 @@ public async Task IsDuplicateAsync(string key) } catch (DbUpdateException e) { - if (e.InnerException is SqlException sqlException && - sqlException.Number == MsSqlErrorCodes.PrimaryKeyConstraintViolation) + if (e.InnerException is PostgresException sqlException && + sqlException.SqlState == PostgresErrorCodes.UniqueViolation) { return true; } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationRequestsRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationRequestsRepository.cs index dce9583..807e845 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationRequestsRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationRequestsRepository.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Common; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Operations; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; +using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using MoreLinq; @@ -15,7 +15,7 @@ namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class OperationRequestsRepository : IOperationRequestsRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; private readonly ISqlRepositoryHelper _sqlRepositoryHelper; static class NonceCounterSql @@ -25,7 +25,7 @@ static class NonceCounterSql } public OperationRequestsRepository( - MsSqlContextFactory contextFactory, + PostgreSQLContextFactory contextFactory, ISqlRepositoryHelper sqlRepositoryHelper) { _contextFactory = contextFactory; @@ -108,7 +108,7 @@ public async Task GenerateNextCounterAsync(string masterWalletAdd using (var context = _contextFactory.CreateDataContext()) { var nextNonceResult = - await context.NonceCounters.FromSql(sqlText, masterWalletAddressParam).ToListAsync(); + await context.NonceCounters.FromSqlRaw(sqlText, masterWalletAddressParam).ToListAsync(); return nextNonceResult.Single(); } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationsRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationsRepository.cs index d33f8b8..6e70440 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationsRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/OperationsRepository.cs @@ -1,24 +1,24 @@ -using System; +using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Operations; using Microsoft.EntityFrameworkCore; using MoreLinq; +using Npgsql; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class OperationsRepository : IOperationsRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; - public OperationsRepository(MsSqlContextFactory contextFactory) + public OperationsRepository(PostgreSQLContextFactory contextFactory) { _contextFactory = contextFactory; } @@ -85,8 +85,8 @@ public async Task SetStatusAsync(Guid id, OperationStatus status, string hash) } catch (DbUpdateException e) { - if (e.InnerException is SqlException sqlException && - sqlException.Number == MsSqlErrorCodes.DuplicateIndex) + if (e.InnerException is PostgresException sqlException && + sqlException.SqlState == PostgresErrorCodes.UniqueViolation) { throw new DuplicateException(hash); } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/TransferDeduplicationLogRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/TransferDeduplicationLogRepository.cs index 2ecb22f..c108f3c 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/TransferDeduplicationLogRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/TransferDeduplicationLogRepository.cs @@ -1,20 +1,20 @@ -using System; -using System.Data.SqlClient; +using System; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; using Microsoft.EntityFrameworkCore; +using Npgsql; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class TransferDeduplicationLogRepository : IDeduplicationLogRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; - public TransferDeduplicationLogRepository(MsSqlContextFactory contextFactory) + public TransferDeduplicationLogRepository(PostgreSQLContextFactory contextFactory) { _contextFactory = contextFactory; } @@ -33,8 +33,8 @@ public async Task IsDuplicateAsync(string key) } catch (DbUpdateException e) { - if (e.InnerException is SqlException sqlException && - sqlException.Number == MsSqlErrorCodes.PrimaryKeyConstraintViolation) + if (e.InnerException is PostgresException sqlException && + sqlException.SqlState == PostgresErrorCodes.UniqueViolation) { return true; } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletLinkingDeduplicationLogRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletLinkingDeduplicationLogRepository.cs index a5bbfda..61d2d96 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletLinkingDeduplicationLogRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletLinkingDeduplicationLogRepository.cs @@ -1,19 +1,20 @@ -using System; +using System; using System.Data.SqlClient; using System.Threading.Tasks; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; using Microsoft.EntityFrameworkCore; +using Npgsql; namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class WalletLinkingDeduplicationLogRepository : IDeduplicationLogRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; - public WalletLinkingDeduplicationLogRepository(MsSqlContextFactory contextFactory) + public WalletLinkingDeduplicationLogRepository(PostgreSQLContextFactory contextFactory) { _contextFactory = contextFactory; } @@ -32,8 +33,8 @@ public async Task IsDuplicateAsync(string key) } catch (DbUpdateException e) { - if (e.InnerException is SqlException sqlException && - sqlException.Number == MsSqlErrorCodes.PrimaryKeyConstraintViolation) + if (e.InnerException is PostgresException sqlException && + sqlException.SqlState == PostgresErrorCodes.UniqueViolation) { return true; } diff --git a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletOwnersRepository.cs b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletOwnersRepository.cs index 4d09bf4..047abdf 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletOwnersRepository.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories/WalletOwnersRepository.cs @@ -1,7 +1,7 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using Common.Log; using Lykke.Common.Log; -using MAVN.Common.MsSql; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Wallets; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Contexts; using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities; @@ -11,10 +11,10 @@ namespace MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories { public class WalletOwnersRepository : IWalletOwnersRepository { - private readonly MsSqlContextFactory _contextFactory; + private readonly PostgreSQLContextFactory _contextFactory; private readonly ILog _log; - public WalletOwnersRepository(MsSqlContextFactory contextFactory, ILogFactory logFactory) + public WalletOwnersRepository(PostgreSQLContextFactory contextFactory, ILogFactory logFactory) { _contextFactory = contextFactory; _log = logFactory.CreateLog(this); diff --git a/src/MAVN.Service.PrivateBlockchainFacade/Dockerfile b/src/MAVN.Service.PrivateBlockchainFacade/Dockerfile index 5797b94..629ccd4 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade/Dockerfile +++ b/src/MAVN.Service.PrivateBlockchainFacade/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.2-aspnetcore-runtime +FROM microsoft/dotnet:3.1-aspnetcore-runtime WORKDIR /app COPY . . ENTRYPOINT ["dotnet", "MAVN.Service.PrivateBlockchainFacade.dll"] diff --git a/src/MAVN.Service.PrivateBlockchainFacade/MAVN.Service.PrivateBlockchainFacade.csproj b/src/MAVN.Service.PrivateBlockchainFacade/MAVN.Service.PrivateBlockchainFacade.csproj index 8f56493..2cca9b1 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade/MAVN.Service.PrivateBlockchainFacade.csproj +++ b/src/MAVN.Service.PrivateBlockchainFacade/MAVN.Service.PrivateBlockchainFacade.csproj @@ -1,6 +1,6 @@ - netcoreapp2.2 + netcoreapp3.1 Exe 1.0.0 @@ -13,6 +13,9 @@ latest + + Always + PreserveNewest @@ -20,7 +23,8 @@ - + + diff --git a/src/MAVN.Service.PrivateBlockchainFacade/Modules/DataModule.cs b/src/MAVN.Service.PrivateBlockchainFacade/Modules/DataModule.cs index 458f9e0..850025f 100644 --- a/src/MAVN.Service.PrivateBlockchainFacade/Modules/DataModule.cs +++ b/src/MAVN.Service.PrivateBlockchainFacade/Modules/DataModule.cs @@ -1,6 +1,5 @@ -using Autofac; +using Autofac; using JetBrains.Annotations; -using MAVN.Common.MsSql; using MAVN.Service.PrivateBlockchainFacade.Domain.Common; using MAVN.Service.PrivateBlockchainFacade.Domain.Deduplication; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Operations; @@ -10,6 +9,7 @@ using MAVN.Service.PrivateBlockchainFacade.MsSqlRepositories.Entities.Deduplication; using MAVN.Service.PrivateBlockchainFacade.Settings; using Lykke.SettingsReader; +using MAVN.Persistence.PostgreSQL.Legacy; namespace MAVN.Service.PrivateBlockchainFacade.Modules { @@ -27,7 +27,7 @@ public DataModule(IReloadingManager appSettings) protected override void Load(ContainerBuilder builder) { - builder.RegisterMsSql( + builder.RegisterPostgreSQL( _dbSettings.DataConnString, connString => new PbfContext(connString, false, _dbSettings.CommandTimeoutSeconds ?? DefaultCommandTimeoutSeconds), dbConn => new PbfContext(dbConn)); diff --git a/tests/MAVN.Service.PrivateBlockchainFacade.Tests/MAVN.Service.PrivateBlockchainFacade.Tests.csproj b/tests/MAVN.Service.PrivateBlockchainFacade.Tests/MAVN.Service.PrivateBlockchainFacade.Tests.csproj index c8edd37..80412bc 100644 --- a/tests/MAVN.Service.PrivateBlockchainFacade.Tests/MAVN.Service.PrivateBlockchainFacade.Tests.csproj +++ b/tests/MAVN.Service.PrivateBlockchainFacade.Tests/MAVN.Service.PrivateBlockchainFacade.Tests.csproj @@ -1,18 +1,18 @@ - netcoreapp2.2 + netcoreapp3.1 1.0.0 - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/MAVN.Service.PrivateBlockchainFacade.Tests/OperationsFetcherTests.cs b/tests/MAVN.Service.PrivateBlockchainFacade.Tests/OperationsFetcherTests.cs index 147cc36..0602b29 100644 --- a/tests/MAVN.Service.PrivateBlockchainFacade.Tests/OperationsFetcherTests.cs +++ b/tests/MAVN.Service.PrivateBlockchainFacade.Tests/OperationsFetcherTests.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Common; -using MAVN.Common.MsSql; using Lykke.Logs; +using MAVN.Persistence.PostgreSQL.Legacy; using MAVN.Service.PrivateBlockchainFacade.Contract.Operations; using MAVN.Service.PrivateBlockchainFacade.Domain.Features.Operations; using MAVN.Service.PrivateBlockchainFacade.DomainServices.Common; @@ -111,7 +111,7 @@ public async Task GetByHashAsync_InvalidInputParameters_RaisesException(string h .UseInMemoryDatabase(inMemoryDatabaseName) .Options; - var dbFactory = new MsSqlContextFactory(opts => new PbfContext(options, true), options); + var dbFactory = new PostgreSQLContextFactory(opts => new PbfContext(options, true), options); _operationsRepository = new OperationsRepository(dbFactory);