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

Files: removed unnecessary

Browse Source
This commit is contained in:
Maksim Chegulov 2022-12-22 15:48:11 +03:00
parent b21b933cbc
commit 0d20a33102
3 changed files with 2 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1665,12 +1665,6 @@ internal class FileDao : AbstractDao, IFileDao<int>
protected IQueryable<DbFileQuery> FromQueryWithShared(FilesDbContext filesDbContext, IQueryable<DbFile> dbFiles)
{
var fileType = FileEntryType.File;
var cId = _authContext.CurrentAccount.ID;
var denyArray = new[] { FileConstant.DenyDownloadId, FileConstant.DenySharingId };
var denyDownload = FileConstant.DenyDownloadId;
var denySharing = FileConstant.DenySharingId;
return from r in dbFiles
select new DbFileQuery
{
@ -1684,37 +1678,12 @@ internal class FileDao : AbstractDao, IFileDao<int>
).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(),
IsFillFormDraft = (from f in filesDbContext.FilesLink
where f.TenantId == r.TenantId && f.LinkedId == r.Id.ToString() && f.LinkedFor == cId
select f)
.Any(),
Deny = (from f in filesDbContext.Security
where f.EntryType == fileType && f.EntryId == r.Id.ToString() && f.TenantId == r.TenantId && denyArray.Contains(f.Subject)
select f
).GroupBy(a => a.EntryId,
(a, b) =>
new DbFileDeny
{
DenyDownload = b.Any(c => c.Subject == denyDownload),
DenySharing = b.Any(c => c.Subject == denySharing)
})
.FirstOrDefault(),
).FirstOrDefault()
};
}
protected IQueryable<DbFileQuery> FromQuery(FilesDbContext filesDbContext, IQueryable<DbFile> dbFiles)
{
var fileType = FileEntryType.File;
var cId = _authContext.CurrentAccount.ID;
var denyArray = new[] { FileConstant.DenyDownloadId, FileConstant.DenySharingId };
var denyDownload = FileConstant.DenyDownloadId;
var denySharing = FileConstant.DenySharingId;
return dbFiles
.Select(r => new DbFileQuery
{
@ -1728,23 +1697,7 @@ internal class FileDao : AbstractDao, IFileDao<int>
).FirstOrDefault()
where f.TenantId == r.TenantId
select f
).FirstOrDefault(),
Shared = true,
IsFillFormDraft = (from f in filesDbContext.FilesLink
where f.TenantId == r.TenantId && f.LinkedId == r.Id.ToString() && f.LinkedFor == cId
select f)
.Any(),
Deny = (from f in filesDbContext.Security
where f.EntryType == fileType && f.EntryId == r.Id.ToString() && f.TenantId == r.TenantId && denyArray.Contains(f.Subject)
select f
).GroupBy(a => a.EntryId,
(a, b) =>
new DbFileDeny
{
DenyDownload = b.Any(c => c.Subject == denyDownload),
DenySharing = b.Any(c => c.Subject == denySharing)
})
.FirstOrDefault(),
).FirstOrDefault()
});
}
@ -1800,9 +1753,6 @@ public class DbFileQuery
{
public DbFile File { get; set; }
public DbFolder Root { get; set; }
public bool Shared { get; set; }
public bool IsFillFormDraft { get; set; }
public DbFileDeny Deny { get; set; }
}
public class DbFileDeny

17
products/ASC.Files/Core/Core/Entries/File.cs
View File

@ -178,23 +178,6 @@ public class File<T> : FileEntry<T>, IFileEntry<T>
}
}
[JsonIgnore]
public bool IsFillFormDraft
{
get => (_status & FileStatus.IsFillFormDraft) == FileStatus.IsFillFormDraft;
set
{
if (value)
{
_status |= FileStatus.IsFillFormDraft;
}
else
{
_status &= ~FileStatus.IsFillFormDraft;
}
}
}
public bool Encrypted { get; set; }
public Thumbnail ThumbnailStatus { get; set; }
public ForcesaveType Forcesave { get; set; }

1
products/ASC.Files/Core/Mapping/FilesMappingProfile.cs
View File

@ -38,7 +38,6 @@ public class FilesMappingProfile : AutoMapper.Profile
.ForMember(r => r.CreateOn, r => r.ConvertUsing<TenantDateTimeConverter, DateTime>(s => s.File.CreateOn))
.ForMember(r => r.ModifiedOn, r => r.ConvertUsing<TenantDateTimeConverter, DateTime>(s => s.File.ModifiedOn))
.IncludeMembers(r => r.File)
.AfterMap((s, d) => d.IsFillFormDraft = s.IsFillFormDraft)
.ConstructUsingServiceLocator();
CreateMap<DbFolder, Folder<int>>();