From e67e260f357f591b3529f1eac1e84be1594fe75b Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Tue, 5 Dec 2023 14:14:20 +0500 Subject: [PATCH] Fix WellOperationExportService remove useless asyncs --- .../WellOperationExportService.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/AsbCloudInfrastructure/Services/WellOperationImport/WellOperationExportService.cs b/AsbCloudInfrastructure/Services/WellOperationImport/WellOperationExportService.cs index df49b7aa..e9f1a01f 100644 --- a/AsbCloudInfrastructure/Services/WellOperationImport/WellOperationExportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationImport/WellOperationExportService.cs @@ -38,16 +38,15 @@ public class WellOperationExportService : IWellOperationExportService var timezone = wellService.GetTimezone(idWell); - return await MakeExcelFileStreamAsync(operations, timezone.Hours, cancellationToken); + return MakeExcelFileStream(operations, timezone.Hours); } - private async Task MakeExcelFileStreamAsync(IEnumerable operations, double timezoneOffset, - CancellationToken cancellationToken) + private Stream MakeExcelFileStream(IEnumerable operations, double timezoneOffset) { using Stream ecxelTemplateStream = wellOperationImportTemplateService.GetExcelTemplateStream(); using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled); - await AddOperationsToWorkbook(workbook, operations, timezoneOffset, cancellationToken); + AddOperationsToWorkbook(workbook, operations, timezoneOffset); var memoryStream = new MemoryStream(); workbook.SaveAs(memoryStream, new SaveOptions { }); @@ -55,15 +54,14 @@ public class WellOperationExportService : IWellOperationExportService return memoryStream; } - private async Task AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable operations, double timezoneOffset, - CancellationToken cancellationToken) + private void AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable operations, double timezoneOffset) { var planOperations = operations.Where(o => o.IdType == 0); if (planOperations.Any()) { var sheetPlan = workbook.Worksheets.FirstOrDefault(ws => ws.Name == DefaultTemplateInfo.SheetNamePlan); if (sheetPlan is not null) - await AddOperationsToSheetAsync(sheetPlan, planOperations, timezoneOffset, cancellationToken); + AddOperationsToSheet(sheetPlan, planOperations, timezoneOffset); } var factOperations = operations.Where(o => o.IdType == 1); @@ -71,12 +69,11 @@ public class WellOperationExportService : IWellOperationExportService { var sheetFact = workbook.Worksheets.FirstOrDefault(ws => ws.Name == DefaultTemplateInfo.SheetNameFact); if (sheetFact is not null) - await AddOperationsToSheetAsync(sheetFact, factOperations, timezoneOffset, cancellationToken); + AddOperationsToSheet(sheetFact, factOperations, timezoneOffset); } } - private async Task AddOperationsToSheetAsync(IXLWorksheet sheet, IEnumerable operations, double timezoneOffset, - CancellationToken cancellationToken) + private void AddOperationsToSheet(IXLWorksheet sheet, IEnumerable operations, double timezoneOffset) { var operationsToArray = operations.ToArray();