code refact

EdiWang · Mar 5, 2024 · d9422ba · d9422ba
1 parent 83ffff3
commit d9422ba
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 34 deletions.
diff --git a/src/API/Controllers/LinkController.cs b/src/API/Controllers/LinkController.cs
@@ -17,7 +17,7 @@ public class LinkController(
         IMediator mediator) : ControllerBase
 {
     [HttpPost("create")]
-    [ProducesResponseType(typeof(string), StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     public async Task<IActionResult> Create(LinkEditModel model)
     {
@@ -68,7 +68,7 @@ public async Task<IActionResult> SetEnable(int id, bool isEnabled)
     }
 
     [HttpGet("list")]
-    [ProducesResponseType(typeof(PagedLinkResult), StatusCodes.Status200OK)]
+    [ProducesResponseType<PagedLinkResult>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List(
         string term,
         [Range(1, int.MaxValue)] int take,
@@ -87,7 +87,7 @@ public async Task<IActionResult> List(
     }
 
     [HttpPost("list/tags")]
-    [ProducesResponseType(typeof(PagedLinkResult), StatusCodes.Status200OK)]
+    [ProducesResponseType<PagedLinkResult>(StatusCodes.Status200OK)]
     public async Task<IActionResult> ListByTags(ListByTagsRequest request)
     {
         var (links, totalRows) = await mediator.Send(new ListByTagsCommand(request));
@@ -103,7 +103,7 @@ public async Task<IActionResult> ListByTags(ListByTagsRequest request)
     }
 
     [HttpGet("{id:int}")]
-    [ProducesResponseType(typeof(LinkEditModel), StatusCodes.Status200OK)]
+    [ProducesResponseType<LinkEditModel>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     public async Task<IActionResult> Get(int id)
     {
@@ -114,7 +114,7 @@ public async Task<IActionResult> Get(int id)
     }
 
     [HttpDelete("{id:int}")]
-    [ProducesResponseType(typeof(LinkEditModel), StatusCodes.Status200OK)]
+    [ProducesResponseType<LinkEditModel>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     public async Task<IActionResult> Delete(int id)
     {

diff --git a/src/API/Controllers/ReportController.cs b/src/API/Controllers/ReportController.cs
@@ -10,7 +10,7 @@ namespace Elf.Api.Controllers;
 public class ReportController(IConfiguration configuration, IMediator mediator) : ControllerBase
 {
     [HttpGet("requests")]
-    [ProducesResponseType(typeof(PagedRequestTrack), StatusCodes.Status200OK)]
+    [ProducesResponseType<PagedRequestTrack>(StatusCodes.Status200OK)]
     public async Task<IActionResult> Requests(
         [Range(1, int.MaxValue)] int take,
         [Range(0, int.MaxValue)] int offset)
@@ -28,15 +28,15 @@ public async Task<IActionResult> Requests(
     }
 
     [HttpPost("requests/link")]
-    [ProducesResponseType(typeof(IReadOnlyList<MostRequestedLinkCount>), StatusCodes.Status200OK)]
+    [ProducesResponseType<List<MostRequestedLinkCount>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> MostRequestedLinks(DateRangeRequest request)
     {
         var linkCounts = await mediator.Send(new GetMostRequestedLinkCountQuery(request));
         return Ok(linkCounts);
     }
 
     [HttpPost("requests/clienttype")]
-    [ProducesResponseType(typeof(IReadOnlyList<ClientTypeCount>), StatusCodes.Status200OK)]
+    [ProducesResponseType<List<ClientTypeCount>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> ClientType(DateRangeRequest request)
     {
         var types = await mediator.Send(new GetClientTypeCountsQuery(request,
@@ -45,7 +45,7 @@ public async Task<IActionResult> ClientType(DateRangeRequest request)
     }
 
     [HttpPost("tracking")]
-    [ProducesResponseType(typeof(IReadOnlyList<LinkTrackingDateCount>), StatusCodes.Status200OK)]
+    [ProducesResponseType<List<LinkTrackingDateCount>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> TrackingCount(DateRangeRequest request)
     {
         var dateCounts = await mediator.Send(new GetLinkTrackingDateCountQuery(request));

diff --git a/src/API/Controllers/TagController.cs b/src/API/Controllers/TagController.cs
@@ -10,7 +10,7 @@ namespace Elf.Api.Controllers;
 public class TagController(IMediator mediator) : ControllerBase
 {
     [HttpGet("list")]
-    [ProducesResponseType(typeof(List<TagEntity>), StatusCodes.Status200OK)]
+    [ProducesResponseType<List<TagEntity>>(StatusCodes.Status200OK)]
     public async Task<IActionResult> List()
     {
         var list = await mediator.Send(new GetTagsQuery());

diff --git a/src/API/Data/LinkTrackingEntity.cs b/src/API/Data/LinkTrackingEntity.cs
@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System.ComponentModel.DataAnnotations;
 
 namespace Elf.Api.Data;
 

diff --git a/src/API/Features/GetClientTypeCountsQuery.cs b/src/API/Features/GetClientTypeCountsQuery.cs
@@ -5,11 +5,11 @@
 
 namespace Elf.Api.Features;
 
-public record GetClientTypeCountsQuery(DateRangeRequest Request, int TopTypes) : IRequest<IReadOnlyList<ClientTypeCount>>;
+public record GetClientTypeCountsQuery(DateRangeRequest Request, int TopTypes) : IRequest<List<ClientTypeCount>>;
 
-public class GetClientTypeCountsQueryHandler(ElfDbContext dbContext) : IRequestHandler<GetClientTypeCountsQuery, IReadOnlyList<ClientTypeCount>>
+public class GetClientTypeCountsQueryHandler(ElfDbContext dbContext) : IRequestHandler<GetClientTypeCountsQuery, List<ClientTypeCount>>
 {
-    public async Task<IReadOnlyList<ClientTypeCount>> Handle(GetClientTypeCountsQuery request, CancellationToken ct)
+    public async Task<List<ClientTypeCount>> Handle(GetClientTypeCountsQuery request, CancellationToken ct)
     {
         var uaParser = Parser.GetDefault();
 
@@ -21,7 +21,6 @@ string GetClientTypeName(string userAgent)
             return $"{c.OS.Family}-{c.UA.Family}";
         }
 
-        var utc = DateTime.UtcNow;
         var uac = await dbContext.LinkTracking
                 .Where(p =>
                     p.RequestTimeUtc <= request.Request.EndDateUtc.Date &&
@@ -46,6 +45,7 @@ string GetClientTypeName(string userAgent)
             if (request.TopTypes > 0) q = q.OrderByDescending(p => p.Count).Take(request.TopTypes);
             return q.ToList();
         }
+
         return new List<ClientTypeCount>();
     }
 }
diff --git a/src/API/Features/GetLinkTrackingDateCountQuery.cs b/src/API/Features/GetLinkTrackingDateCountQuery.cs
@@ -4,12 +4,12 @@
 
 namespace Elf.Api.Features;
 
-public record GetLinkTrackingDateCountQuery(DateRangeRequest Request) : IRequest<IReadOnlyList<LinkTrackingDateCount>>;
+public record GetLinkTrackingDateCountQuery(DateRangeRequest Request) : IRequest<List<LinkTrackingDateCount>>;
 
 public class GetLinkTrackingDateCountQueryHandler(ElfDbContext dbContext) :
-        IRequestHandler<GetLinkTrackingDateCountQuery, IReadOnlyList<LinkTrackingDateCount>>
+        IRequestHandler<GetLinkTrackingDateCountQuery, List<LinkTrackingDateCount>>
 {
-    public async Task<IReadOnlyList<LinkTrackingDateCount>> Handle(GetLinkTrackingDateCountQuery request, CancellationToken ct)
+    public async Task<List<LinkTrackingDateCount>> Handle(GetLinkTrackingDateCountQuery request, CancellationToken ct)
     {
         var data = await dbContext.LinkTracking
             .Where(lt =>

diff --git a/src/API/Features/GetMostRequestedLinkCountQuery.cs b/src/API/Features/GetMostRequestedLinkCountQuery.cs
@@ -4,12 +4,12 @@
 
 namespace Elf.Api.Features;
 
-public record GetMostRequestedLinkCountQuery(DateRangeRequest Request) : IRequest<IReadOnlyList<MostRequestedLinkCount>>;
+public record GetMostRequestedLinkCountQuery(DateRangeRequest Request) : IRequest<List<MostRequestedLinkCount>>;
 
 public class GetMostRequestedLinkCountQueryHandler(ElfDbContext dbContext) :
-    IRequestHandler<GetMostRequestedLinkCountQuery, IReadOnlyList<MostRequestedLinkCount>>
+    IRequestHandler<GetMostRequestedLinkCountQuery, List<MostRequestedLinkCount>>
 {
-    public async Task<IReadOnlyList<MostRequestedLinkCount>> Handle(GetMostRequestedLinkCountQuery request, CancellationToken ct)
+    public async Task<List<MostRequestedLinkCount>> Handle(GetMostRequestedLinkCountQuery request, CancellationToken ct)
     {
         var utc = DateTime.UtcNow;
 

diff --git a/src/API/Features/GetRecentRequestsQuery.cs b/src/API/Features/GetRecentRequestsQuery.cs
@@ -4,11 +4,11 @@
 
 namespace Elf.Api.Features;
 
-public record GetRecentRequestsQuery(int Offset, int Take) : IRequest<(IReadOnlyList<RequestTrack>, int TotalRows)>;
+public record GetRecentRequestsQuery(int Offset, int Take) : IRequest<(List<RequestTrack>, int TotalRows)>;
 
-public class GetRecentRequestsQueryHandler(ElfDbContext dbContext) : IRequestHandler<GetRecentRequestsQuery, (IReadOnlyList<RequestTrack>, int TotalRows)>
+public class GetRecentRequestsQueryHandler(ElfDbContext dbContext) : IRequestHandler<GetRecentRequestsQuery, (List<RequestTrack>, int TotalRows)>
 {
-    public async Task<(IReadOnlyList<RequestTrack>, int TotalRows)> Handle(GetRecentRequestsQuery request, CancellationToken ct)
+    public async Task<(List<RequestTrack>, int TotalRows)> Handle(GetRecentRequestsQuery request, CancellationToken ct)
     {
         var (offset, take) = request;
         var query = dbContext.LinkTracking;

diff --git a/src/API/Features/ListByTagsCommand.cs b/src/API/Features/ListByTagsCommand.cs
@@ -4,11 +4,11 @@
 
 namespace Elf.Api.Features;
 
-public record ListByTagsCommand(ListByTagsRequest Payload) : IRequest<(IReadOnlyList<LinkModel> Links, int TotalRows)>;
+public record ListByTagsCommand(ListByTagsRequest Payload) : IRequest<(List<LinkModel> Links, int TotalRows)>;
 
-public class ListByTagsCommandHandler(ElfDbContext dbContext) : IRequestHandler<ListByTagsCommand, (IReadOnlyList<LinkModel> Links, int TotalRows)>
+public class ListByTagsCommandHandler(ElfDbContext dbContext) : IRequestHandler<ListByTagsCommand, (List<LinkModel> Links, int TotalRows)>
 {
-    public async Task<(IReadOnlyList<LinkModel> Links, int TotalRows)> Handle(ListByTagsCommand request, CancellationToken ct)
+    public async Task<(List<LinkModel> Links, int TotalRows)> Handle(ListByTagsCommand request, CancellationToken ct)
     {
         var query = from l in dbContext.Link.Include(l => l.Tags)
                     where l.Tags.Any(t => request.Payload.TagIds.Contains(t.Id))

diff --git a/src/API/Features/ListLinkQuery.cs b/src/API/Features/ListLinkQuery.cs
@@ -4,11 +4,11 @@
 namespace Elf.Api.Features;
 
 public record ListLinkQuery(int Offset, int Take, string NoteKeyword = null) :
-    IRequest<(IReadOnlyList<LinkModel> Links, int TotalRows)>;
+    IRequest<(List<LinkModel> Links, int TotalRows)>;
 
-public class ListLinkQueryHandler(ElfDbContext dbContext) : IRequestHandler<ListLinkQuery, (IReadOnlyList<LinkModel> Links, int TotalRows)>
+public class ListLinkQueryHandler(ElfDbContext dbContext) : IRequestHandler<ListLinkQuery, (List<LinkModel> Links, int TotalRows)>
 {
-    public async Task<(IReadOnlyList<LinkModel> Links, int TotalRows)> Handle(ListLinkQuery request, CancellationToken ct)
+    public async Task<(List<LinkModel> Links, int TotalRows)> Handle(ListLinkQuery request, CancellationToken ct)
     {
         var query = from l in dbContext.Link.Include(l => l.LinkTrackings)
                     select l;

diff --git a/src/API/Models/PagedLinkResult.cs b/src/API/Models/PagedLinkResult.cs
@@ -4,5 +4,5 @@ namespace Elf.Api.Models;
 
 public class PagedLinkResult : PagedResult
 {
-    public IReadOnlyList<LinkModel> Links { get; set; }
+    public List<LinkModel> Links { get; set; }
 }
diff --git a/src/Admin/Models/LinkModels.cs b/src/Admin/Models/LinkModels.cs
@@ -1,5 +1,4 @@
 using Elf.Shared;
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace ElfAdmin.Models;

diff --git a/src/Elf.Shared/RequestTrack.cs b/src/Elf.Shared/RequestTrack.cs
@@ -25,5 +25,5 @@ public class RequestTrack
 
 public class PagedRequestTrack : PagedResult
 {
-    public IReadOnlyList<RequestTrack> RequestTracks { get; set; }
+    public List<RequestTrack> RequestTracks { get; set; }
 }