on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#6385536 Удаление ненужных файлов. Замечания

Browse Source
This commit is contained in:
ai.astrakhantsev 2022-10-17 08:58:28 +05:00
parent 3a0a22616d
commit 8a83194187
6 changed files with 81 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Repositories/IFileStorageRepository.cs
View File

@ -46,7 +46,7 @@ namespace AsbCloudApp.Repositories
/// </summary>
/// <param name="idWell"></param>
/// <param name="idsFiles"></param>
int DeleteFilesNotList(int idWell, IEnumerable<int> idsFiles);
int DeleteFilesNotInList(int idWell, IEnumerable<int> idsFiles);
/// <summary>
/// Вывод списка всех файлов из базы, для которых нет файла на диске

16
AsbCloudApp/Services/FileService.cs
View File

@ -312,7 +312,7 @@ namespace AsbCloudApp.Services
IdWell = idWell
},
token);
var result = await Task.FromResult(fileStorageRepository.DeleteFilesNotList(idWell, files.Select(x => x.Id)));
var result = await Task.FromResult(fileStorageRepository.DeleteFilesNotInList(idWell, files.Select(x => x.Id)));
return result;
}
@ -333,6 +333,20 @@ namespace AsbCloudApp.Services
var result = fileStorageRepository.GetListFilesNotDisc(files);
return result;
}
/// <summary>
/// Получить файловый поток по идентификатору файла
/// </summary>
/// <param name="fileInfo"></param>
/// <param name="token"></param>
/// <returns></returns>
public FileStream GetFileStream(FileInfoDto fileInfo)
{
var relativePath = GetUrl(fileInfo);
var fileStream = new FileStream(Path.GetFullPath(relativePath), FileMode.Open);
return fileStream;
}
}
#nullable disable
}

109
AsbCloudInfrastructure/Repository/FileRepository.cs
View File

