Merge branch 'develop' into release/1.0.0

common/ASC.Api.Core/Core/Validate.cs

@@ -25,6 +25,7 @@
 
 
 using System;
+using System.Collections.Generic;
 
 using ASC.Common.Web;
 
@@ -58,8 +59,8 @@ namespace ASC.Api.Utils
         }
 
         public static T? NullIfDefault<T>(this T item) where T : struct
-        {
+{
-            return item.Equals(default(T)) ? default(T?) : item;
+            return EqualityComparer<T>.Default.Equals(item, default(T))  ? default(T?) : item;
         }
     }
 }

common/ASC.FederatedLogin/ASC.FederatedLogin.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
-    <NoWarn>1701;1702;NU1701</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

common/services/ASC.ApiSystem/ASC.ApiSystem.csproj

@@ -8,6 +8,7 @@
     <Copyright>(c) Ascensio System SIA. All rights reserved</Copyright>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
+    <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs

@@ -436,25 +436,25 @@ namespace ASC.ElasticSearch
             }
         }
 
-        public async Task<bool> IndexAsync(T data, bool immediately = true)
+        public Task<bool> IndexAsync(T data, bool immediately = true)
         {
             var t = ServiceProvider.GetService<T>();
-            if (!await SupportAsync(t)) return false;
+            if (!Support(t)) return Task.FromResult(false);
-            return await Queue(() => Indexer.Index(data, immediately));
+            return Queue(() => Indexer.Index(data, immediately));
         }
 
-        public async Task<bool> UpdateAsync(T data, bool immediately = true, params Expression<Func<T, object>>[] fields)
+        public Task<bool> UpdateAsync(T data, bool immediately = true, params Expression<Func<T, object>>[] fields)
         {
             var t = ServiceProvider.GetService<T>();
-            if (!await SupportAsync(t)) return false;
+            if (!Support(t)) return Task.FromResult(false);
-            return await Queue(() => Indexer.Update(data, immediately, fields));
+            return Queue(() => Indexer.Update(data, immediately, fields));
         }
 
-        public async Task<bool> DeleteAsync(T data, bool immediately = true)
+        public Task<bool> DeleteAsync(T data, bool immediately = true)
         {
             var t = ServiceProvider.GetService<T>();
-            if (!await SupportAsync(t)) return false;
+            if (!Support(t)) return Task.FromResult(false);
-            return await Queue(() => Indexer.Delete(data, immediately));
+            return Queue(() => Indexer.Delete(data, immediately));
         }
 
         public async Task<bool> DeleteAsync(Expression<Func<Selector<T>, Selector<T>>> expression, bool immediately = true)

products/ASC.Files/Core/ASC.Files.Core.csproj

@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
     <OutputType>Library</OutputType>
+    <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs

@@ -38,6 +38,7 @@ using ASC.Files.Core.Resources;
 using ASC.Web.Core;
 using ASC.Web.Core.Users;
 using ASC.Web.Files.Classes;
+using ASC.Web.Files.Utils;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Web.Files
@@ -130,27 +131,34 @@ namespace ASC.Web.Files
     {
         private Lazy<ASC.Files.Core.EF.FilesDbContext> LazyFilesDbContext { get; }
         private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get => LazyFilesDbContext.Value; }
-        private TenantManager TenantManager { get; }
+        private TenantManager TenantManager { get; }
-
+        private GlobalFolder GlobalFolder { get; }
+        public FileMarker FileMarker { get; }
+        public IDaoFactory DaoFactory { get; }
+
         public FilesUserSpaceUsage(
             DbContextManager<ASC.Files.Core.EF.FilesDbContext> dbContextManager,
-            TenantManager tenantManager)
+            TenantManager tenantManager,
+            GlobalFolder globalFolder,
+            FileMarker fileMarker,
+            IDaoFactory daoFactory)
         {
             LazyFilesDbContext = new Lazy<ASC.Files.Core.EF.FilesDbContext>(() => dbContextManager.Get(FileConstant.DatabaseId));
-            TenantManager = tenantManager;
+            TenantManager = tenantManager;
+            GlobalFolder = globalFolder;
+            FileMarker = fileMarker;
+            DaoFactory = daoFactory;
         }
 
         public long GetUserSpaceUsage(Guid userId)
         {
-            var tenantId = TenantManager.GetCurrentTenant().TenantId;
+            var tenantId = TenantManager.GetCurrentTenant().TenantId;
+            var my = GlobalFolder.GetFolderMy(FileMarker, DaoFactory);
+            var trash = GlobalFolder.GetFolderTrash<int>(DaoFactory);
+
             return FilesDbContext.Files
-                .Join(FilesDbContext.Tree, a => a.FolderId, b => b.FolderId, (file, tree) => new { file, tree })
+                .Where(r => r.TenantId == tenantId && (r.FolderId == my || r.FolderId == trash))
-                .Join(FilesDbContext.BunchObjects, a => a.tree.ParentId.ToString(), b => b.LeftNode, (fileTree, bunch) => new { fileTree.file, fileTree.tree, bunch })
+                .Sum(r => r.ContentLength);
-                .Where(r => r.file.TenantId == r.bunch.TenantId && 
-                            r.file.TenantId == tenantId && 
-                            r.file.CreateBy == userId &&
-                            (r.bunch.RightNode.StartsWith("files/trash/") | r.bunch.RightNode.StartsWith("files/my/")))
-                .Sum(r => r.file.ContentLength);
         }
     }
 }

products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs

@@ -39,8 +39,7 @@ using ASC.Core.Tenants;
 using ASC.Files.Core.EF;
 using ASC.Web.Studio.Core;
 using ASC.Web.Studio.UserControls.Statistics;
