rename log file

f7deat · f7deat · commit d0eb39c35ed2 · 2023-10-22T12:14:07.000+07:00
diff --git a/Controllers/LogController.cs b/Controllers/LogController.cs
@@ -7,15 +7,18 @@ namespace Waffle.Controllers;
 
 public class LogController : BaseController
 {
-    private readonly ILogService _appLogService;
+    private readonly ILogService _logService;
     public LogController(ILogService appLogService)
     {
-        _appLogService = appLogService;
+        _logService = appLogService;
     }
 
     [HttpGet("list")]
-    public async Task<IActionResult> ListAsync([FromQuery] SearchFilterOptions filterOptions) => Ok(await _appLogService.ListAsync(filterOptions));
+    public async Task<IActionResult> ListAsync([FromQuery] SearchFilterOptions filterOptions) => Ok(await _logService.ListAsync(filterOptions));
 
     [HttpPost("delete/{id}")]
-    public async Task<IActionResult> DeleteAsync([FromRoute] Guid id) => Ok(await _appLogService.DeleteAsync(id));
+    public async Task<IActionResult> DeleteAsync([FromRoute] Guid id) => Ok(await _logService.DeleteAsync(id));
+
+    [HttpPost("delete/all")]
+    public async Task<IActionResult> DeleteAllAsync() => Ok(await _logService.DeleteAllAsync());
 }
diff --git a/Controllers/RoleController.cs b/Controllers/RoleController.cs
@@ -1,7 +1,6 @@
 ﻿using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Waffle.Core.Constants;
 using Waffle.Entities;
 using Waffle.Foundations;
@@ -18,14 +17,7 @@ public RoleController(RoleManager<ApplicationRole> roleManager)
     }
 
     [HttpGet("list")]
-    public async Task<IActionResult> ListAsync([FromQuery] BasicFilterOptions filterOptions)
-    {
-        return Ok(new
-        {
-            total = await _roleManager.Roles.CountAsync(),
-            data = await _roleManager.Roles.Skip((filterOptions.Current - 1) * filterOptions.PageSize).Take(filterOptions.PageSize).ToListAsync()
-        });
-    }
+    public async Task<IActionResult> ListAsync([FromQuery] BasicFilterOptions filterOptions) => Ok(await ListResult<ApplicationRole>.Success(_roleManager.Roles, filterOptions));
 
     [HttpPost("delete/{name}")]
     public async Task<IActionResult> DeleteAsync([FromRoute] string name)
@@ -41,14 +33,7 @@ public async Task<IActionResult> DeleteAsync([FromRoute] string name)
     public async Task<IActionResult> UpdateAsync([FromBody] ApplicationRole args)
     {
         var role = await _roleManager.FindByIdAsync(args.Id.ToString());
-        if (role is null)
-        {
-            return Ok(IdentityResult.Failed(new IdentityError
-            {
-                Code = "dataNotFound",
-                Description = "Data not found!"
-            }));
-        }
+        if (role is null) return BadRequest("Role not found!");
         role.Name = args.Name;
         return Ok(await _roleManager.UpdateAsync(role));
     }
diff --git a/Controllers/SettingController.cs b/Controllers/SettingController.cs
@@ -65,7 +65,7 @@ public IActionResult GetInfo()
     public async Task<IActionResult> GetSendGridAsync()
     {
         var app = await _settingService.EnsureSettingAsync(nameof(SendGrid));
-        return base.Ok(await _settingService.GetAsync<WFSendGrid>(app.Id));
+        return Ok(await _settingService.GetAsync<WFSendGrid>(app.Id));
     }
 
     [HttpPost("sendgrid/save")]
diff --git a/Controllers/StyleController.cs b/Controllers/StyleController.cs
@@ -15,7 +15,7 @@ public StyleController(IWebHostEnvironment webHostEnvironment, IConfiguration co
         _configuration = configuration;
     }
 
-    [HttpGet("")]
+    [HttpGet]
     public async Task<IActionResult> GetAsync()
     {
         var path = GetPath();
diff --git a/Core/Interfaces/IRepository/ILogRepository.cs b/Core/Interfaces/IRepository/ILogRepository.cs
@@ -1,10 +1,12 @@
-﻿using Waffle.Entities;
+﻿using Microsoft.AspNetCore.Identity;
+using Waffle.Entities;
 using Waffle.Models;
 using Waffle.Models.ViewModels.Logs;
 
 namespace Waffle.Core.Interfaces.IRepository;
 
-public interface IAppLogRepository : IAsyncRepository<AppLog>
+public interface ILogRepository : IAsyncRepository<AppLog>
 {
+    Task<IdentityResult> DeleteAllAsync();
     Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions);
 }