@ -45,23 +45,11 @@ namespace AsbCloudInfrastructure.Repository
public async Task<PaginationContainer<FileInfoDto>> GetInfosAsync(FileServiceRequest request, CancellationToken token = default)
{
var query = dbSetConfigured
.Where(e => e.IdWell == request.IdWell &&
e.IdCategory == request.IdCategory &&
!e.IsDeleted);
if (request.CompanyName is not null)
query = query.Where(e => (e.Author == null) ||
(e.Author.Company == null) ||
e.Author.Company.Caption.Contains(request.CompanyName));
if (request.FileName is not null)
query = query.Where(e => e.Name.ToLower().Contains(request.FileName.ToLower()));
var query = GetQuery(request, token);
var firstFile = query.FirstOrDefault();
var skip = request.Skip ?? 0;
var take = request.Take ?? 32;
var firstFile = await query.FirstOrDefaultAsync(token);
if (firstFile is null)
return new PaginationContainer<FileInfoDto>()
{
@ -71,21 +59,7 @@ namespace AsbCloudInfrastructure.Repository
};
var timezoneOffset = firstFile.Well.Timezone?.Hours ?? 5;
if (request.Begin is not null)
{
var beginUtc = request.Begin.Value.ToUtcDateTimeOffset(timezoneOffset);
query = query.Where(e => e.UploadDate >= beginUtc);
}
if (request.End is not null)
{
var endUtc = request.End.Value.ToUtcDateTimeOffset(timezoneOffset);
query = query.Where(e => e.UploadDate <= endUtc);
}
var count = await query.CountAsync(token).ConfigureAwait(false);
var result = new PaginationContainer<FileInfoDto>(count)
{
Skip = skip,
@ -206,9 +180,7 @@ namespace AsbCloudInfrastructure.Repository
public async Task<IEnumerable<FileInfoDto>> GetInfosByWellIdAsync(FileServiceRequest request, CancellationToken token)
{
var query = dbSetConfigured.Where(e => e.IdWell == request.IdWell);
if (request.IsDeleted is not null)
query = query.Where(x => x.IsDeleted == request.IsDeleted);
var query = GetQuery(request, token);
var entities = await query
.AsNoTracking()
@ -219,25 +191,6 @@ namespace AsbCloudInfrastructure.Repository
return dtos;
}
private static FileInfoDto Convert(AsbCloudDb.Model.FileInfo entity)
{
var timezoneOffset = entity.Well.Timezone?.Hours ?? 5;
return Convert(entity, timezoneOffset);
}
private static FileInfoDto Convert(AsbCloudDb.Model.FileInfo entity, double timezoneOffset)
{
var dto = entity.Adapt<FileInfoDto>();
dto.UploadDate = entity.UploadDate.ToRemoteDateTime(timezoneOffset);
dto.FileMarks = entity.FileMarks.Select(m =>
{
var mark = m.Adapt<FileMarkDto>();
mark.DateCreated = m.DateCreated.ToRemoteDateTime(timezoneOffset);
return mark;
});
return dto;
}
public async Task<IEnumerable<FileInfoDto>> GetAllAsync(CancellationToken token)
=> await dbSetConfigured.AsNoTracking()
.Select(x => Convert(x))
@ -307,6 +260,62 @@ namespace AsbCloudInfrastructure.Repository
{
throw new NotImplementedException();
}
private IQueryable<AsbCloudDb.Model.FileInfo> GetQuery(FileServiceRequest request, CancellationToken token = default)
{
var query = dbSetConfigured
.Where(e => e.IdWell == request.IdWell &&
e.IdCategory == request.IdCategory);
if (request.IsDeleted is not null)
query = query.Where(x => x.IsDeleted == request.IsDeleted);
if (request.CompanyName is not null)
query = query.Where(e => (e.Author == null) ||
(e.Author.Company == null) ||
e.Author.Company.Caption.Contains(request.CompanyName));
if (request.FileName is not null)
query = query.Where(e => e.Name.ToLower().Contains(request.FileName.ToLower()));
var firstFile = query.FirstOrDefault();
if (firstFile is null)
return Enumerable.Empty<AsbCloudDb.Model.FileInfo>().AsQueryable();
var timezoneOffset = firstFile.Well.Timezone?.Hours ?? 5;
if (request.Begin is not null)
{
var beginUtc = request.Begin.Value.ToUtcDateTimeOffset(timezoneOffset);
query = query.Where(e => e.UploadDate >= beginUtc);
}
if (request.End is not null)
{
var endUtc = request.End.Value.ToUtcDateTimeOffset(timezoneOffset);
query = query.Where(e => e.UploadDate <= endUtc);
}
return query;
}
private static FileInfoDto Convert(AsbCloudDb.Model.FileInfo entity)
{
var timezoneOffset = entity.Well.Timezone?.Hours ?? 5;
return Convert(entity, timezoneOffset);
}
private static FileInfoDto Convert(AsbCloudDb.Model.FileInfo entity, double timezoneOffset)
{
var dto = entity.Adapt<FileInfoDto>();
dto.UploadDate = entity.UploadDate.ToRemoteDateTime(timezoneOffset);
dto.FileMarks = entity.FileMarks.Select(m =>
{
var mark = m.Adapt<FileMarkDto>();
mark.DateCreated = m.DateCreated.ToRemoteDateTime(timezoneOffset);
return mark;
});
return dto;
}
}
#nullable disable
}

2
AsbCloudInfrastructure/Repository/FileStorageRepository.cs
View File

@ -57,7 +57,7 @@ namespace AsbCloudInfrastructure.Repository
$"{idCategory}", $"{fileId}" + $"{Path.GetExtension(fileFullName)}");
}
public int DeleteFilesNotList(int idWell, IEnumerable<int> idsFilesList)
public int DeleteFilesNotInList(int idWell, IEnumerable<int> idsFilesList)
{
var allFilesPath = GetFilesPath(idWell);
var result = 0;

4
AsbCloudWebApi.Tests/ServicesTests/FileServiceTest.cs
View File

@ -133,6 +133,10 @@ namespace AsbCloudWebApi.Tests.ServicesTests
});
var storageRepositoryMock = new Mock<IFileStorageRepository>();
storageRepositoryMock.Setup(x => x.GetUrl(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<string>()))
.Returns((int idWell, int idCategory, int idFile, string dotExtention) => {
return Path.Combine("files", idWell.ToString(), idCategory.ToString(), $"{idFile}{dotExtention}");
});
fileService = new FileService(repositoryMock.Object, storageRepositoryMock.Object);
}

3
AsbCloudWebApi/Controllers/FileController.cs
View File

@ -122,9 +122,8 @@ namespace AsbCloudWebApi.Controllers
try
{
var fileInfo = await fileService.GetInfoAsync(fileId, token);
var relativePath = fileService.GetUrl(fileInfo);
var fileStream = fileService.GetFileStream(fileInfo);
var fileStream = new FileStream(Path.GetFullPath(relativePath), FileMode.Open);
return File(fileStream, "application/octet-stream", fileInfo.Name);
}
catch (FileNotFoundException ex)