diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d618be6..22d6f5e 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 18f5e70..615b5ca 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.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj b/client/MAVN.Service.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj
index 6195045..2028f84 100644
--- a/client/MAVN.Service.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj
+++ b/client/MAVN.Service.DashboardStatistics.Client/MAVN.Service.DashboardStatistics.Client.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.Domain.csproj b/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.Domain.csproj
index 3f8ddb3..d893ad4 100644
--- a/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.Domain.csproj
+++ b/src/MAVN.Service.DashboardStatistics.Domain/MAVN.Service.DashboardStatistics.Domain.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
diff --git a/src/MAVN.Service.DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj b/src/MAVN.Service.DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj
index bc17ed7..1b18aea 100644
--- a/src/MAVN.Service.DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj
+++ b/src/MAVN.Service.DashboardStatistics.DomainServices/MAVN.Service.DashboardStatistics.DomainServices.csproj
@@ -1,14 +1,14 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
-
+
-
+
-
+
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/AutofacModule.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/AutofacModule.cs
index 38af27c..d5528b5 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/AutofacModule.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/AutofacModule.cs
@@ -1,5 +1,5 @@
using Autofac;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.DashboardStatistics.Domain.Repositories;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Repositories;
@@ -16,7 +16,7 @@ public AutofacModule(string connectionString)
protected override void Load(ContainerBuilder builder)
{
- builder.RegisterMsSql(_connectionString,
+ builder.RegisterPostgreSQL(_connectionString,
connectionString => new DashboardStatisticsContext(connectionString, false),
dbConnection => new DashboardStatisticsContext(dbConnection));
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs
index 0c7d524..83da3dc 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/DashboardStatisticsContext.cs
@@ -1,13 +1,13 @@
using System;
using System.Data.Common;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.DashboardStatistics.Domain.Enums;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
using Microsoft.EntityFrameworkCore;
namespace MAVN.Service.DashboardStatistics.MsSqlRepositories
{
- public class DashboardStatisticsContext : MsSqlContext
+ public class DashboardStatisticsContext : PostgreSQLContext
{
private const string Schema = "dashboard_statistic";
@@ -34,11 +34,11 @@ public DashboardStatisticsContext(DbConnection dbConnection)
public DbSet PartnerVouchersDailyStatistics { get; set; }
- protected override void OnLykkeConfiguring(DbContextOptionsBuilder optionsBuilder)
+ protected override void OnMAVNConfiguring(DbContextOptionsBuilder optionsBuilder)
{
}
- protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+ protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity()
.HasIndex(c => c.CustomerId);
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj
index 37a5a6a..ab6035c 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/MAVN.Service.DashboardStatistics.MsSqlRepositories.csproj
@@ -1,12 +1,15 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
-
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
true
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.Designer.cs
deleted file mode 100644
index a04e151..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.Designer.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20190731134307_Initial")]
- partial class Initial
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.LeadStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("LeadId")
- .HasColumnName("lead_id");
-
- b.Property("State")
- .HasColumnName("state");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.ToTable("lead_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.cs
deleted file mode 100644
index 0883ada..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190731134307_Initial.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class Initial : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.EnsureSchema(
- name: "dashboard_statistic");
-
- migrationBuilder.CreateTable(
- name: "lead_statistics",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false),
- lead_id = table.Column(nullable: true),
- time_stamp = table.Column(nullable: false),
- state = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_lead_statistics", x => x.id);
- });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "lead_statistics",
- schema: "dashboard_statistic");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.Designer.cs
deleted file mode 100644
index cdcbc99..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.Designer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20190808115717_AddCustomersStatistic")]
- partial class AddCustomersStatistic
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.ToTable("customer_statistics");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.LeadStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("LeadId")
- .HasColumnName("lead_id");
-
- b.Property("State")
- .HasColumnName("state");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.ToTable("lead_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.cs
deleted file mode 100644
index f9b9aac..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20190808115717_AddCustomersStatistic.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class AddCustomersStatistic : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "customer_statistics",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false),
- customer_id = table.Column(nullable: true),
- time_stamp = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_customer_statistics", x => x.id);
- });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "customer_statistics",
- schema: "dashboard_statistic");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.Designer.cs
deleted file mode 100644
index a1d7983..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.Designer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20191010102954_CustomerStatisticIndex")]
- partial class CustomerStatisticIndex
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .IsRequired()
- .HasColumnName("customer_id")
- .HasColumnType("char(36)");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.HasIndex("CustomerId");
-
- b.ToTable("customer_statistics");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.LeadStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("LeadId")
- .HasColumnName("lead_id");
-
- b.Property("State")
- .HasColumnName("state");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.ToTable("lead_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.cs
deleted file mode 100644
index c76f127..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191010102954_CustomerStatisticIndex.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class CustomerStatisticIndex : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn(
- name: "customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- type: "char(36)",
- nullable: false,
- oldClrType: typeof(string),
- oldNullable: true);
-
- migrationBuilder.CreateIndex(
- name: "IX_customer_statistics_customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- column: "customer_id");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropIndex(
- name: "IX_customer_statistics_customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics");
-
- migrationBuilder.AlterColumn(
- name: "customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- nullable: true,
- oldClrType: typeof(string),
- oldType: "char(36)");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.Designer.cs
deleted file mode 100644
index 22c7660..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.Designer.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20191016152159_CustomersActivity")]
- partial class CustomersActivity
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("ActivityDate")
- .HasColumnName("activity_date");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.HasKey("Id");
-
- b.ToTable("customer_activities");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.HasIndex("CustomerId");
-
- b.ToTable("customer_statistics");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.LeadStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("LeadId")
- .HasColumnName("lead_id");
-
- b.Property("State")
- .HasColumnName("state");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.ToTable("lead_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.cs
deleted file mode 100644
index a2732b7..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20191016152159_CustomersActivity.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class CustomersActivity : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn(
- name: "lead_id",
- schema: "dashboard_statistic",
- table: "lead_statistics",
- nullable: false,
- oldClrType: typeof(string),
- oldNullable: true);
-
- migrationBuilder.AlterColumn(
- name: "customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- nullable: false,
- oldClrType: typeof(string),
- oldType: "char(36)");
-
- migrationBuilder.CreateTable(
- name: "customer_activities",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false),
- customer_id = table.Column(nullable: false),
- activity_date = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_customer_activities", x => x.id);
- });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "customer_activities",
- schema: "dashboard_statistic");
-
- migrationBuilder.AlterColumn(
- name: "lead_id",
- schema: "dashboard_statistic",
- table: "lead_statistics",
- nullable: true,
- oldClrType: typeof(Guid));
-
- migrationBuilder.AlterColumn(
- name: "customer_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- type: "char(36)",
- nullable: false,
- oldClrType: typeof(Guid));
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.Designer.cs
deleted file mode 100644
index abe7f51..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.Designer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads")]
- partial class AddPartnerIdToCustomerStatisticsAndRemoveLeads
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("ActivityDate")
- .HasColumnName("activity_date");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.HasKey("Id");
-
- b.ToTable("customer_activities");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.HasIndex("CustomerId");
-
- b.HasIndex("PartnerId");
-
- b.ToTable("customer_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.cs
deleted file mode 100644
index f4f6f2c..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200601091716_AddPartnerIdToCustomerStatisticsAndRemoveLeads.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class AddPartnerIdToCustomerStatisticsAndRemoveLeads : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "lead_statistics",
- schema: "dashboard_statistic");
-
- migrationBuilder.AddColumn(
- name: "partner_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- nullable: true);
-
- migrationBuilder.CreateIndex(
- name: "IX_customer_statistics_partner_id",
- schema: "dashboard_statistic",
- table: "customer_statistics",
- column: "partner_id");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropIndex(
- name: "IX_customer_statistics_partner_id",
- schema: "dashboard_statistic",
- table: "customer_statistics");
-
- migrationBuilder.DropColumn(
- name: "partner_id",
- schema: "dashboard_statistic",
- table: "customer_statistics");
-
- migrationBuilder.CreateTable(
- name: "lead_statistics",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false),
- lead_id = table.Column(nullable: false),
- state = table.Column(nullable: false),
- time_stamp = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_lead_statistics", x => x.id);
- });
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.Designer.cs
deleted file mode 100644
index 956cfd0..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.Designer.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20200604115122_AddVoucherOperationsStatisticEntity")]
- partial class AddVoucherOperationsStatisticEntity
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("ActivityDate")
- .HasColumnName("activity_date");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.HasKey("Id");
-
- b.ToTable("customer_activities");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.HasIndex("CustomerId");
-
- b.HasIndex("PartnerId");
-
- b.ToTable("customer_statistics");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.VoucherOperationsStatisticsEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("Currency")
- .HasColumnName("currency");
-
- b.Property("OperationType")
- .IsRequired()
- .HasColumnName("operation_type");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.Property("Sum")
- .HasColumnName("sum");
-
- b.Property("TotalCount")
- .HasColumnName("total_count");
-
- b.HasKey("Id");
-
- b.HasIndex("PartnerId", "OperationType");
-
- b.ToTable("voucher_operations_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.cs
deleted file mode 100644
index e89b51d..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200604115122_AddVoucherOperationsStatisticEntity.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class AddVoucherOperationsStatisticEntity : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "voucher_operations_statistics",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false),
- partner_id = table.Column(nullable: false),
- operation_type = table.Column(nullable: false),
- sum = table.Column(nullable: false),
- currency = table.Column(nullable: true),
- total_count = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_voucher_operations_statistics", x => x.id);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_voucher_operations_statistics_partner_id_operation_type",
- schema: "dashboard_statistic",
- table: "voucher_operations_statistics",
- columns: new[] { "partner_id", "operation_type" });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "voucher_operations_statistics",
- schema: "dashboard_statistic");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.Designer.cs
deleted file mode 100644
index f31ad86..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.Designer.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-using System;
-using MAVN.Service.DashboardStatistics.MsSqlRepositories;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- [DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20200605084637_ExtendActivityEntityWithPartnerIdAndType")]
- partial class ExtendActivityEntityWithPartnerIdAndType
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasDefaultSchema("dashboard_statistic")
- .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("ActivityDate")
- .HasColumnName("activity_date");
-
- b.Property("ActivityType")
- .HasColumnName("activity_type");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.HasKey("Id");
-
- b.ToTable("customer_activities");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.CustomerStatisticEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("CustomerId")
- .HasColumnName("customer_id");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.Property("TimeStamp")
- .HasColumnName("time_stamp");
-
- b.HasKey("Id");
-
- b.HasIndex("CustomerId");
-
- b.HasIndex("PartnerId");
-
- b.ToTable("customer_statistics");
- });
-
- modelBuilder.Entity("MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities.VoucherOperationsStatisticsEntity", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnName("id");
-
- b.Property("Currency")
- .HasColumnName("currency");
-
- b.Property("OperationType")
- .IsRequired()
- .HasColumnName("operation_type");
-
- b.Property("PartnerId")
- .HasColumnName("partner_id");
-
- b.Property("Sum")
- .HasColumnName("sum");
-
- b.Property("TotalCount")
- .HasColumnName("total_count");
-
- b.HasKey("Id");
-
- b.HasIndex("PartnerId", "OperationType");
-
- b.ToTable("voucher_operations_statistics");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.cs
deleted file mode 100644
index 99e1b46..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605084637_ExtendActivityEntityWithPartnerIdAndType.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class ExtendActivityEntityWithPartnerIdAndType : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AddColumn(
- name: "activity_type",
- schema: "dashboard_statistic",
- table: "customer_activities",
- nullable: true);
-
- migrationBuilder.AddColumn(
- name: "partner_id",
- schema: "dashboard_statistic",
- table: "customer_activities",
- nullable: true);
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropColumn(
- name: "activity_type",
- schema: "dashboard_statistic",
- table: "customer_activities");
-
- migrationBuilder.DropColumn(
- name: "partner_id",
- schema: "dashboard_statistic",
- table: "customer_activities");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.cs
deleted file mode 100644
index 95df199..0000000
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
-{
- public partial class AddDailyVoucherStatistics : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "partner_vouchers_daily_stats",
- schema: "dashboard_statistic",
- columns: table => new
- {
- id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- partner_id = table.Column(nullable: false),
- operation_type = table.Column(nullable: false),
- sum = table.Column(nullable: false),
- currency = table.Column(nullable: false),
- total_count = table.Column(nullable: false),
- date = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_partner_vouchers_daily_stats", x => x.id);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_partner_vouchers_daily_stats_partner_id_operation_type",
- schema: "dashboard_statistic",
- table: "partner_vouchers_daily_stats",
- columns: new[] { "partner_id", "operation_type" });
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "partner_vouchers_daily_stats",
- schema: "dashboard_statistic");
- }
- }
-}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.Designer.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.Designer.cs
similarity index 56%
rename from src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.Designer.cs
rename to src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.Designer.cs
index a6a1822..011a519 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200605141249_AddDailyVoucherStatistics.Designer.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.Designer.cs
@@ -3,42 +3,47 @@
using MAVN.Service.DashboardStatistics.MsSqlRepositories;
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.DashboardStatistics.MsSqlRepositories.Migrations
{
[DbContext(typeof(DashboardStatisticsContext))]
- [Migration("20200605141249_AddDailyVoucherStatistics")]
- partial class AddDailyVoucherStatistics
+ [Migration("20200702075302_Initial")]
+ partial class Initial
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("dashboard_statistic")
- .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.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("ActivityDate")
- .HasColumnName("activity_date");
+ .HasColumnName("activity_date")
+ .HasColumnType("timestamp without time zone");
b.Property("ActivityType")
- .HasColumnName("activity_type");
+ .HasColumnName("activity_type")
+ .HasColumnType("integer");
b.Property("CustomerId")
- .HasColumnName("customer_id");
+ .HasColumnName("customer_id")
+ .HasColumnType("uuid");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.HasKey("Id");
@@ -49,16 +54,20 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("CustomerId")
- .HasColumnName("customer_id");
+ .HasColumnName("customer_id")
+ .HasColumnType("uuid");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("TimeStamp")
- .HasColumnName("time_stamp");
+ .HasColumnName("time_stamp")
+ .HasColumnType("timestamp without time zone");
b.HasKey("Id");
@@ -74,27 +83,34 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.Property("Id")
.ValueGeneratedOnAdd()
.HasColumnName("id")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+ .HasColumnType("bigint")
+ .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property("Currency")
.IsRequired()
- .HasColumnName("currency");
+ .HasColumnName("currency")
+ .HasColumnType("text");
b.Property("Date")
- .HasColumnName("date");
+ .HasColumnName("date")
+ .HasColumnType("timestamp without time zone");
b.Property("OperationType")
.IsRequired()
- .HasColumnName("operation_type");
+ .HasColumnName("operation_type")
+ .HasColumnType("text");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("Sum")
- .HasColumnName("sum");
+ .HasColumnName("sum")
+ .HasColumnType("numeric");
b.Property("TotalCount")
- .HasColumnName("total_count");
+ .HasColumnName("total_count")
+ .HasColumnType("integer");
b.HasKey("Id");
@@ -107,23 +123,29 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("Currency")
- .HasColumnName("currency");
+ .HasColumnName("currency")
+ .HasColumnType("text");
b.Property("OperationType")
.IsRequired()
- .HasColumnName("operation_type");
+ .HasColumnName("operation_type")
+ .HasColumnType("text");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("Sum")
- .HasColumnName("sum");
+ .HasColumnName("sum")
+ .HasColumnType("numeric");
b.Property("TotalCount")
- .HasColumnName("total_count");
+ .HasColumnName("total_count")
+ .HasColumnType("integer");
b.HasKey("Id");
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.cs
new file mode 100644
index 0000000..a5d775b
--- /dev/null
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/20200702075302_Initial.cs
@@ -0,0 +1,125 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
+{
+ public partial class Initial : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.EnsureSchema(
+ name: "dashboard_statistic");
+
+ migrationBuilder.CreateTable(
+ name: "customer_activities",
+ schema: "dashboard_statistic",
+ columns: table => new
+ {
+ id = table.Column(nullable: false),
+ customer_id = table.Column(nullable: false),
+ activity_date = table.Column(nullable: false),
+ partner_id = table.Column(nullable: true),
+ activity_type = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_customer_activities", x => x.id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "customer_statistics",
+ schema: "dashboard_statistic",
+ columns: table => new
+ {
+ id = table.Column(nullable: false),
+ customer_id = table.Column(nullable: false),
+ partner_id = table.Column(nullable: true),
+ time_stamp = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_customer_statistics", x => x.id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "partner_vouchers_daily_stats",
+ schema: "dashboard_statistic",
+ columns: table => new
+ {
+ id = table.Column(nullable: false)
+ .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+ partner_id = table.Column(nullable: false),
+ operation_type = table.Column(nullable: false),
+ sum = table.Column(nullable: false),
+ currency = table.Column(nullable: false),
+ total_count = table.Column(nullable: false),
+ date = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_partner_vouchers_daily_stats", x => x.id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "voucher_operations_statistics",
+ schema: "dashboard_statistic",
+ columns: table => new
+ {
+ id = table.Column(nullable: false),
+ partner_id = table.Column(nullable: false),
+ operation_type = table.Column(nullable: false),
+ sum = table.Column(nullable: false),
+ currency = table.Column(nullable: true),
+ total_count = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_voucher_operations_statistics", x => x.id);
+ });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_customer_statistics_customer_id",
+ schema: "dashboard_statistic",
+ table: "customer_statistics",
+ column: "customer_id");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_customer_statistics_partner_id",
+ schema: "dashboard_statistic",
+ table: "customer_statistics",
+ column: "partner_id");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_partner_vouchers_daily_stats_partner_id_operation_type",
+ schema: "dashboard_statistic",
+ table: "partner_vouchers_daily_stats",
+ columns: new[] { "partner_id", "operation_type" });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_voucher_operations_statistics_partner_id_operation_type",
+ schema: "dashboard_statistic",
+ table: "voucher_operations_statistics",
+ columns: new[] { "partner_id", "operation_type" });
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "customer_activities",
+ schema: "dashboard_statistic");
+
+ migrationBuilder.DropTable(
+ name: "customer_statistics",
+ schema: "dashboard_statistic");
+
+ migrationBuilder.DropTable(
+ name: "partner_vouchers_daily_stats",
+ schema: "dashboard_statistic");
+
+ migrationBuilder.DropTable(
+ name: "voucher_operations_statistics",
+ schema: "dashboard_statistic");
+ }
+ }
+}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/DashboardStatisticsContextModelSnapshot.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/DashboardStatisticsContextModelSnapshot.cs
index 6af587f..8c92520 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/DashboardStatisticsContextModelSnapshot.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Migrations/DashboardStatisticsContextModelSnapshot.cs
@@ -3,8 +3,8 @@
using MAVN.Service.DashboardStatistics.MsSqlRepositories;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Migrations
{
@@ -16,27 +16,32 @@ protected override void BuildModel(ModelBuilder modelBuilder)
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("dashboard_statistic")
- .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.DashboardStatistics.MsSqlRepositories.Entities.CustomerActivityEntity", b =>
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("ActivityDate")
- .HasColumnName("activity_date");
+ .HasColumnName("activity_date")
+ .HasColumnType("timestamp without time zone");
b.Property("ActivityType")
- .HasColumnName("activity_type");
+ .HasColumnName("activity_type")
+ .HasColumnType("integer");
b.Property("CustomerId")
- .HasColumnName("customer_id");
+ .HasColumnName("customer_id")
+ .HasColumnType("uuid");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.HasKey("Id");
@@ -47,16 +52,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("CustomerId")
- .HasColumnName("customer_id");
+ .HasColumnName("customer_id")
+ .HasColumnType("uuid");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("TimeStamp")
- .HasColumnName("time_stamp");
+ .HasColumnName("time_stamp")
+ .HasColumnType("timestamp without time zone");
b.HasKey("Id");
@@ -72,27 +81,34 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property("Id")
.ValueGeneratedOnAdd()
.HasColumnName("id")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+ .HasColumnType("bigint")
+ .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
b.Property("Currency")
.IsRequired()
- .HasColumnName("currency");
+ .HasColumnName("currency")
+ .HasColumnType("text");
b.Property("Date")
- .HasColumnName("date");
+ .HasColumnName("date")
+ .HasColumnType("timestamp without time zone");
b.Property("OperationType")
.IsRequired()
- .HasColumnName("operation_type");
+ .HasColumnName("operation_type")
+ .HasColumnType("text");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("Sum")
- .HasColumnName("sum");
+ .HasColumnName("sum")
+ .HasColumnType("numeric");
b.Property("TotalCount")
- .HasColumnName("total_count");
+ .HasColumnName("total_count")
+ .HasColumnType("integer");
b.HasKey("Id");
@@ -105,23 +121,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
b.Property("Id")
.ValueGeneratedOnAdd()
- .HasColumnName("id");
+ .HasColumnName("id")
+ .HasColumnType("uuid");
b.Property("Currency")
- .HasColumnName("currency");
+ .HasColumnName("currency")
+ .HasColumnType("text");
b.Property("OperationType")
.IsRequired()
- .HasColumnName("operation_type");
+ .HasColumnName("operation_type")
+ .HasColumnType("text");
b.Property("PartnerId")
- .HasColumnName("partner_id");
+ .HasColumnName("partner_id")
+ .HasColumnType("uuid");
b.Property("Sum")
- .HasColumnName("sum");
+ .HasColumnName("sum")
+ .HasColumnType("numeric");
b.Property("TotalCount")
- .HasColumnName("total_count");
+ .HasColumnName("total_count")
+ .HasColumnType("integer");
b.HasKey("Id");
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerActivityRepository.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerActivityRepository.cs
index a170054..56475cb 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerActivityRepository.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerActivityRepository.cs
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.DashboardStatistics.Domain.Repositories;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
using Microsoft.EntityFrameworkCore;
@@ -10,9 +10,9 @@ namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Repositories
{
public class CustomerActivityRepository : ICustomerActivityRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
- public CustomerActivityRepository(MsSqlContextFactory contextFactory)
+ public CustomerActivityRepository(PostgreSQLContextFactory contextFactory)
{
_contextFactory = contextFactory;
}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerRegistrationRepository.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerRegistrationRepository.cs
index cdc2c74..6620c3d 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerRegistrationRepository.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/CustomerRegistrationRepository.cs
@@ -1,19 +1,19 @@
-using MAVN.Common.MsSql;
-using MAVN.Service.DashboardStatistics.Domain.Repositories;
+using MAVN.Service.DashboardStatistics.Domain.Repositories;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using MAVN.Persistence.PostgreSQL.Legacy;
namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Repositories
{
public class CustomerStatisticRepository : ICustomerRegistrationRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
- public CustomerStatisticRepository(MsSqlContextFactory contextFactory)
+ public CustomerStatisticRepository(PostgreSQLContextFactory contextFactory)
{
_contextFactory = contextFactory;
}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/PartnerVouchersDailyStatsRepository.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/PartnerVouchersDailyStatsRepository.cs
index 047f3e2..af86cd1 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/PartnerVouchersDailyStatsRepository.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/PartnerVouchersDailyStatsRepository.cs
@@ -3,7 +3,7 @@
using System.Linq;
using System.Threading.Tasks;
using AutoMapper;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.DashboardStatistics.Domain.Models.VoucherStatistic;
using MAVN.Service.DashboardStatistics.Domain.Repositories;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
@@ -13,10 +13,10 @@ namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Repositories
{
public class PartnerVouchersDailyStatsRepository : IPartnerVouchersDailyStatsRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
public PartnerVouchersDailyStatsRepository(
- MsSqlContextFactory contextFactory)
+ PostgreSQLContextFactory contextFactory)
{
_contextFactory = contextFactory;
}
diff --git a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/VoucherOperationsStatisticRepository.cs b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/VoucherOperationsStatisticRepository.cs
index fbf7b11..de5c205 100644
--- a/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/VoucherOperationsStatisticRepository.cs
+++ b/src/MAVN.Service.DashboardStatistics.MsSqlRepositories/Repositories/VoucherOperationsStatisticRepository.cs
@@ -3,7 +3,7 @@
using System.Linq;
using System.Threading.Tasks;
using AutoMapper;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.DashboardStatistics.Domain.Models.VoucherStatistic;
using MAVN.Service.DashboardStatistics.Domain.Repositories;
using MAVN.Service.DashboardStatistics.MsSqlRepositories.Entities;
@@ -13,11 +13,11 @@ namespace MAVN.Service.DashboardStatistics.MsSqlRepositories.Repositories
{
public class VoucherOperationsStatisticRepository : IVoucherOperationsStatisticRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
private readonly IMapper _mapper;
public VoucherOperationsStatisticRepository(
- MsSqlContextFactory contextFactory,
+ PostgreSQLContextFactory contextFactory,
IMapper mapper)
{
_contextFactory = contextFactory;
diff --git a/src/MAVN.Service.DashboardStatistics/Dockerfile b/src/MAVN.Service.DashboardStatistics/Dockerfile
index 1e9350f..04ca3e8 100644
--- a/src/MAVN.Service.DashboardStatistics/Dockerfile
+++ b/src/MAVN.Service.DashboardStatistics/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.DashboardStatistics.dll"]
diff --git a/src/MAVN.Service.DashboardStatistics/MAVN.Service.DashboardStatistics.csproj b/src/MAVN.Service.DashboardStatistics/MAVN.Service.DashboardStatistics.csproj
index cbf6546..a1929fc 100644
--- a/src/MAVN.Service.DashboardStatistics/MAVN.Service.DashboardStatistics.csproj
+++ b/src/MAVN.Service.DashboardStatistics/MAVN.Service.DashboardStatistics.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ netcoreapp3.1
Exe
1.0.0
d57e7c22-b420-456f-bce7-46989afbdce4
@@ -14,17 +14,21 @@
latest
+
+ Always
+
PreserveNewest
-
-
+
+
+
-
+
diff --git a/tests/MAVN.Service.DashboardStatistics.Tests/MAVN.Service.DashboardStatistics.Tests.csproj b/tests/MAVN.Service.DashboardStatistics.Tests/MAVN.Service.DashboardStatistics.Tests.csproj
index 0508847..40959e2 100644
--- a/tests/MAVN.Service.DashboardStatistics.Tests/MAVN.Service.DashboardStatistics.Tests.csproj
+++ b/tests/MAVN.Service.DashboardStatistics.Tests/MAVN.Service.DashboardStatistics.Tests.csproj
@@ -1,18 +1,21 @@
-
+
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+