diff --git a/Core/Interfaces/IService/ILogService.cs b/Core/Interfaces/IService/ILogService.cs
@@ -7,6 +7,7 @@ namespace Waffle.Core.Interfaces.IService;
 public interface ILogService
 {
     Task AddAsync(string message, Guid catalogId);
+    Task<IdentityResult> DeleteAllAsync();
     Task<IdentityResult> DeleteAsync(Guid id);
     Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions);
     Task MessageAsync(string text);
diff --git a/Core/Services/CommentService.cs b/Core/Services/CommentService.cs
@@ -17,10 +17,10 @@ public class CommentService : ICommentService
     private readonly ICurrentUser _currentUser;
     private readonly UserManager<ApplicationUser> _userManager;
     private readonly ILogger<CommentService> _logger;
-    private readonly IAppLogRepository _appLogRepository;
+    private readonly ILogRepository _appLogRepository;
     private readonly ICatalogRepository _catalogRepository;
 
-    public CommentService(ICatalogRepository catalogRepository, ILogger<CommentService> logger, IAppLogRepository appLogRepository, ICurrentUser currentUser, ICommentRepository commentRepository, UserManager<ApplicationUser> userManager)
+    public CommentService(ICatalogRepository catalogRepository, ILogger<CommentService> logger, ILogRepository appLogRepository, ICurrentUser currentUser, ICommentRepository commentRepository, UserManager<ApplicationUser> userManager)
     {
         _commentRepository = commentRepository;
         _userManager = userManager;
diff --git a/Core/Services/LogService.cs b/Core/Services/LogService.cs
@@ -12,21 +12,21 @@ namespace Waffle.Core.Services;
 public class LogService : ILogService
 {
     private readonly ICurrentUser _currentUser;
-    private readonly IAppLogRepository _appLogRepository;
+    private readonly ILogRepository _logRepository;
     private readonly ILogger<LogService> _logger;
     private readonly ITelegramService _telegramService;
 
-    public LogService(ICurrentUser currentUser, IAppLogRepository appLogRepository, ILogger<LogService> logger, ITelegramService telegramService)
+    public LogService(ICurrentUser currentUser, ILogRepository appLogRepository, ILogger<LogService> logger, ITelegramService telegramService)
     {
         _currentUser = currentUser;
-        _appLogRepository = appLogRepository;
+        _logRepository = appLogRepository;
         _logger = logger;
         _telegramService = telegramService;
     }
 
     public async Task AddAsync(string message, Guid catalogId)
     {
-        await _appLogRepository.AddAsync(new AppLog
+        await _logRepository.AddAsync(new AppLog
         {
             Message = message,
             CatalogId = catalogId,
@@ -35,9 +35,11 @@ await _appLogRepository.AddAsync(new AppLog
         });
     }
 
+    public Task<IdentityResult> DeleteAllAsync() => _logRepository.DeleteAllAsync();
+
     public async Task<IdentityResult> DeleteAsync(Guid id)
     {
-        var log = await _appLogRepository.FindAsync(id);
+        var log = await _logRepository.FindAsync(id);
         if (log is null)
         {
             _logger.LogTrace("Log {id} not found!", id);
@@ -47,11 +49,11 @@ public async Task<IdentityResult> DeleteAsync(Guid id)
                 Description = "Log not found!"
             });
         }
-        await _appLogRepository.DeleteAsync(log);
+        await _logRepository.DeleteAsync(log);
         return IdentityResult.Success;
     }
 
-    public Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions) => _appLogRepository.ListAsync(filterOptions);
+    public Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions) => _logRepository.ListAsync(filterOptions);
 
     public async Task MessageAsync(string text) => await _telegramService.SendMessageAsync(text);
 }
