Tests added

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Container.cs

@@ -1,4 +1,5 @@
 using System;
+using JetBrains.Annotations;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.MultiTenancy;
 
@@ -9,5 +10,12 @@ namespace Volo.Abp.BlobStoring.Database
         public Guid? TenantId { get; }
 
         public string Name { get; set; }
+
+        public Container(Guid id, [NotNull]string name, Guid? tenantId = null) : base(id)
+        {
+            // Todo: check null and length etc
+            TenantId = tenantId;
+            Name = name;
+        }
     }
 }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobContainerConfigurationExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    public static class DatabaseBlobContainerConfigurationExtensions
+    {
+        public static DatabaseBlobProviderConfiguration GetDatabaseConfiguration(
+            this BlobContainerConfiguration containerConfiguration)
+        {
+            return new DatabaseBlobProviderConfiguration(containerConfiguration);
+        }
+
+        public static BlobContainerConfiguration UseDatabase(
+            this BlobContainerConfiguration containerConfiguration,
+            Action<DatabaseBlobProviderConfiguration> fileSystemConfigureAction)
+        {
+            containerConfiguration.ProviderType = typeof(DatabaseBlobProvider);
+
+            fileSystemConfigureAction(new DatabaseBlobProviderConfiguration(containerConfiguration));
+
+            return containerConfiguration;
+        }
+
+        public static BlobContainerConfiguration UseDatabase(this BlobContainerConfiguration containerConfiguration)
+        {
+            containerConfiguration.ProviderType = typeof(DatabaseBlobProvider);
+
+            return containerConfiguration;
+        }
+    }
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProvider.cs

