git fuu

ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -0,0 +1,25 @@
+using ElectronicsShopContracts.BindingModels;
+using ElectronicsShopContracts.BusinessLogicContracts;
+using ElectronicsShopContracts.SearchModels;
+using ElectronicsShopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectronicsShopBusinessLogic.BusinessLogic
+{
+    public class MessageInfoLogic : IMessageInfoLogic
+    {
+        public bool Create(MessageInfoBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs

@@ -18,7 +18,7 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
         public ReportClientLogic(AbstractSaveToExcelClient abstractSaveToExcelClient, AbstractSaveToWordClient abstractSaveToWordClient, IPaymeantStorage paymeantStorage) {
             _saveToExcel = abstractSaveToExcelClient;
             _saveToWord= abstractSaveToWordClient;
-            _paymeantstorage= paymeantStorage;
+            _paymeantstorage = paymeantStorage;
         }
         public List<ReportPaymeantsViewModel> GetPaymeants(ReportBindingModel model)
         {

ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs

@@ -12,7 +12,7 @@ namespace ElectronicsShopDataBaseImplement
        optionsBuilder)
         {
 			if (optionsBuilder.IsConfigured == false) {
-				optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-O0N00SH\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+				optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
 			}
 			base.OnConfiguring(optionsBuilder);
 		}

ElectronicsShop/ElectronicsShopRestAPI/ElectronicsShopRestAPI.csproj

@@ -9,6 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 

ElectronicsShop/ElectronicsShopRestAPI/Program.cs

@@ -1,12 +1,19 @@
 using ElectronicsShopBusinessLogic.BusinessLogic;
+using ElectronicsShopBusinessLogic.MailWorker;
+using ElectronicsShopBusinessLogic.OfficePackage;
+using ElectronicsShopBusinessLogic.OfficePackage.Implements;
+using ElectronicsShopContracts.BindingModels;
 using ElectronicsShopContracts.BusinessLogicContracts;
 using ElectronicsShopContracts.StorageContracts;
 using ElectronicsShopDataBaseImplement.Implements;
 using Microsoft.OpenApi.Models;
+using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
 
 //todo logger!!!
+builder.Services.AddControllersWithViews();
+builder.Services.AddSession(); // Äîáàâëÿåì ñåññèþ äëÿ àâòîðèçàöèè
 
 // Add services to the container.
 
@@ -14,32 +21,85 @@ builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IEmployeeStorage, EmployeeStorage>();
 builder.Services.AddTransient<IProductStorage, ProductStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
+builder.Services.AddTransient<IPaymeantStorage, PaymeantStorage>();
 builder.Services.AddTransient<ICostItemStorage, CostItemStorage>();
 
+builder.Services.AddTransient<AbstractSaveToExcelClient, SaveToExcelClient>();
+builder.Services.AddTransient<AbstractSaveToExcelEmployee, SaveToExcelEmployee>();
+builder.Services.AddTransient<AbstractSaveToWordClient, SaveToWordClient>();
+builder.Services.AddTransient<AbstractSaveToWordEmployee, SaveToWordEmployee>();
+
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IEmployeeLogic, EmployeeLogic>();
 builder.Services.AddTransient<IProductLogic, ProductLogic>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<ICostItemLogic, CostItemLogic>();
+builder.Services.AddTransient<IReportClientLogic, ReportClientLogic>();
+builder.Services.AddTransient<IReportEmployeeLogic, ReportEmployeeLogic>();
+builder.Services.AddTransient<IPaymeantLogic, PaymeantLogic>();
+builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+
+builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+
+builder.Services.AddLogging(option =>
+{
+    var configuration = new ConfigurationBuilder()
+        .SetBasePath(Directory.GetCurrentDirectory())
+        .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true)
+        .Build();
+
+    var logger = new LoggerConfiguration()
+        .ReadFrom.Configuration(configuration)
+        .CreateLogger();
+
+    option.AddSerilog(logger);
+});
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(x => x.SwaggerDoc("v1", new OpenApiInfo { Title = "ElectronicsShopRestAPI", Version = "v1" }));
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo
+    {
+        Title = "JurasicZooRestApi",
+        Version = "v1"
+    });
+});
+
 
 var app = builder.Build();
 
+var mailSender = app.Services.GetService<AbstractMailWorker>();
+
+mailSender?.MailConfig(new MailConfigBindingModel
+{
+    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
+    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
+    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
+    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
+    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
+    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
+});
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI(x => x.SwaggerEndpoint("/swagger/v1/swagger.json", "ElectronicsShopRestAPI v1"));
+    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "JurasicZooRestApi v1"));
 }
 
 app.UseHttpsRedirection();
+app.UseRouting();
+app.UseStaticFiles();
+app.UseSession(); // Äîáàâëÿåì ñåññèþ äëÿ àâòîðèçàöèè
+
+app.UseRouting();
 
 app.UseAuthorization();
 
-app.MapControllers();
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller=Home}/{action=Index}/{id?}");
 
 app.Run();

ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml

@@ -18,11 +18,16 @@
         <div class="col-3">
             <input name="endDate" id="endDate" class="form-control" type="date" />
         </div>
-        <div class="col-2">
-            <input type="submit" name="getReport" class="btn btn-primary" value="Сформировать отчет" />
-        </div>
-        <div class="col-3">
+        <div>
+            <th>
+                <input type="submit" name="getReportword" class="btn btn-primary" value="Сформировать отчет WORD" />
+            </th>
+            <th>
+                <input type="submit" name="getReportexcel" class="btn btn-primary" value="Сформировать отчет EXCEL" />
+            </th>
+            <th>
                 <input type="submit" name="sendToMail" class="btn btn-primary" value="Отправить на почту" />
+            </th>
         </div>
     </div>
 </form>

ElectronicsShop/ElectronicsShopShopClientApp/log4net.config

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<log4net>
+	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+		<file value="c:/temp/AbstractShopRestApi.log" />
+		<appendToFile value="true" />
+		<maximumFileSize value="100KB" />
+		<maxSizeRollBackups value="2" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
+		</layout>
+	</appender>
+	<root>
+		<level value="TRACE" />
+		<appender-ref ref="RollingFile" />
+	</root>
+</log4net>