forked from ddrilling/AsbCloudServer
Поправлен сервис каталога инструкций
This commit is contained in:
parent
380776c3a9
commit
eaf0885675
@ -1,8 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AsbCloudApp.Data.Manuals;
|
||||
|
||||
namespace AsbCloudApp.Services;
|
||||
|
||||
@ -14,42 +12,39 @@ public interface IManualCatalogService
|
||||
/// <summary>
|
||||
/// Сохранение файла
|
||||
/// </summary>
|
||||
/// <param name="idCategory"></param>
|
||||
/// <param name="idFolder"></param>
|
||||
/// <param name="idDirectory"></param>
|
||||
/// <param name="idAuthor"></param>
|
||||
/// <param name="name"></param>
|
||||
/// <param name="stream"></param>
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task<int> SaveFileAsync(int? idCategory, int? idFolder, string name, Stream stream,
|
||||
CancellationToken cancellationToken);
|
||||
Task<int> SaveFileAsync(int idDirectory, int idAuthor, string name, Stream stream, CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Добавление новой папки
|
||||
/// Добавление директории
|
||||
/// </summary>
|
||||
/// <param name="name"></param>
|
||||
/// <param name="idParent"></param>
|
||||
/// <param name="idCategory"></param>
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task<int> AddFolderAsync(string name, int? idParent, int idCategory,
|
||||
CancellationToken cancellationToken);
|
||||
Task<int> AddDirectoryAsync(string name, int? idParent, CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Обновление папки
|
||||
/// Обновление директории
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="name"></param>
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task UpdateFolderAsync(int id, string name, CancellationToken cancellationToken);
|
||||
Task UpdateDirectoryAsync(int id, string name, CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Удаление папки
|
||||
/// Удаление директории
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task<int> DeleteFolderAsync(int id, CancellationToken cancellationToken);
|
||||
Task<int> DeleteDirectoryAsync(int id, CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Удаление файла
|
||||
@ -66,11 +61,4 @@ public interface IManualCatalogService
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task<(Stream stream, string fileName)?> GetFileAsync(int id, CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>
|
||||
/// Получение каталога
|
||||
/// </summary>
|
||||
/// <param name="cancellationToken"></param>
|
||||
/// <returns></returns>
|
||||
Task<IEnumerable<CatalogItemManualDto>> GetCatalogAsync(CancellationToken cancellationToken);
|
||||
}
|
||||
@ -8,13 +8,14 @@ using AsbCloudApp.Data.Manuals;
|
||||
using AsbCloudApp.Exceptions;
|
||||
using AsbCloudApp.Repositories;
|
||||
using AsbCloudApp.Services;
|
||||
using AsbCloudDb.Model;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace AsbCloudInfrastructure.Services;
|
||||
|
||||
public class ManualCatalogService : IManualCatalogService
|
||||
{
|
||||
private const int IdFileCategory = 30000;
|
||||
|
||||
private readonly IEnumerable<string> validExtensions = new[]
|
||||
{
|
||||
".pdf",
|
||||
@ -23,28 +24,24 @@ public class ManualCatalogService : IManualCatalogService
|
||||
|
||||
private readonly string directoryFiles;
|
||||
private readonly IFileStorageRepository fileStorageRepository;
|
||||
private readonly IManualFolderRepository manualFolderRepository;
|
||||
private readonly IManualRepository manualRepository;
|
||||
private readonly IFileCategoryRepository fileCategoryRepository;
|
||||
private readonly IManualDirectoryRepository manualDirectoryRepository;
|
||||
private readonly ICrudRepository<ManualDto> manualRepository;
|
||||
|
||||
public ManualCatalogService(IFileStorageRepository fileStorageRepository,
|
||||
IManualFolderRepository manualFolderRepository,
|
||||
IManualRepository manualRepository,
|
||||
IFileCategoryRepository fileCategoryRepository,
|
||||
IManualDirectoryRepository manualDirectoryRepository,
|
||||
ICrudRepository<ManualDto> manualRepository,
|
||||
IConfiguration configuration)
|
||||
{
|
||||
this.fileStorageRepository = fileStorageRepository;
|
||||
this.manualFolderRepository = manualFolderRepository;
|
||||
this.manualDirectoryRepository = manualDirectoryRepository;
|
||||
this.manualRepository = manualRepository;
|
||||
this.fileCategoryRepository = fileCategoryRepository;
|
||||
directoryFiles = configuration.GetValue<string>("DirectoryManualFiles");
|
||||
|
||||
if (string.IsNullOrWhiteSpace(directoryFiles))
|
||||
directoryFiles = "manuals";
|
||||
}
|
||||
|
||||
public async Task<int> SaveFileAsync(int? idCategory, int? idFolder, string name, Stream stream,
|
||||
CancellationToken cancellationToken)
|
||||
public async Task<int> SaveFileAsync(int idDirectory, int idAuthor, string name, Stream stream, CancellationToken cancellationToken)
|
||||
{
|
||||
var extension = Path.GetExtension(name);
|
||||
|
||||
@ -53,74 +50,65 @@ public class ManualCatalogService : IManualCatalogService
|
||||
$"Невозможно загрузить файл с расширением '{extension}'. Допустимые форматы файлов: {string.Join(", ", validExtensions)}",
|
||||
extension);
|
||||
|
||||
var path = await BuildFilePathAsync(idCategory, idFolder, name, cancellationToken);
|
||||
var path = await BuildFilePathAsync(idDirectory, name, cancellationToken);
|
||||
|
||||
await fileStorageRepository.SaveFileAsync(path,
|
||||
stream,
|
||||
cancellationToken);
|
||||
await fileStorageRepository.SaveFileAsync(path, stream, cancellationToken);
|
||||
|
||||
var manual = new ManualDto
|
||||
{
|
||||
Name = name,
|
||||
DateDownload = DateTime.UtcNow,
|
||||
IdFolder = idFolder,
|
||||
IdCategory = idCategory
|
||||
IdDirectory = idDirectory,
|
||||
IdCategory = IdFileCategory,
|
||||
IdAuthor = idAuthor
|
||||
};
|
||||
|
||||
return await manualRepository.InsertAsync(manual, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int> AddFolderAsync(string name, int? idParent, int idCategory,
|
||||
CancellationToken cancellationToken)
|
||||
public async Task<int> AddDirectoryAsync(string name, int? idParent, CancellationToken cancellationToken)
|
||||
{
|
||||
if (idParent.HasValue)
|
||||
{
|
||||
var parent = await manualFolderRepository.GetOrDefaultAsync(idParent.Value, cancellationToken)
|
||||
?? throw new ArgumentInvalidException("Родительской папки не существует", nameof(idParent));
|
||||
if (idParent.HasValue && !await manualDirectoryRepository.IsExistsAsync(idParent.Value, cancellationToken))
|
||||
throw new ArgumentInvalidException("Родительской директории не существует", nameof(idParent));
|
||||
|
||||
if (parent.IdCategory != idCategory)
|
||||
throw new ArgumentInvalidException("Категория родительской папки не соответствует текущей категории",
|
||||
nameof(idCategory));
|
||||
}
|
||||
|
||||
var manualFolder = new ManualFolderDto
|
||||
var directory = new ManualDirectoryDto
|
||||
{
|
||||
Name = name,
|
||||
IdParent = idParent,
|
||||
IdCategory = idCategory,
|
||||
};
|
||||
|
||||
if (await IsExistFolderAsync(manualFolder, cancellationToken))
|
||||
throw new ArgumentInvalidException("Папка с таким названием уже существует", name);
|
||||
|
||||
return await manualFolderRepository.InsertAsync(manualFolder, cancellationToken);
|
||||
if (await IsExistDirectoryAsync(directory, cancellationToken))
|
||||
throw new ArgumentInvalidException("Директория с таким названием уже существует", name);
|
||||
|
||||
return await manualDirectoryRepository.InsertAsync(directory, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task UpdateFolderAsync(int id, string name, CancellationToken cancellationToken)
|
||||
public async Task UpdateDirectoryAsync(int id, string name, CancellationToken cancellationToken)
|
||||
{
|
||||
var folder = await manualFolderRepository.GetOrDefaultAsync(id, cancellationToken)
|
||||
?? throw new ArgumentInvalidException($"Папки с Id: {id} не сущесвует", nameof(id));
|
||||
var directory = await manualDirectoryRepository.GetOrDefaultAsync(id, cancellationToken)
|
||||
?? throw new ArgumentInvalidException($"Директории с Id: {id} не существует", nameof(id));
|
||||
|
||||
folder.Name = name;
|
||||
directory.Name = name;
|
||||
|
||||
if (await IsExistFolderAsync(folder, cancellationToken))
|
||||
throw new ArgumentInvalidException("Папка с таким названием уже существует", name);
|
||||
if (await IsExistDirectoryAsync(directory, cancellationToken))
|
||||
throw new ArgumentInvalidException("Директория с таким названием уже существует", name);
|
||||
|
||||
await manualFolderRepository.UpdateAsync(folder, cancellationToken);
|
||||
await manualDirectoryRepository.UpdateAsync(directory, cancellationToken);
|
||||
}
|
||||
|
||||
|
||||
public async Task<int> DeleteFolderAsync(int id, CancellationToken cancellationToken)
|
||||
public async Task<int> DeleteDirectoryAsync(int id, CancellationToken cancellationToken)
|
||||
{
|
||||
var folder = await manualFolderRepository.GetOrDefaultAsync(id, cancellationToken);
|
||||
var directory = await manualDirectoryRepository.GetOrDefaultAsync(id, cancellationToken);
|
||||
|
||||
if (folder is null)
|
||||
if (directory is null)
|
||||
return 0;
|
||||
|
||||
var path = Path.Combine(directoryFiles, folder.IdCategory.ToString(), folder.Id.ToString());
|
||||
var path = fileStorageRepository.MakeFilePath(directoryFiles, IdFileCategory.ToString(),
|
||||
await BuildDirectoryPathAsync(id, cancellationToken));
|
||||
|
||||
fileStorageRepository.DeleteDirectory(path);
|
||||
|
||||
return await manualFolderRepository.DeleteAsync(folder.Id, cancellationToken);
|
||||
return await manualDirectoryRepository.DeleteAsync(directory.Id, cancellationToken);
|
||||
}
|
||||
|
||||
public async Task<int> DeleteFileAsync(int id, CancellationToken cancellationToken)
|
||||
@ -130,9 +118,8 @@ public class ManualCatalogService : IManualCatalogService
|
||||
if (manual is null)
|
||||
return 0;
|
||||
|
||||
var filePath = await BuildFilePathAsync(manual.IdCategory, manual.IdFolder, manual.Name,
|
||||
cancellationToken);
|
||||
|
||||
var filePath = await BuildFilePathAsync(manual.IdDirectory, manual.Name, cancellationToken);
|
||||
|
||||
fileStorageRepository.DeleteFile(filePath);
|
||||
|
||||
return await manualRepository.DeleteAsync(manual.Id, cancellationToken);
|
||||
@ -145,58 +132,42 @@ public class ManualCatalogService : IManualCatalogService
|
||||
if (manual is null)
|
||||
return null;
|
||||
|
||||
var path = await BuildFilePathAsync(manual.IdCategory, manual.IdFolder, manual.Name, cancellationToken);
|
||||
|
||||
var fileStream = new FileStream(Path.GetFullPath(path), FileMode.Open);
|
||||
|
||||
var path = await BuildFilePathAsync(manual.IdDirectory, manual.Name, cancellationToken);
|
||||
var fileStream = new FileStream(path, FileMode.Open);
|
||||
return (fileStream, manual.Name);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<CatalogItemManualDto>> GetCatalogAsync(CancellationToken cancellationToken)
|
||||
private async Task<bool> IsExistDirectoryAsync(ManualDirectoryDto directory, CancellationToken cancellationToken)
|
||||
{
|
||||
var catalogItems = new List<CatalogItemManualDto>();
|
||||
|
||||
var categories = await fileCategoryRepository.GetAllAsync(FileCategory.IdFileCategoryTypeManuals,
|
||||
var existingDirectory = await manualDirectoryRepository.GetOrDefaultAsync(directory.Name, directory.IdParent,
|
||||
cancellationToken);
|
||||
|
||||
foreach (var category in categories)
|
||||
{
|
||||
catalogItems.Add(new CatalogItemManualDto()
|
||||
{
|
||||
Category = category,
|
||||
ManualsWithoutFolder = await manualRepository.GetManualsWithoutFolderAsync(category.Id, cancellationToken),
|
||||
Folders = await manualFolderRepository.GetTreeAsync(category.Id, cancellationToken)
|
||||
});
|
||||
}
|
||||
|
||||
return catalogItems;
|
||||
return existingDirectory is not null && directory.Id != existingDirectory.Id;
|
||||
}
|
||||
|
||||
private async Task<bool> IsExistFolderAsync(ManualFolderDto folder, CancellationToken cancellationToken)
|
||||
private async Task<string> BuildDirectoryPathAsync(int idDirectory, CancellationToken cancellationToken)
|
||||
{
|
||||
var existingFolder = await manualFolderRepository.GetOrDefaultAsync(folder.Name, folder.IdParent,
|
||||
folder.IdCategory,
|
||||
cancellationToken);
|
||||
var directiories = await manualDirectoryRepository.GetAllAsync(cancellationToken);
|
||||
|
||||
return existingFolder is not null && folder.Id != existingFolder.Id;
|
||||
}
|
||||
var directory = directiories.FirstOrDefault(d => d.Id == idDirectory)
|
||||
?? throw new ArgumentInvalidException($"Директории с Id: {idDirectory} не существует", nameof(idDirectory));
|
||||
|
||||
private async Task<string> BuildFilePathAsync(int? idCategory, int? idFolder, string name,
|
||||
CancellationToken cancellationToken)
|
||||
{
|
||||
if (idFolder.HasValue)
|
||||
var pathSegments = new List<int> { directory.Id };
|
||||
|
||||
while (directory.IdParent.HasValue)
|
||||
{
|
||||
var folder = await manualFolderRepository.GetOrDefaultAsync(idFolder.Value, cancellationToken)
|
||||
?? throw new ArgumentInvalidException($"Папки с Id: {idFolder} не сущесвует", nameof(idFolder));
|
||||
directory = directiories.FirstOrDefault(d => d.Id == directory.IdParent.Value);
|
||||
|
||||
return fileStorageRepository.MakeFilePath(directoryFiles, Path.Combine(folder.IdCategory.ToString(),
|
||||
folder.IdParent.ToString() ?? string.Empty,
|
||||
folder.Id.ToString()), name);
|
||||
pathSegments.Insert(0, directory.Id);
|
||||
}
|
||||
|
||||
if (!idCategory.HasValue)
|
||||
throw new ArgumentInvalidException("Не указан идентификатор категории", nameof(idCategory));
|
||||
return string.Join("/", pathSegments);
|
||||
}
|
||||
|
||||
return fileStorageRepository.MakeFilePath(directoryFiles, idCategory.Value.ToString(), name);
|
||||
private async Task<string> BuildFilePathAsync(int idDirectory, string name, CancellationToken cancellationToken)
|
||||
{
|
||||
var directoryPath = await BuildDirectoryPathAsync(idDirectory, cancellationToken);
|
||||
|
||||
return fileStorageRepository.MakeFilePath(directoryFiles, IdFileCategory.ToString(), Path.Combine(directoryPath, name));
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user