@@ -18,7 +18,7 @@ namespace Volo.Abp.BlobStoring.Database
 
         public override async Task SaveAsync(BlobProviderSaveArgs args)
         {
-            var container = await ContainerRepository.GetContainerAsync(args.ContainerName);
+            var container = await ContainerRepository.CreateIfNotExistAsync(args.ContainerName, args.TenantId, args.CancellationToken);
             
             var blob = await BlobRepository.FindAsync(container.Id, args.BlobName, args.TenantId, args.CancellationToken);
 
@@ -43,7 +43,7 @@ namespace Volo.Abp.BlobStoring.Database
 
         public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
         {
-            var container = await ContainerRepository.FindContainerAsync(args.ContainerName);
+            var container = await ContainerRepository.FindAsync(args.ContainerName, args.TenantId, args.CancellationToken);
 
             if (container == null)
             {
@@ -55,7 +55,7 @@ namespace Volo.Abp.BlobStoring.Database
 
         public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
         {
-            var container = await ContainerRepository.FindContainerAsync(args.ContainerName);
+            var container = await ContainerRepository.FindAsync(args.ContainerName, args.TenantId, args.CancellationToken);
 
             if (container == null)
             {
@@ -67,7 +67,7 @@ namespace Volo.Abp.BlobStoring.Database
 
         public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
         {
-            var container = await ContainerRepository.FindContainerAsync(args.ContainerName);
+            var container = await ContainerRepository.FindAsync(args.ContainerName, args.TenantId, args.CancellationToken);
 
             if (container == null)
             {

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/DatabaseBlobProviderConfiguration.cs

@@ -0,0 +1,12 @@
+namespace Volo.Abp.BlobStoring.Database
+{
+    public class DatabaseBlobProviderConfiguration
+    {
+        private readonly BlobContainerConfiguration _containerConfiguration;
+
+        public DatabaseBlobProviderConfiguration(BlobContainerConfiguration containerConfiguration)
+        {
+            _containerConfiguration = containerConfiguration;
+        }
+    }
+}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/IContainerRepository.cs

@@ -8,8 +8,8 @@ namespace Volo.Abp.BlobStoring.Database
 {
     public interface IContainerRepository : IBasicRepository<Container, Guid>
     {
-        Task<Container> GetContainerAsync([NotNull] string name, CancellationToken cancellationToken = default);
-
-        Task<Container> FindContainerAsync([NotNull] string name, CancellationToken cancellationToken = default);
+        Task<Container> CreateIfNotExistAsync([NotNull] string name, Guid? tenantId = null, CancellationToken cancellationToken = default);
+        
+        Task<Container> FindAsync([NotNull] string name, Guid? tenantId = null, CancellationToken cancellationToken = default);
     }
 }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/EfCoreContainerRepository.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
@@ -13,14 +14,24 @@ namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
         {
         }
 
-        public virtual async Task<Container> GetContainerAsync(string name, CancellationToken cancellationToken = default)
+        public virtual async Task<Container> CreateIfNotExistAsync(string name, Guid? tenantId = null, CancellationToken cancellationToken = default)
         {
-            return await DbSet.FirstAsync(x => x.Name == name, GetCancellationToken(cancellationToken));
-        }
+            var container = await FindAsync(name, tenantId, cancellationToken);
+            if (container != null)
+            {
+                return container;
+            }
+
+            container = new Container(Guid.NewGuid(), name, tenantId);
+            await base.InsertAsync(container, true, GetCancellationToken(cancellationToken));
 
-        public virtual async Task<Container> FindContainerAsync(string name, CancellationToken cancellationToken = default)
+            return container;
+        }
+        
+        public virtual async Task<Container> FindAsync(string name, Guid? tenantId = null, CancellationToken cancellationToken = default)
         {
-            return await DbSet.FirstOrDefaultAsync(x => x.Name == name, GetCancellationToken(cancellationToken));
+            return await DbSet.WhereIf(tenantId != null, x => x.TenantId == tenantId)
+                        .FirstOrDefaultAsync(x => x.Name == name, GetCancellationToken(cancellationToken));
         }
     }
 }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringDatabaseMongoDbModule.cs

@@ -14,8 +14,8 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
         {
             context.Services.AddMongoDbContext<BlobStoringDatabaseMongoDbContext>(options =>
             {
-                options.AddRepository<Container, MongoContainerRepository>();
-                options.AddRepository<Blob, MongoBlobRepository>();
+                options.AddRepository<Container, MongoDbContainerRepository>();
+                options.AddRepository<Blob, MongoDbBlobRepository>();
             });
         }
     }

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/MongoContainerRepository.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MongoDB.Driver;
-using MongoDB.Driver.Linq;
-using Volo.Abp.Domain.Repositories.MongoDB;
-using Volo.Abp.MongoDB;
-
-namespace Volo.Abp.BlobStoring.Database.MongoDB
-{
-    public class MongoContainerRepository : MongoDbRepository<IBlobStoringDatabaseMongoDbContext, Container, Guid>, IContainerRepository
-    {
-        public MongoContainerRepository(IMongoDbContextProvider<IBlobStoringDatabaseMongoDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-        }
-
-        public virtual async Task<Container> GetContainerAsync(string name, CancellationToken cancellationToken = default)
-        {
-            return await GetMongoQueryable().Where(x => x.Name == name).FirstAsync(GetCancellationToken(cancellationToken));
-        }
-
-        public virtual async Task<Container> FindContainerAsync(string name, CancellationToken cancellationToken = default)
-        {
-            return await GetMongoQueryable().Where(x => x.Name == name).FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
-        }
-    }
-}

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/MongoBlobRepository.cs → modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/MongoDbBlobRepository.cs

@@ -7,9 +7,9 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
-    public class MongoBlobRepository : MongoDbRepository<IBlobStoringDatabaseMongoDbContext, Blob, Guid>, IBlobRepository
+    public class MongoDbBlobRepository : MongoDbRepository<IBlobStoringDatabaseMongoDbContext, Blob, Guid>, IBlobRepository
     {
-        public MongoBlobRepository(IMongoDbContextProvider<IBlobStoringDatabaseMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        public MongoDbBlobRepository(IMongoDbContextProvider<IBlobStoringDatabaseMongoDbContext> dbContextProvider) : base(dbContextProvider)
         {
         }
 

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/MongoDbContainerRepository.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+
+namespace Volo.Abp.BlobStoring.Database.MongoDB
+{
+    public class MongoDbContainerRepository : MongoDbRepository<IBlobStoringDatabaseMongoDbContext, Container, Guid>, IContainerRepository
+    {
+        public MongoDbContainerRepository(IMongoDbContextProvider<IBlobStoringDatabaseMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+
+        public virtual async Task<Container> CreateIfNotExistAsync(string name, Guid? tenantId = null, CancellationToken cancellationToken = default)
+        {
+            var container = await FindAsync(name, tenantId, cancellationToken);
+
+            if (container != null)
+            {
+                return container;
+            }
+
+            container = new Container(Guid.NewGuid(), name, tenantId);
+            await InsertAsync(container, true, GetCancellationToken(cancellationToken));
+
+            return container;
+        }
+
+        public virtual async Task<Container> FindAsync(string name, Guid? tenantId = null, CancellationToken cancellationToken = default)
+        {
+            return await base.FindAsync(x => x.Name == name, cancellationToken: GetCancellationToken(cancellationToken));
+        }
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/DatabaseDomainTestBase.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/BlobStoringDatabaseDomainTestBase.cs

@@ -3,7 +3,7 @@
     /* Inherit from this class for your domain layer tests.
      * See SampleManager_Tests for example.
      */
-    public abstract class DatabaseDomainTestBase : DatabaseTestBase<DatabaseDomainTestModule>
+    public abstract class BlobStoringDatabaseDomainTestBase : BlobStoringDatabaseTestBase<BlobStoringDatabaseDomainTestModule>
     {
 
     }

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/BlobStoringDatabaseDomainTestModule.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.BlobStoring.Database
+{
+    [DependsOn(
+        typeof(BlobStoringDatabaseEntityFrameworkCoreTestModule)
+        )]
+    public class BlobStoringDatabaseDomainTestModule : AbpModule
+    {
+        
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.Domain.Tests/DatabaseDomainTestModule.cs

@@ -1,17 +0,0 @@
-using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.BlobStoring.Database
-{
-    /* Domain tests are configured to use the EF Core provider.
-     * You can switch to MongoDB, however your domain tests should be
-     * database independent anyway.
-     */
-    [DependsOn(
-        typeof(DatabaseEntityFrameworkCoreTestModule)
-        )]
-    public class DatabaseDomainTestModule : AbpModule
-    {
-        
-    }
-}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/BlobStoringDatabaseEntityFrameworkCoreTestBase.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
+{
+    public abstract class BlobStoringDatabaseEntityFrameworkCoreTestBase : BlobStoringDatabaseTestBase<BlobStoringDatabaseEntityFrameworkCoreTestModule>
+    {
+
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/DatabaseEntityFrameworkCoreTestModule.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/BlobStoringDatabaseEntityFrameworkCoreTestModule.cs

@@ -8,10 +8,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
 {
     [DependsOn(
-        typeof(DatabaseTestBaseModule),
+        typeof(BlobStoringDatabaseTestBaseModule),
         typeof(BlobStoringDatabaseEntityFrameworkCoreModule)
         )]
-    public class DatabaseEntityFrameworkCoreTestModule : AbpModule
+    public class BlobStoringDatabaseEntityFrameworkCoreTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/DatabaseEntityFrameworkCoreTestBase.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
-{
-    /* This class can be used as a base class for EF Core integration tests,
-     * while SampleRepository_Tests uses a different approach.
-     */
-    public abstract class DatabaseEntityFrameworkCoreTestBase : DatabaseTestBase<DatabaseEntityFrameworkCoreTestModule>
-    {
-
-    }
-}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.EntityFrameworkCore.Tests/EntityFrameworkCore/EfCoreContainer_Test.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore
+{
+    public class EfCoreContainer_Test : BlobStoringDatabaseTestBase<BlobStoringDatabaseEntityFrameworkCoreTestModule>
+    {
+        
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestBase.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Database.MongoDB
+{
+    public abstract class BlobStoringDatabaseMongoDbTestBase : BlobStoringDatabaseTestBase<BlobStoringDatabaseMongoDbTestModule>
+    {
+
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/DatabaseMongoDbTestModule.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/BlobStoringDatabaseMongoDbTestModule.cs

@@ -5,10 +5,10 @@ using Volo.Abp.Modularity;
 namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
     [DependsOn(
-        typeof(DatabaseTestBaseModule),
+        typeof(BlobStoringDatabaseTestBaseModule),
         typeof(BlobStoringDatabaseMongoDbModule)
         )]
-    public class DatabaseMongoDbTestModule : AbpModule
+    public class BlobStoringDatabaseMongoDbTestModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/DatabaseMongoDbTestBase.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.BlobStoring.Database.MongoDB
-{
-    /* This class can be used as a base class for MongoDB integration tests,
-     * while SampleRepository_Tests uses a different approach.
-     */
-    public abstract class DatabaseMongoDbTestBase : DatabaseTestBase<DatabaseMongoDbTestModule>
-    {
-
-    }
-}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbContainer_Test.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.BlobStoring.Database.MongoDB
+{
+    public class MongoDbContainer_Test : BlobStoringDatabaseTestBase<BlobStoringDatabaseMongoDbTestModule>
+    {
+        
+    }
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/DatabaseDataSeedContributor.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseDataSeedContributor.cs

@@ -5,11 +5,11 @@ using Volo.Abp.Guids;
 
 namespace Volo.Abp.BlobStoring.Database
 {
-    public class DatabaseDataSeedContributor : IDataSeedContributor, ITransientDependency
+    public class BlobStoringDatabaseDataSeedContributor : IDataSeedContributor, ITransientDependency
     {
         private readonly IGuidGenerator _guidGenerator;
 
-        public DatabaseDataSeedContributor(
+        public BlobStoringDatabaseDataSeedContributor(
             IGuidGenerator guidGenerator)
         {
             _guidGenerator = guidGenerator;

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/DatabaseTestBase.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBase.cs

@@ -8,8 +8,7 @@ using Volo.Abp.Testing;
 
 namespace Volo.Abp.BlobStoring.Database
 {
-    /* All test classes are derived from this class, directly or indirectly. */
-    public abstract class DatabaseTestBase<TStartupModule> : AbpIntegratedTest<TStartupModule> 
+    public abstract class BlobStoringDatabaseTestBase<TStartupModule> : BlobContainer_Tests<TStartupModule> 
         where TStartupModule : IAbpModule
     {
         protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/DatabaseTestBaseModule.cs → modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/BlobStoringDatabaseTestBaseModule.cs

@@ -12,13 +12,22 @@ namespace Volo.Abp.BlobStoring.Database
         typeof(AbpAutofacModule),
         typeof(AbpTestBaseModule),
         typeof(AbpAuthorizationModule),
-        typeof(BlobStoringDatabaseDomainModule)
+        typeof(BlobStoringDatabaseDomainModule),
+        typeof(AbpBlobStoringTestModule)
         )]
-    public class DatabaseTestBaseModule : AbpModule
+    public class BlobStoringDatabaseTestBaseModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAlwaysAllowAuthorization();
+
+            Configure<AbpBlobStoringOptions>(options =>
+            {
+                options.Containers.ConfigureAll((containerName, containerConfiguration) =>
+                {
+                    containerConfiguration.UseDatabase();
+                });
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.TestBase/Volo.Abp.BlobStoring.Database.TestBase.csproj

@@ -15,6 +15,7 @@
     <ProjectReference Include="..\..\..\..\..\abp\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\abp\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
     <ProjectReference Include="..\..\..\..\..\abp\framework\src\Volo.Abp.TestBase\Volo.Abp.TestBase.csproj" />
+    <ProjectReference Include="..\..\..\..\..\abp\framework\test\Volo.Abp.BlobStoring.Tests\Volo.Abp.BlobStoring.Tests.csproj" />
     <ProjectReference Include="..\..\src\Volo.Abp.BlobStoring.Database.Domain\Volo.Abp.BlobStoring.Database.Domain.csproj" />
   </ItemGroup>