refactor: Refactor Get connections
This commit is contained in:
@@ -1,67 +1,67 @@
|
||||
using ConnectionsAPI.Database.Repository;
|
||||
using ConnectionsAPI.Models;
|
||||
using FluentValidation;
|
||||
using LazyCache;
|
||||
using System.Text.RegularExpressions;
|
||||
// using ConnectionsAPI.Database.Repository;
|
||||
// using ConnectionsAPI.Models;
|
||||
// using FluentValidation;
|
||||
// using LazyCache;
|
||||
// using System.Text.RegularExpressions;
|
||||
|
||||
namespace ConnectionsAPI.Features.Puzzle.Get
|
||||
{
|
||||
public record GetPuzzleEndpointRequest(string PuzzleDate);
|
||||
// namespace ConnectionsAPI.Features.Puzzle.Get
|
||||
// {
|
||||
// public record GetPuzzleEndpointRequest(string PuzzleDate);
|
||||
|
||||
public partial class GetPuzzleEndpointRequestValidator : Validator<GetPuzzleEndpointRequest>
|
||||
{
|
||||
[GeneratedRegex("^\\d{4}-\\d{2}-\\d{2}$", RegexOptions.IgnoreCase)]
|
||||
private static partial Regex PrintDateGeneratedRegex();
|
||||
// public partial class GetPuzzleEndpointRequestValidator : Validator<GetPuzzleEndpointRequest>
|
||||
// {
|
||||
// [GeneratedRegex("^\\d{4}-\\d{2}-\\d{2}$", RegexOptions.IgnoreCase)]
|
||||
// private static partial Regex PrintDateGeneratedRegex();
|
||||
|
||||
public GetPuzzleEndpointRequestValidator()
|
||||
{
|
||||
RuleFor(x => x.PuzzleDate)
|
||||
.NotEmpty().WithMessage("Puzzle date is required")
|
||||
.Must(x => PrintDateGeneratedRegex().IsMatch(x)).WithMessage("Puzzle date must be in the format yyyy-MM-dd");
|
||||
}
|
||||
}
|
||||
// public GetPuzzleEndpointRequestValidator()
|
||||
// {
|
||||
// RuleFor(x => x.PuzzleDate)
|
||||
// .NotEmpty().WithMessage("Puzzle date is required")
|
||||
// .Must(x => PrintDateGeneratedRegex().IsMatch(x)).WithMessage("Puzzle date must be in the format yyyy-MM-dd");
|
||||
// }
|
||||
// }
|
||||
|
||||
public class GetPuzzleEndpoint(PuzzleRepository puzzleRepo, ILogger<GetPuzzleEndpoint> logger, IAppCache cache) : Endpoint<GetPuzzleEndpointRequest, ConnectionsPuzzleDTO>
|
||||
{
|
||||
private readonly PuzzleRepository _puzzleRepo = puzzleRepo;
|
||||
private readonly ILogger<GetPuzzleEndpoint> _logger = logger;
|
||||
private readonly IAppCache _cache = cache;
|
||||
// public class GetPuzzleEndpoint(PuzzleRepository puzzleRepo, ILogger<GetPuzzleEndpoint> logger, IAppCache cache) : Endpoint<GetPuzzleEndpointRequest, ConnectionsPuzzleDTO>
|
||||
// {
|
||||
// private readonly PuzzleRepository _puzzleRepo = puzzleRepo;
|
||||
// private readonly ILogger<GetPuzzleEndpoint> _logger = logger;
|
||||
// private readonly IAppCache _cache = cache;
|
||||
|
||||
public override void Configure()
|
||||
{
|
||||
Get("/{PuzzleDate}.json",
|
||||
"/puzzle/{PuzzleDate}");
|
||||
AllowAnonymous();
|
||||
DontThrowIfValidationFails();
|
||||
}
|
||||
// public override void Configure()
|
||||
// {
|
||||
// Get("/{PuzzleDate}.json",
|
||||
// "/puzzle/{PuzzleDate}");
|
||||
// AllowAnonymous();
|
||||
// DontThrowIfValidationFails();
|
||||
// }
|
||||
|
||||
public override async Task HandleAsync(GetPuzzleEndpointRequest req, CancellationToken ct)
|
||||
{
|
||||
// default to 404 if validation fails
|
||||
if (ValidationFailed)
|
||||
{
|
||||
_logger.LogError("Validation error. {path} {pathBase}", HttpContext.Request.Path, HttpContext.Request.PathBase);
|
||||
await SendNotFoundAsync(ct);
|
||||
return;
|
||||
}
|
||||
// public override async Task HandleAsync(GetPuzzleEndpointRequest req, CancellationToken ct)
|
||||
// {
|
||||
// // default to 404 if validation fails
|
||||
// if (ValidationFailed)
|
||||
// {
|
||||
// _logger.LogError("Validation error. {path} {pathBase}", HttpContext.Request.Path, HttpContext.Request.PathBase);
|
||||
// await SendNotFoundAsync(ct);
|
||||
// return;
|
||||
// }
|
||||
|
||||
bool hideSolutions = Query<bool>("hideSolutions", isRequired: false);
|
||||
// bool hideSolutions = Query<bool>("hideSolutions", isRequired: false);
|
||||
|
||||
// query for the puzzle
|
||||
var puzzle = await _puzzleRepo.GetPuzzleByDateAsync(req.PuzzleDate, includeSolutions: !hideSolutions);
|
||||
// // query for the puzzle
|
||||
// var puzzle = await _puzzleRepo.GetPuzzleByDateAsync(req.PuzzleDate, includeSolutions: !hideSolutions);
|
||||
|
||||
// if not found, done here
|
||||
if (puzzle == null)
|
||||
{
|
||||
await SendNotFoundAsync(ct);
|
||||
return;
|
||||
}
|
||||
// // if not found, done here
|
||||
// if (puzzle == null)
|
||||
// {
|
||||
// await SendNotFoundAsync(ct);
|
||||
// return;
|
||||
// }
|
||||
|
||||
// get response from cache
|
||||
var response = ConnectionsPuzzleDTO.FromEntity(puzzle);
|
||||
// // get response from cache
|
||||
// var response = ConnectionsPuzzleDTO.FromEntity(puzzle);
|
||||
|
||||
// done
|
||||
await SendAsync(response, cancellation: ct);
|
||||
}
|
||||
}
|
||||
}
|
||||
// // done
|
||||
// await SendAsync(response, cancellation: ct);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user