IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed unused methods

Browse Source
This commit is contained in:
pavelbannov 2023-07-02 22:00:42 +03:00
parent 4e95a973e0
commit df2b14a1da
2 changed files with 22 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -230,7 +230,7 @@ internal class FileDao : AbstractDao, IFileDao<int>
break;
}
await foreach (var e in (checkShared ? FromQuery(filesDbContext, query) : FromQuery(filesDbContext, query)).AsAsyncEnumerable())
await foreach (var e in FromQuery(filesDbContext, query).AsAsyncEnumerable())
{
yield return _mapper.Map<DbFileQuery, File<int>>(e);
}
@ -1432,32 +1432,6 @@ internal class FileDao : AbstractDao, IFileDao<int>
};
}
protected IQueryable<DbFileQuery> FromQueryWithShared(FilesDbContext filesDbContext, IQueryable<DbFile> dbFiles)
{
var fileType = FileEntryType.File;
var denyArray = new[] { FileConstant.DenyDownloadId, FileConstant.DenySharingId };
return from r in dbFiles
select new DbFileQuery
{
File = r,
Root = (from f in filesDbContext.Folders
where f.Id ==
(from t in filesDbContext.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
).FirstOrDefault(),
Shared = (from f in filesDbContext.Security
where f.EntryType == fileType && f.EntryId == r.Id.ToString() && f.TenantId == r.TenantId && !denyArray.Contains(f.Subject)
select f
).Any()
};
}
protected IQueryable<DbFileQuery> FromQuery(FilesDbContext filesDbContext, IQueryable<DbFile> dbFiles)
{
return dbFiles

65
products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
View File

@ -168,7 +168,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
q = succ ? q.Where(r => searchIds.Contains(r.Id)) : BuildSearch(q, searchText, SearhTypeEnum.Any);
}
await foreach (var e in FromQueryWithShared(filesDbContext, q).AsAsyncEnumerable())
await foreach (var e in FromQuery(filesDbContext, q).AsAsyncEnumerable())
{
yield return _mapper.Map<DbFolderQuery, Folder<int>>(e);
}
@ -199,7 +199,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
q = succ ? q.Where(r => searchIds.Contains(r.Id)) : BuildSearch(q, searchText, SearhTypeEnum.Any);
}
await foreach (var e in FromQueryWithShared(filesDbContext, q).AsAsyncEnumerable())
await foreach (var e in FromQuery(filesDbContext, q).AsAsyncEnumerable())
{
yield return _mapper.Map<DbFolderQuery, Folder<int>>(e);
}
@ -260,7 +260,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
}
}
await foreach (var e in FromQueryWithShared(filesDbContext, q).AsAsyncEnumerable())
await foreach (var e in FromQuery(filesDbContext, q).AsAsyncEnumerable())
{
yield return _mapper.Map<DbFolderQuery, Folder<int>>(e);
}
@ -314,7 +314,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
}
}
await foreach (var e in (checkShare ? FromQueryWithShared(filesDbContext, q) : FromQuery(filesDbContext, q)).AsAsyncEnumerable().Distinct())
await foreach (var e in FromQuery(filesDbContext, q).AsAsyncEnumerable().Distinct())
{
yield return _mapper.Map<DbFolderQuery, Folder<int>>(e);
}
@ -1187,31 +1187,8 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
return q;
}
protected IQueryable<DbFolderQuery> FromQueryWithShared(FilesDbContext filesDbContext, IQueryable<DbFolder> dbFiles)
{
var e = from r in dbFiles
select new DbFolderQuery
{
Folder = r,
Root = (from f in filesDbContext.Folders
where f.Id ==
(from t in filesDbContext.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
).FirstOrDefault()
};
return e;
}
protected IQueryable<DbFolderQuery> FromQuery(FilesDbContext filesDbContext, IQueryable<DbFolder> dbFiles)
{
var FilesDbContext = filesDbContext;
return dbFiles
.Select(r => new DbFolderQuery
{
@ -1344,7 +1321,7 @@ internal class FolderDao : AbstractDao, IFolderDao<int>
if (rootFolderType != FolderType.VirtualRooms && rootFolderType != FolderType.Archive)
{
return (-1,"");
return (-1, "");
}
var rootFolderId = Convert.ToInt32(fileEntry.RootId);
@ -1640,9 +1617,9 @@ static file class Queries
Root = (from f in ctx.Folders
where f.Id ==
(from t in ctx.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
@ -1664,9 +1641,9 @@ static file class Queries
Root = (from f in ctx.Folders
where f.Id ==
(from t in ctx.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
@ -1690,9 +1667,9 @@ static file class Queries
Root = (from f in ctx.Folders
where f.Id ==
(from t in ctx.Tree
where t.FolderId == r.folder.ParentId
orderby t.Level descending
select t.ParentId
where t.FolderId == r.folder.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.folder.TenantId
select f
@ -1866,7 +1843,7 @@ static file class Queries
.Where(r => r.FolderId == toFolderId)
.OrderBy(r => r.Level)
.AsQueryable());
public static readonly Func<FilesDbContext, int, int, Task<bool>> AnyTreeAsync = Microsoft.EntityFrameworkCore.EF.CompileAsyncQuery(
(FilesDbContext ctx, int parentId, int folderId) =>
ctx.Tree
@ -1977,9 +1954,9 @@ static file class Queries
Root = (from f in ctx.Folders
where f.Id ==
(from t in ctx.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
@ -2000,9 +1977,9 @@ static file class Queries
Root = (from f in ctx.Folders
where f.Id ==
(from t in ctx.Tree
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
where t.FolderId == r.ParentId
orderby t.Level descending
select t.ParentId
).FirstOrDefault()
where f.TenantId == r.TenantId
select f