From 73bf93dbdbdc47d0bad6887c71b3ca2e450f5de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 29 May 2020 16:09:49 +0300
Subject: [PATCH] Revise blob and container classes.

---
 .../Volo/Abp/BlobStoring/Database/Blob.cs     | 30 +++++++++----------
 .../Abp/BlobStoring/Database/Container.cs     | 13 ++++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs
index f156597d22..6f3e8c7806 100644
--- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs
+++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Blob.cs
@@ -7,38 +7,38 @@ namespace Volo.Abp.BlobStoring.Database
 {
     public class Blob : AggregateRoot<Guid>, IMultiTenant
     {
-        public Guid ContainerId { get; set; }
+        public virtual Guid ContainerId { get; protected set; }
 
-        public Guid? TenantId { get; }
+        public virtual Guid? TenantId { get; protected set; }
 
-        public string Name { get; set; }
+        public virtual string Name { get; protected set; }
 
-        public byte[] Content { get; private set; }
-        
-        public Blob(Guid id, Guid containerId, [NotNull]string name, byte[] content, Guid? tenantId) : base(id)
-        {
-            Check.NotNullOrWhiteSpace(name, nameof(name), BlobConsts.MaxNameLength);
-            CheckContentLength(content);
+        public virtual byte[] Content { get; protected set; }
 
-            Content = content;
+        public Blob(Guid id, Guid containerId, [NotNull] string name, [NotNull] byte[] content, Guid? tenantId = null)
+            : base(id)
+        {
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name), BlobConsts.MaxNameLength);
             ContainerId = containerId;
-            Name = name;
+            Content = CheckContentLength(content);
             TenantId = tenantId;
         }
 
         public virtual void SetContent(byte[] content)
         {
-            CheckContentLength(content);
-
-            Content = content;
+            Content = CheckContentLength(content);
         }
 
-        protected virtual void CheckContentLength(byte[] content)
+        protected virtual byte[] CheckContentLength(byte[] content)
         {
+            Check.NotNull(content, nameof(content));
+            
             if (content.Length >= BlobConsts.MaxContentLength)
             {
                 throw new AbpException($"Blob content size cannot be more than {BlobConsts.MaxContentLength} Bytes.");
             }
+
+            return content;
         }
     }
 }
\ No newline at end of file
diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Container.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Container.cs
index 927e98ae25..ebe8bbf20b 100644
--- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Container.cs
+++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/Container.cs
@@ -5,18 +5,17 @@ using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.BlobStoring.Database
 {
-    public class Container : AggregateRoot<Guid>, IMultiTenant
+    public class Container : AggregateRoot<Guid>, IMultiTenant //TODO: Rename to BlobContainer
     {
-        public Guid? TenantId { get; }
+        public virtual Guid? TenantId { get; protected set; }
 
-        public string Name { get; set; }
+        public virtual string Name { get; protected set; }
 
-        public Container(Guid id, [NotNull]string name, Guid? tenantId = null) : base(id)
+        public Container(Guid id, [NotNull] string name, Guid? tenantId = null) 
+            : base(id)
         {
-            Check.NotNullOrWhiteSpace(name, nameof(name), ContainerConsts.MaxNameLength);
-
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name), ContainerConsts.MaxNameLength);
             TenantId = tenantId;
-            Name = name;
         }
     }
 }
\ No newline at end of file