From 642291fa0a5d47b9b0cdfc9195567a0417075621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=A4=D0=B5=D0=B4=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?= <fedotov2004@gmail.com>
Date: Tue, 9 Jul 2024 19:40:24 +0400
Subject: [PATCH] xlsx reports exports

---
 .../BusinessLogic/ReportClientLogic.cs          |  14 ++++++--------
 .../ElectronicsShopBusinessLogic.csproj         |   2 +-
 .../OfficePackage/AbstractSaveToExcelClient.cs  |  10 ++++++----
 .../Implements/SaveToExcelClient.cs             |  16 ++++++++--------
 .../IReportClientLogic.cs                       |   9 +++++----
 .../ElectronicsShopContracts.csproj             |   4 ++++
 .../Controllers/ClientController.cs             |  16 +++++++++++++++-
 .../Controllers/MainController.cs               |   5 ++++-
 .../ElectronicsShopRestAPI/report.xlsx          | Bin 0 -> 2869 bytes
 .../Controllers/HomeController.cs               |  12 +++++++-----
 10 files changed, 56 insertions(+), 32 deletions(-)
 create mode 100644 ElectronicsShop/ElectronicsShopRestAPI/report.xlsx

diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
index 4811c4a..677fa4a 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
@@ -1,4 +1,5 @@
-using ElectronicsShopBusinessLogic.OfficePackage;
+using DocumentFormat.OpenXml.Packaging;
+using ElectronicsShopBusinessLogic.OfficePackage;
 using ElectronicsShopBusinessLogic.OfficePackage.HelperModels;
 using ElectronicsShopContracts.BindingModels;
 using ElectronicsShopContracts.BusinessLogicContracts;
@@ -6,7 +7,6 @@ using ElectronicsShopContracts.SearchModels;
 using ElectronicsShopContracts.StorageContracts;
 using ElectronicsShopContracts.ViewModels;
 
-
 namespace ElectronicsShopBusinessLogic.BusinessLogic
 {
     public class ReportClientLogic : IReportClientLogic
@@ -73,14 +73,14 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
             return list;
 		}
 
-		public void SavePaymeantToExcelFile(ReportBindingModel model, int _clientID)
+		public byte[] SavePaymeantToExcelFile(ReportBindingModel? model, int _clientID)
         {
-            _saveToExcel.CreateReport(new ExcelInfoClient
+            var document = _saveToExcel.CreateReport(new ExcelInfoClient
             {
-                FileName = model.FileName,
                 Title = "Список оплат",
                 PaymeantProducts = GetPaymeantProducts(_clientID)
 			});
+            return document;
         }
 
         public void SavePaymeantToWordFile(ReportBindingModel model)
@@ -92,7 +92,5 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
                 ListPaymeant = _paymeantstorage.GetFullList(),
             }) ;
         }
-
-		
 	}
-}
+}
\ No newline at end of file
diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/ElectronicsShopBusinessLogic.csproj b/ElectronicsShop/ElectronicsShopBusinessLogic/ElectronicsShopBusinessLogic.csproj
index 45686b4..c5144c7 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/ElectronicsShopBusinessLogic.csproj
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/ElectronicsShopBusinessLogic.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
-    <PackageReference Include="MailKit" Version="4.6.0" />
+    <PackageReference Include="MailKit" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="MigraDocCore.DocumentObjectModel" Version="1.3.63" />
     <PackageReference Include="MigraDocCore.Rendering" Version="1.3.63" />
diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs
index 2ba3a11..7a4c20f 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs
@@ -1,4 +1,5 @@
-using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums;
+using DocumentFormat.OpenXml.Packaging;
+using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums;
 using ElectronicsShopBusinessLogic.OfficePackage.HelperModels;
 
 
