Merge pull request #10 from IliyanIlievPH/9

Closes #9
OpenMAVN · Jul 20, 2020 · 0b8bbae · 0b8bbae
2 parents f5c8b0e + 119f89c
commit 0b8bbae
Show file tree

Hide file tree

Showing 25 changed files with 95 additions and 459 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 2.2.207
+          dotnet-version: 3.1.302
       - name: Install dependencies
         run: dotnet restore
       - name: Build solution

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.2.207
+        dotnet-version: 3.1.302
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/.../MAVN.Service.EncryptedFileStorage.Client/MAVN.Service.EncryptedFileStorage.Client.csproj b/.../MAVN.Service.EncryptedFileStorage.Client/MAVN.Service.EncryptedFileStorage.Client.csproj
@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.EncryptedFileStorage.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.HttpClientGenerator" Version="3.1.0" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
     <PackageReference Include="Refit" Version="4.6.30" />
   </ItemGroup>
 </Project>
diff --git a/...dFileStorage.AzureRepositories/MAVN.Service.EncryptedFileStorage.AzureRepositories.csproj b/...dFileStorage.AzureRepositories/MAVN.Service.EncryptedFileStorage.AzureRepositories.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.AzureStorage" Version="8.13.4" />
     <PackageReference Include="Microsoft.Azure.ConfigurationManager" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.KeyVault.Extensions" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.0" />
-    <PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.1.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.KeyVault.Extensions" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.7" />
+    <PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.1.7" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.8" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/MAVN.Service.EncryptedFileStorage.Domain/MAVN.Service.EncryptedFileStorage.Domain.csproj b/src/MAVN.Service.EncryptedFileStorage.Domain/MAVN.Service.EncryptedFileStorage.Domain.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.Common" Version="7.4.0" />
-    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.3.1" />
+    <PackageReference Include="Lykke.Common" Version="7.5.0" />
+    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.5.0" />
   </ItemGroup>
 </Project>
diff --git a/...cryptedFileStorage.DomainServices/MAVN.Service.EncryptedFileStorage.DomainServices.csproj b/...cryptedFileStorage.DomainServices/MAVN.Service.EncryptedFileStorage.DomainServices.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.ConfigurationManager" Version="4.0.0" />
     <PackageReference Include="Microsoft.Azure.ConfigurationManager" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.KeyVault.Extensions" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.0" />
-    <PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.1.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.KeyVault.Extensions" Version="3.0.5" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.7" />
+    <PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.1.7" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.8" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/MAVN.Service.EncryptedFileStorage.MsSqlRepositories/DatabaseContext.cs b/src/MAVN.Service.EncryptedFileStorage.MsSqlRepositories/DatabaseContext.cs
@@ -1,13 +1,13 @@
-using System.Data.Common;
+using System.Data.Common;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.EncryptedFileStorage.Domain.Models;
 using MAVN.Service.EncryptedFileStorage.MsSqlRepositories.EntityConfigurations;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.EncryptedFileStorage.MsSqlRepositories
 {
-    public class DatabaseContext : MsSqlContext
+    public class DatabaseContext : PostgreSQLContext
     {
         private const string Schema = "encrypted_files_storage";
 
@@ -42,7 +42,7 @@ public DatabaseContext(DbContextOptions contextOptions) : base(Schema, contextOp
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.ApplyConfiguration(new EncryptedFileConfiguration());
         }

diff --git a/...EncryptedFileStorage.MsSqlRepositories/EntityConfigurations/EncryptedFileConfiguration.cs b/...EncryptedFileStorage.MsSqlRepositories/EntityConfigurations/EncryptedFileConfiguration.cs
@@ -1,4 +1,4 @@
-using MAVN.Service.EncryptedFileStorage.Domain.Models;
+using MAVN.Service.EncryptedFileStorage.Domain.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
@@ -12,7 +12,7 @@ public void Configure(EntityTypeBuilder<EncryptedFile> builder)
 
             builder.HasKey(x => x.FileId);
 
-            builder.Property(x => x.FileId).ValueGeneratedOnAdd().HasDefaultValueSql("newid()");
+            builder.Property(x => x.FileId).ValueGeneratedOnAdd();
             builder.Property(x => x.Origin).IsRequired().HasMaxLength(63);
             builder.Property(x => x.FileName).IsRequired().HasMaxLength(255);
             builder.Property(x => x.BlobName).HasMaxLength(1024);

diff --git a/...dFileStorage.MsSqlRepositories/MAVN.Service.EncryptedFileStorage.MsSqlRepositories.csproj b/...dFileStorage.MsSqlRepositories/MAVN.Service.EncryptedFileStorage.MsSqlRepositories.csproj
@@ -1,16 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MAVN.Service.EncryptedFileStorage.Domain\MAVN.Service.EncryptedFileStorage.Domain.csproj" />
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
+    <ProjectReference Include="..\MAVN.Service.EncryptedFileStorage.Domain\MAVN.Service.EncryptedFileStorage.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ileStorage.MsSqlRepositories/Migrations/20191002144121_AddEncryptedFileEntity.Designer.cs b/...ileStorage.MsSqlRepositories/Migrations/20191002144121_AddEncryptedFileEntity.Designer.cs
diff --git a/...torage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.Designer.cs b/...torage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.Designer.cs
diff --git a/...ptedFileStorage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.cs b/...ptedFileStorage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.cs
diff --git a/...itories/Migrations/20191004142649_AddedIsUploadCompletedToEncryptedFileEntity.Designer.cs b/...itories/Migrations/20191004142649_AddedIsUploadCompletedToEncryptedFileEntity.Designer.cs