Skip to content

Commit

Permalink
Closes #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@IliyanIlievPH
IliyanIlievPH committed Jul 2, 2020
1 parent f5c8b0e commit e6d4300
Show file tree
Hide file tree
Showing 23 changed files with 93 additions and 457 deletions.
4 changes: 2 additions & 2 deletions .../MAVN.Service.EncryptedFileStorage.Client/MAVN.Service.EncryptedFileStorage.Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 7 additions & 7 deletions ...dFileStorage.AzureRepositories/MAVN.Service.EncryptedFileStorage.AzureRepositories.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/MAVN.Service.EncryptedFileStorage.Domain/MAVN.Service.EncryptedFileStorage.Domain.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
14 changes: 7 additions & 7 deletions ...cryptedFileStorage.DomainServices/MAVN.Service.EncryptedFileStorage.DomainServices.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/MAVN.Service.EncryptedFileStorage.MsSqlRepositories/DatabaseContext.cs
View file
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -42,7 +42,7 @@ public DatabaseContext(DbConnection dbConnection, bool isForMocks = false,
{
}

protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.ApplyConfiguration(new EncryptedFileConfiguration());
}
Expand Down
4 changes: 2 additions & 2 deletions ...EncryptedFileStorage.MsSqlRepositories/EntityConfigurations/EncryptedFileConfiguration.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MAVN.Service.EncryptedFileStorage.Domain.Models;
using MAVN.Service.EncryptedFileStorage.Domain.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

Expand All @@ -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);
Expand Down
12 changes: 8 additions & 4 deletions ...dFileStorage.MsSqlRepositories/MAVN.Service.EncryptedFileStorage.MsSqlRepositories.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>
57 changes: 0 additions & 57 deletions ...ileStorage.MsSqlRepositories/Migrations/20191002144121_AddEncryptedFileEntity.Designer.cs
View file

This file was deleted.

56 changes: 0 additions & 56 deletions ...torage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.Designer.cs
View file

This file was deleted.

63 changes: 0 additions & 63 deletions ...ptedFileStorage.MsSqlRepositories/Migrations/20191004142117_UpdatedEncryptedFileEntity.cs
View file

This file was deleted.

60 changes: 0 additions & 60 deletions ...itories/Migrations/20191004142649_AddedIsUploadCompletedToEncryptedFileEntity.Designer.cs
View file

This file was deleted.

Loading

0 comments on commit e6d4300

Please sign in to comment.