timothyandClaude Fable 5
bef33c2950
Live E2E found PUT/DELETE on a missing filler preset or watermark returned 422 instead of 404. Root cause: the must-exist checks fed a NotFoundError through LanguageExt Validation, whose aggregation to Either flattens the BaseError subtype, so ApiResults.ToErrorResult never saw a NotFoundError. The precedent handlers (DeleteProgramSchedule, DeleteFFmpegProfile, UpdateProgramSchedule) avoid this by resolving must-exist as an Option and returning the NotFoundError directly as an Either Left via Option.Match — restructured the four filler/watermark Update/Delete handlers to that pattern (remaining name validation still 422s). No Blazor behavior change (it only reads error.Value). Verified live: PUT/DELETE missing → 404, GET missing → 404, empty-name POST → 422; happy-path CRUD unchanged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
54 lines
2.2 KiB
C#
54 lines
2.2 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Errors;
|
|
using ErsatzTV.Core.Interfaces.Search;
|
|
using ErsatzTV.Infrastructure.Data;
|
|
using ErsatzTV.Infrastructure.Extensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace ErsatzTV.Application.Watermarks;
|
|
|
|
public class DeleteWatermarkHandler : IRequestHandler<DeleteWatermark, Either<BaseError, Unit>>
|
|
{
|
|
private readonly IDbContextFactory<TvContext> _dbContextFactory;
|
|
private readonly ISearchTargets _searchTargets;
|
|
|
|
public DeleteWatermarkHandler(IDbContextFactory<TvContext> dbContextFactory, ISearchTargets searchTargets)
|
|
{
|
|
_dbContextFactory = dbContextFactory;
|
|
_searchTargets = searchTargets;
|
|
}
|
|
|
|
public async Task<Either<BaseError, Unit>> Handle(
|
|
DeleteWatermark request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
|
|
Option<ChannelWatermark> maybeWatermark = await WatermarkMustExist(dbContext, request, cancellationToken);
|
|
|
|
// must-exist maps to a NotFoundError Either directly (not via Validation, which
|
|
// aggregates errors and loses the subtype the API layer maps to 404)
|
|
return await maybeWatermark.Match(
|
|
Some: watermark => DoDeletion(dbContext, watermark).Map(Right<BaseError, Unit>),
|
|
None: () => Task.FromResult<Either<BaseError, Unit>>(
|
|
new NotFoundError($"Watermark {request.WatermarkId} does not exist")));
|
|
}
|
|
|
|
private async Task<Unit> DoDeletion(TvContext dbContext, ChannelWatermark watermark)
|
|
{
|
|
await dbContext.Database.ExecuteSqlAsync(
|
|
$"UPDATE Channel SET WatermarkId = NULL WHERE WatermarkId = {watermark.Id}");
|
|
dbContext.ChannelWatermarks.Remove(watermark);
|
|
await dbContext.SaveChangesAsync();
|
|
_searchTargets.SearchTargetsChanged();
|
|
return Unit.Default;
|
|
}
|
|
|
|
private static Task<Option<ChannelWatermark>> WatermarkMustExist(
|
|
TvContext dbContext,
|
|
DeleteWatermark request,
|
|
CancellationToken cancellationToken) =>
|
|
dbContext.ChannelWatermarks
|
|
.SelectOneAsync(p => p.Id, p => p.Id == request.WatermarkId, cancellationToken);
|
|
}
|