@@ -6,7 +7,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToExcelClient
     {
-        public void CreateReport(ExcelInfoClient info) {
+        public byte[] CreateReport(ExcelInfoClient info) {
             CreateExcel(info);
 
             InsertCellInWorksheet(new ExcelCellParameters {
@@ -61,7 +62,8 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
                 });
                 rowIndex++;
             }
-            SaveExcel(info);
+			var documnet = SaveExcel(info);
+            return documnet;
 		}
 
         // Создание excel-файла
@@ -74,6 +76,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
 
         // Сохранение файла
-        protected abstract void SaveExcel(ExcelInfoClient info);
+        protected abstract byte[] SaveExcel(ExcelInfoClient info);
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs
index 1f6fbfa..c3d4cd2 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs
@@ -17,10 +17,9 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements
 
         private Worksheet? _worksheet;
 
-        /// <summary>
-        /// Настройка стилей для файла
-        /// </summary>
-        /// <param name="workbookpart"></param>
+        private MemoryStream _mem = new MemoryStream();
+
+        // Настройка стилей для файла
         private static void CreateStyles(WorkbookPart workbookpart)
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
@@ -149,7 +148,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements
 
         protected override void CreateExcel(ExcelInfoClient info)
         {
-            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
+            _spreadsheetDocument = SpreadsheetDocument.Create(_mem, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
             var workbookpart = _spreadsheetDocument.AddWorkbookPart();
             workbookpart.Workbook = new Workbook();
@@ -182,7 +181,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements
             sheets.Append(sheet);
 
             _worksheet = worksheetPart.Worksheet;
-        }
+		}
 
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
         {
@@ -276,14 +275,15 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements
             mergeCells.Append(mergeCell);
         }
 
-        protected override void SaveExcel(ExcelInfoClient info)
+        protected override byte[] SaveExcel(ExcelInfoClient info)
         {
             if (_spreadsheetDocument == null)
             {
-                return;
+                return null;
             }
             _spreadsheetDocument.WorkbookPart!.Workbook.Save();
             _spreadsheetDocument.Dispose();
+			return _mem.ToArray();
         }
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
index ee7cae8..39f65f6 100644
--- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
@@ -1,4 +1,5 @@
-using ElectronicsShopContracts.BindingModels;
+using DocumentFormat.OpenXml.Packaging;
+using ElectronicsShopContracts.BindingModels;
 using ElectronicsShopContracts.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -14,9 +15,9 @@ namespace ElectronicsShopContracts.BusinessLogicContracts
         List<ReportPaymeantProductsViewModel> GetPaymeantProducts(int _clientID);
         // получения списка оплат
         List<ReportPaymeantsViewModel> GetPaymeants(ReportBindingModel model);
-        void SavePaymeantToWordFile(ReportBindingModel model);
+		void SavePaymeantToWordFile(ReportBindingModel model);
 
-        // Сохранение компонент с указанием отчета в .excel
-        void SavePaymeantToExcelFile(ReportBindingModel model, int _clientID);
+		// Сохранение компонент с указанием отчета в .excel
+		byte[] SavePaymeantToExcelFile(ReportBindingModel? model, int _clientID);
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/ElectronicsShopContracts.csproj b/ElectronicsShop/ElectronicsShopContracts/ElectronicsShopContracts.csproj
index 5c8a174..40b8cdc 100644
--- a/ElectronicsShop/ElectronicsShopContracts/ElectronicsShopContracts.csproj
+++ b/ElectronicsShop/ElectronicsShopContracts/ElectronicsShopContracts.csproj
@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ElectronicsShopDataModels\ElectronicsShopDataModels.csproj" />
   </ItemGroup>
diff --git a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
index 9e63387..d3901d5 100644
--- a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
+++ b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
@@ -1,4 +1,6 @@
-using ElectronicsShopContracts.BindingModels;
+using DocumentFormat.OpenXml.Drawing.Diagrams;
+using DocumentFormat.OpenXml.Packaging;
+using ElectronicsShopContracts.BindingModels;
 using ElectronicsShopContracts.BusinessLogicContracts;
 using ElectronicsShopContracts.SearchModels;
 using ElectronicsShopContracts.ViewModels;
@@ -92,5 +94,17 @@ namespace ElectronicsShopRestAPI.Controllers {
 				throw;
 			}
 		}
+
+		[HttpGet]
+		public byte[] CreateXlsxReport (int _clientID) {
+			try {
+				var document = _reportLogic.SavePaymeantToExcelFile (null, _clientID);
+				return document;
+			}
+			catch (Exception ex) {
+				_logger.LogError(ex, $"Ошибка создания файла");
+				throw;
+			}
+		}
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
index 66c75a0..8e81b73 100644
--- a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
+++ b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs
@@ -19,17 +19,20 @@ namespace ElectronicsShopRestAPI.Controllers {
         private readonly IProductLogic _product;
         private readonly IOrderLogic _order;
         private readonly IPaymeantLogic _paymeant;
+        private readonly IReportClientLogic _reportClientLogic;
+
         //private readonly IMessageInfoLogic _message;
 
         private Dictionary<int, (IProductModel, int)> _productlist;
 
         public MainController(ILogger<MainController> logger, IProductLogic product, 
-                            IOrderLogic orderLogic, IPaymeantLogic paymeant) {
+                            IOrderLogic orderLogic, IPaymeantLogic paymeant, IReportClientLogic reportClientLogic) {
             _logger = logger;
             _product = product;
             _order = orderLogic;
             _productlist = new Dictionary<int, (IProductModel, int)>();
             _paymeant = paymeant;
+            _reportClientLogic = reportClientLogic;
         }
 
 		[HttpGet]
diff --git a/ElectronicsShop/ElectronicsShopRestAPI/report.xlsx b/ElectronicsShop/ElectronicsShopRestAPI/report.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a86d406031e7da665601d86b6141c5e9786b1b76
GIT binary patch
literal 2869
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
S4nUx7z}^U?{n72Kt^WXo{D;;6

literal 0
HcmV?d00001

diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
index 48f2e18..9cdde4c 100644
--- a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
@@ -1,3 +1,4 @@
+using DocumentFormat.OpenXml.Bibliography;
 using ElectronicsShopContracts.BindingModels;
 using ElectronicsShopContracts.BusinessLogicContracts;
 using ElectronicsShopContracts.SearchModels;
@@ -8,6 +9,7 @@ using ElectronicsShopUserApp.Models;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using System.Diagnostics;
+using System.Net.Mime;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
@@ -308,10 +310,10 @@ namespace ElectronicsShopUserApp.Controllers {
             return View(tuple);
         }
 
-        //todo ������ �� �������� �����/��������
-        [HttpPost]
-        public void CreateExcelReport() {
-
-        }
+        [HttpGet]
+        public IActionResult CreateExcelReport() {
+            var fileMemStream =  APIClient.GetRequset<byte[]>($"api/Client/CreateXlsxReport?_clientID={APIClient.Client.ID}");
+            return File(fileMemStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Report.xlsx");
+		}
 	}
 }
\ No newline at end of file