-using ASC.Web.Studio.Utility;
+using ASC.Web.Studio.Utility;
-
 namespace ASC.Files.Core.Data
 {
     [Scope]
@@ -489,7 +488,7 @@ namespace ASC.Files.Core.Data
 
         public IEnumerable<Tag> GetNewTags(Guid subject, Folder<T> parentFolder, bool deepSearch)
         {
-            if (parentFolder == null || parentFolder.ID.Equals(default(T)))
+            if (parentFolder == null || EqualityComparer<T>.Default.Equals(parentFolder.ID, default(T)))
                 throw new ArgumentException("folderId");
 
             var result = new List<Tag>();

products/ASC.Files/Core/Core/FileStorageService.cs

@@ -500,7 +500,7 @@ namespace ASC.Web.Files.Services.WCFService
             ErrorIf(file == null, FilesCommonResource.ErrorMassage_FileNotFound);
             ErrorIf(!FileSecurity.CanRead(file), FilesCommonResource.ErrorMassage_SecurityException_ReadFile);
 
-            var parent = folderDao.GetFolder(parentId == null || parentId.Equals(default(T)) ? file.FolderID : parentId);
+            var parent = folderDao.GetFolder(EqualityComparer<T>.Default.Equals(parentId, default(T)) ? file.FolderID : parentId);
             ErrorIf(parent == null, FilesCommonResource.ErrorMassage_FolderNotFound);
             ErrorIf(parent.RootFolderType == FolderType.TRASH, FilesCommonResource.ErrorMassage_ViewTrashItem);
 
@@ -563,7 +563,7 @@ namespace ASC.Web.Files.Services.WCFService
             var folderDao = GetFolderDao();
 
             Folder<T> folder = null;
-            if (!fileWrapper.ParentId.Equals(default(T)))
+            if (!EqualityComparer<T>.Default.Equals(fileWrapper.ParentId, default(T)))
             {
                 folder = folderDao.GetFolder(fileWrapper.ParentId);
 
@@ -608,7 +608,7 @@ namespace ASC.Web.Files.Services.WCFService
                 file.Title = FileUtility.ReplaceFileExtension(fileWrapper.Title, fileExt);
             }
 
-            if (fileWrapper.TemplateId == null || fileWrapper.TemplateId.Equals(default(T)))
+            if (EqualityComparer<T>.Default.Equals(fileWrapper.TemplateId, default(T)))
             {
                 var culture = UserManager.GetUsers(AuthContext.CurrentAccount.ID).GetCulture();
                 var storeTemplate = GetStoreTemplate();

products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs

@@ -25,6 +25,7 @@
 
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
@@ -397,7 +398,7 @@ namespace ASC.Web.Files.HttpHandlers
 
         private bool IsFileDataSet()
         {
-            return !string.IsNullOrEmpty(FileName) && !FolderId.Equals(default(T));
+            return !string.IsNullOrEmpty(FileName) && !EqualityComparer<T>.Default.Equals(FolderId, default(T));
         }
     }
 

products/ASC.Files/Core/Model/FileWrapper.cs

@@ -153,7 +153,6 @@ namespace ASC.Api.Documents
     {
         private AuthContext AuthContext { get; }
         private IDaoFactory DaoFactory { get; }
-        private FileSecurity FileSecurity { get; }
         private GlobalFolderHelper GlobalFolderHelper { get; }
         private CommonLinkUtility CommonLinkUtility { get; }
         private FilesLinkUtility FilesLinkUtility { get; }
@@ -174,7 +173,6 @@ namespace ASC.Api.Documents
         {
             AuthContext = authContext;
             DaoFactory = daoFactory;
-            FileSecurity = fileSecurity;
             GlobalFolderHelper = globalFolderHelper;
             CommonLinkUtility = commonLinkUtility;
             FilesLinkUtility = filesLinkUtility;

products/ASC.Files/Core/Model/FolderWrapper.cs

@@ -98,7 +98,6 @@ namespace ASC.Api.Documents
     {
         private AuthContext AuthContext { get; }
         private IDaoFactory DaoFactory { get; }
-        private FileSecurity FileSecurity { get; }
         private GlobalFolderHelper GlobalFolderHelper { get; }
 
         public FolderWrapperHelper(
@@ -113,7 +112,6 @@ namespace ASC.Api.Documents
         {
             AuthContext = authContext;
             DaoFactory = daoFactory;
-            FileSecurity = fileSecurity;
             GlobalFolderHelper = globalFolderHelper;
         }
 

products/ASC.Files/Core/Utils/FileMarker.cs

@@ -435,12 +435,12 @@ namespace ASC.Web.Files.Utils
 
             var updateTags = new List<Tag>();
 
-            if (!rootFolderId.Equals(default(T)))
+            if (!rootFolderId.Equals(default))
             {
                 UpdateRemoveTags(internalFolderDao.GetFolder(rootFolderId));
             }
 
-            if (!cacheFolderId.Equals(default(T)))
+            if (!cacheFolderId.Equals(default))
             {
                 RemoveFromCahce(cacheFolderId, userID);
             }

products/ASC.Files/Core/Utils/FileTracker.cs

@@ -195,7 +195,7 @@ namespace ASC.Web.Files.Utils
 
         private FileTracker GetTracker<T>(T fileId)
         {
-            if (!fileId.Equals(default(T)))
+            if (!EqualityComparer<T>.Default.Equals(fileId, default(T)))
             {
                 return Cache.Get<FileTracker>(TRACKER + fileId);
             }
@@ -204,7 +204,7 @@ namespace ASC.Web.Files.Utils
 
         private void SetTracker<T>(T fileId, FileTracker tracker)
         {
-            if (!fileId.Equals(default(T)))
+            if (!EqualityComparer<T>.Default.Equals(fileId, default(T)))
             {
                 if (tracker != null)
                 {