mtfarkas/ConnectionsAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove caching; add previous/next puzzle dates to puzzles

Browse Source
This commit is contained in:
Máté Farkas
2024-06-29 17:08:34 +02:00
parent e260012e20
commit e54f501f9a
8 changed files with 143 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Features/Puzzle/Get/GetPuzzleEndpoint.cs
View File

@@ -1,8 +1,7 @@
using ConnectionsAPI.Database;
using ConnectionsAPI.Database.Repository;
using ConnectionsAPI.Models;
using FluentValidation;
using LazyCache;
using Microsoft.EntityFrameworkCore;
using System.Text.RegularExpressions;
namespace ConnectionsAPI.Features.Puzzle.Get
@@ -22,15 +21,16 @@ namespace ConnectionsAPI.Features.Puzzle.Get
}
}
public class GetPuzzleEndpoint(ConnectionsContext db, ILogger<GetPuzzleEndpoint> logger, IAppCache cache) : Endpoint<GetPuzzleEndpointRequest, PuzzleDTO>
public class GetPuzzleEndpoint(PuzzleRepository puzzleRepo, ILogger<GetPuzzleEndpoint> logger, IAppCache cache) : Endpoint<GetPuzzleEndpointRequest, PuzzleDTO>
{
private readonly ConnectionsContext _db = db;
private readonly PuzzleRepository _puzzleRepo = puzzleRepo;
private readonly ILogger<GetPuzzleEndpoint> _logger = logger;
private readonly IAppCache _cache = cache;
public override void Configure()
{
Get("/{PuzzleDate}.json");
Get("/{PuzzleDate}.json",
"/puzzle/{PuzzleDate}");
AllowAnonymous();
DontThrowIfValidationFails();
}
@@ -45,39 +45,23 @@ namespace ConnectionsAPI.Features.Puzzle.Get
return;
}
// get response from cache
var response = await _cache.GetOrAddAsync($"Puzzle:{req.PuzzleDate}",
() => { return GetResponseForCache(req.PuzzleDate); },
DateTimeOffset.UtcNow.AddMinutes(5));
bool hideSolutions = Query<bool>("hideSolutions", isRequired: false);
// query for the puzzle
var puzzle = await _puzzleRepo.GetPuzzleByDateAsync(req.PuzzleDate, includeSolutions: !hideSolutions);
// if not found, done here
if (response == null)
if (puzzle == null)
{
await SendNotFoundAsync(ct);
return;
}
// get response from cache
var response = PuzzleDTO.FromEntity(puzzle);
// done
await SendAsync(response, cancellation: ct);
}
private async Task<PuzzleDTO?> GetResponseForCache(string printDate)
{
// query for the puzzle
var puzzle = await _db.Puzzles
.Include(x => x.Categories)
.ThenInclude(x => x.PuzzleCards)
.AsNoTracking()
.FirstOrDefaultAsync(x => x.PrintDate == printDate);
// if not found, we're done here
if (puzzle == null)
{
return null;
}
// if found, map
return PuzzleDTO.FromEntity(puzzle);
}
}
}

35
Features/Puzzle/List/ListPuzzlesEndpoint.cs
View File

@@ -1,43 +1,34 @@
using ConnectionsAPI.Database;
using ConnectionsAPI.Database.Repository;
using ConnectionsAPI.Models;
using LazyCache;
using Microsoft.EntityFrameworkCore;
namespace ConnectionsAPI.Features.Puzzle.List
{
public class ListPuzzlesEndpoint(ConnectionsContext db, IAppCache cache) : EndpointWithoutRequest<ICollection<PuzzleDTO>>
public class ListPuzzlesEndpoint(PuzzleRepository puzzleRepo, IAppCache cache) : EndpointWithoutRequest<ICollection<PuzzleDTO>>
{
private readonly ConnectionsContext _db = db;
private readonly PuzzleRepository _puzzleRepo = puzzleRepo;
private readonly IAppCache _cache = cache;
public override void Configure()
{
Get("/all.json");
Get("/all.json",
"/puzzle/all");
AllowAnonymous();
}
public override async Task HandleAsync(CancellationToken ct)
{
// get response from cache
var response = await _cache.GetOrAddAsync("Puzzle:All",
GetResponseForCache,
DateTimeOffset.UtcNow.AddMinutes(5));
bool hideSolutions = Query<bool>("hideSolutions", isRequired: false);
// query all, ordered by print date
var puzzles = await _puzzleRepo.GetAllPuzzlesAsync(includeSolutions: !hideSolutions);
// map to response object
var response = puzzles.Select(PuzzleDTO.FromEntity).ToList();
// done
await SendAsync(response, cancellation: ct);
}
private async Task<ICollection<PuzzleDTO>> GetResponseForCache()
{
// query all, ordered by print date
var puzzles = await _db.Puzzles
.Include(x => x.Categories)
.ThenInclude(x => x.PuzzleCards)
.AsNoTracking()
.OrderBy(x => x.PrintDate)
.ToListAsync();
// map to dto
return puzzles.Select(PuzzleDTO.FromEntity).ToList();
}
}
}