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

Files: refactor

Browse Source
This commit is contained in:
Maksim Chegulov 2023-02-07 16:50:21 +03:00
parent 83c638b98a
commit 084a2aeef1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
View File

@ -70,7 +70,7 @@ public static class DaoFactoryExtension
{
services.TryAdd<TenantDateTimeConverter>();
services.TryAdd<FolderMappingAction>();
services.TryAdd<BaseMappingAction>();
services.TryAdd<FilesCommonMappingAction>();
services.TryAdd<File<int>>();
services.TryAdd<IFileDao<int>, FileDao>();

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

@ -46,7 +46,6 @@ internal class FileDao : AbstractDao, IFileDao<int>
private readonly IMapper _mapper;
private readonly ThumbnailSettings _thumbnailSettings;
private readonly IQuotaService _quotaService;
private readonly TagDao<int> _tagDao;
public FileDao(
ILogger<FileDao> logger,
@ -74,8 +73,7 @@ internal class FileDao : AbstractDao, IFileDao<int>
Settings settings,
IMapper mapper,
ThumbnailSettings thumbnailSettings,
IQuotaService quotaService,
TagDao<int> tagDao)
IQuotaService quotaService)
: base(
dbContextManager,
userManager,
@ -104,7 +102,6 @@ internal class FileDao : AbstractDao, IFileDao<int>
_mapper = mapper;
_thumbnailSettings = thumbnailSettings;
_quotaService = quotaService;
_tagDao = tagDao;
}
public Task InvalidateCacheAsync(int fileId)
@ -907,14 +904,16 @@ internal class FileDao : AbstractDao, IFileDao<int>
}
}
var tagDao = _daoFactory.GetTagDao<int>();
if (toFolderId == trashId && oldParentId.HasValue)
{
var origin = Tag.Origin(fileId, FileEntryType.File, oldParentId.Value, _authContext.CurrentAccount.ID);
await _tagDao.SaveTags(origin);
await tagDao.SaveTags(origin);
}
else if (oldParentId == trashId)
{
await _tagDao.RemoveTagLinksAsync(fileId, FileEntryType.File, TagType.Origin);
await tagDao.RemoveTagLinksAsync(fileId, FileEntryType.File, TagType.Origin);
}
await filesDbContext.SaveChangesAsync();