diff --git a/Extensions/ServiceCollectionExtensions.cs b/Extensions/ServiceCollectionExtensions.cs
@@ -16,7 +16,7 @@ public static void AddServices(this IServiceCollection services)
     {
         services.AddTransient<IEmailSender, EmailSender>();
         services.AddScoped<ISettingService, SettingService>();
-        services.AddScoped<IAppLogRepository, AppLogRepository>();
+        services.AddScoped<ILogRepository, LogRepository>();
         services.AddScoped<ILogService, LogService>();
         services.AddScoped<ICatalogRepository, CatalogRepository>();
         services.AddScoped<ICatalogService, CatalogService>();
diff --git a/Infrastructure/Repositories/LogRepository.cs b/Infrastructure/Repositories/LogRepository.cs
@@ -1,4 +1,6 @@
-﻿using Waffle.Core.Foundations;
+﻿using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Waffle.Core.Foundations;
 using Waffle.Core.Interfaces.IRepository;
 using Waffle.Data;
 using Waffle.Entities;
@@ -7,12 +9,18 @@
 
 namespace Waffle.Infrastructure.Repositories;
 
-public class AppLogRepository : EfRepository<AppLog>, IAppLogRepository
+public class LogRepository : EfRepository<AppLog>, ILogRepository
 {
-    public AppLogRepository(ApplicationDbContext context) : base(context)
+    public LogRepository(ApplicationDbContext context) : base(context)
     {
     }
 
+    public async Task<IdentityResult> DeleteAllAsync()
+    {
+        await _context.Database.ExecuteSqlRawAsync("DELETE FROM AppLogs");
+        return IdentityResult.Success;
+    }
+
     public async Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions)
     {
         var query = from log in _context.AppLogs
diff --git a/Models/Components/Document.cs b/Models/Components/Document.cs
diff --git a/Models/Components/ReferralLink.cs b/Models/Components/ReferralLink.cs

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,18 @@ namespace Waffle.Controllers;`
`7`	`7`
`8`	`8`	`public class LogController : BaseController`
`9`	`9`	`{`
`10`		`- private readonly ILogService _appLogService;`
	`10`	`+ private readonly ILogService _logService;`
`11`	`11`	`public LogController(ILogService appLogService)`
`12`	`12`	`{`
`13`		`- _appLogService = appLogService;`
	`13`	`+ _logService = appLogService;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`[HttpGet("list")]`
`17`		`- public async Task<IActionResult> ListAsync([FromQuery] SearchFilterOptions filterOptions) => Ok(await _appLogService.ListAsync(filterOptions));`
	`17`	`+ public async Task<IActionResult> ListAsync([FromQuery] SearchFilterOptions filterOptions) => Ok(await _logService.ListAsync(filterOptions));`
`18`	`18`
`19`	`19`	`[HttpPost("delete/{id}")]`
`20`		`- public async Task<IActionResult> DeleteAsync([FromRoute] Guid id) => Ok(await _appLogService.DeleteAsync(id));`
	`20`	`+ public async Task<IActionResult> DeleteAsync([FromRoute] Guid id) => Ok(await _logService.DeleteAsync(id));`
	`21`	`+`
	`22`	`+ [HttpPost("delete/all")]`
	`23`	`+ public async Task<IActionResult> DeleteAllAsync() => Ok(await _logService.DeleteAllAsync());`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public IActionResult GetInfo()`
`65`	`65`	`public async Task<IActionResult> GetSendGridAsync()`
`66`	`66`	`{`
`67`	`67`	`var app = await _settingService.EnsureSettingAsync(nameof(SendGrid));`
`68`		`- return base.Ok(await _settingService.GetAsync<WFSendGrid>(app.Id));`
	`68`	`+ return Ok(await _settingService.GetAsync<WFSendGrid>(app.Id));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`[HttpPost("sendgrid/save")]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public StyleController(IWebHostEnvironment webHostEnvironment, IConfiguration co`
`15`	`15`	`_configuration = configuration;`
`16`	`16`	`}`
`17`	`17`
`18`		`- [HttpGet("")]`
	`18`	`+ [HttpGet]`
`19`	`19`	`public async Task<IActionResult> GetAsync()`
`20`	`20`	`{`
`21`	`21`	`var path = GetPath();`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`		`-using Waffle.Entities;`
	`1`	`+using Microsoft.AspNetCore.Identity;`
	`2`	`+using Waffle.Entities;`
`2`	`3`	`using Waffle.Models;`
`3`	`4`	`using Waffle.Models.ViewModels.Logs;`
`4`	`5`
`5`	`6`	`namespace Waffle.Core.Interfaces.IRepository;`
`6`	`7`
`7`		`-public interface IAppLogRepository : IAsyncRepository<AppLog>`
	`8`	`+public interface ILogRepository : IAsyncRepository<AppLog>`
`8`	`9`	`{`
	`10`	`+ Task<IdentityResult> DeleteAllAsync();`
`9`	`11`	`Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions);`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace Waffle.Core.Interfaces.IService;`
`7`	`7`	`public interface ILogService`
`8`	`8`	`{`
`9`	`9`	`Task AddAsync(string message, Guid catalogId);`
	`10`	`+ Task<IdentityResult> DeleteAllAsync();`
`10`	`11`	`Task<IdentityResult> DeleteAsync(Guid id);`
`11`	`12`	`Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions);`
`12`	`13`	`Task MessageAsync(string text);`
Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,21 @@ namespace Waffle.Core.Services;`
`12`	`12`	`public class LogService : ILogService`
`13`	`13`	`{`
`14`	`14`	`private readonly ICurrentUser _currentUser;`
`15`		`- private readonly IAppLogRepository _appLogRepository;`
	`15`	`+ private readonly ILogRepository _logRepository;`
`16`	`16`	`private readonly ILogger<LogService> _logger;`
`17`	`17`	`private readonly ITelegramService _telegramService;`
`18`	`18`
`19`		`- public LogService(ICurrentUser currentUser, IAppLogRepository appLogRepository, ILogger<LogService> logger, ITelegramService telegramService)`
	`19`	`+ public LogService(ICurrentUser currentUser, ILogRepository appLogRepository, ILogger<LogService> logger, ITelegramService telegramService)`
`20`	`20`	`{`
`21`	`21`	`_currentUser = currentUser;`
`22`		`- _appLogRepository = appLogRepository;`
	`22`	`+ _logRepository = appLogRepository;`
`23`	`23`	`_logger = logger;`
`24`	`24`	`_telegramService = telegramService;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public async Task AddAsync(string message, Guid catalogId)`
`28`	`28`	`{`
`29`		`- await _appLogRepository.AddAsync(new AppLog`
	`29`	`+ await _logRepository.AddAsync(new AppLog`
`30`	`30`	`{`
`31`	`31`	`Message = message,`
`32`	`32`	`CatalogId = catalogId,`
`@@ -35,9 +35,11 @@ await _appLogRepository.AddAsync(new AppLog`
`35`	`35`	`});`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public Task<IdentityResult> DeleteAllAsync() => _logRepository.DeleteAllAsync();`
	`39`	`+`
`38`	`40`	`public async Task<IdentityResult> DeleteAsync(Guid id)`
`39`	`41`	`{`
`40`		`- var log = await _appLogRepository.FindAsync(id);`
	`42`	`+ var log = await _logRepository.FindAsync(id);`
`41`	`43`	`if (log is null)`
`42`	`44`	`{`
`43`	`45`	`_logger.LogTrace("Log {id} not found!", id);`
`@@ -47,11 +49,11 @@ public async Task<IdentityResult> DeleteAsync(Guid id)`
`47`	`49`	`Description = "Log not found!"`
`48`	`50`	`});`
`49`	`51`	`}`
`50`		`- await _appLogRepository.DeleteAsync(log);`
	`52`	`+ await _logRepository.DeleteAsync(log);`
`51`	`53`	`return IdentityResult.Success;`
`52`	`54`	`}`
`53`	`55`
`54`		`- public Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions) => _appLogRepository.ListAsync(filterOptions);`
	`56`	`+ public Task<ListResult<AppLogListItem>> ListAsync(SearchFilterOptions filterOptions) => _logRepository.ListAsync(filterOptions);`
`55`	`57`
`56`	`58`	`public async Task MessageAsync(string text) => await _telegramService.SendMessageAsync(text);`
`57`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static void AddServices(this IServiceCollection services)`
`16`	`16`	`{`
`17`	`17`	`services.AddTransient<IEmailSender, EmailSender>();`
`18`	`18`	`services.AddScoped<ISettingService, SettingService>();`
`19`		`- services.AddScoped<IAppLogRepository, AppLogRepository>();`
	`19`	`+ services.AddScoped<ILogRepository, LogRepository>();`
`20`	`20`	`services.AddScoped<ILogService, LogService>();`
`21`	`21`	`services.AddScoped<ICatalogRepository, CatalogRepository>();`
`22`	`22`	`services.AddScoped<ICatalogService, CatalogService>();`