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>
83 lines
3.6 KiB
C#
83 lines
3.6 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain.Filler;
|
|
using ErsatzTV.Core.Errors;
|
|
using ErsatzTV.Infrastructure.Data;
|
|
using ErsatzTV.Infrastructure.Extensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace ErsatzTV.Application.Filler;
|
|
|
|
public class UpdateFillerPresetHandler(IDbContextFactory<TvContext> dbContextFactory)
|
|
: IRequestHandler<UpdateFillerPreset, Either<BaseError, Unit>>
|
|
{
|
|
public async Task<Either<BaseError, Unit>> Handle(UpdateFillerPreset request, CancellationToken cancellationToken)
|
|
{
|
|
await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
|
|
Option<FillerPreset> maybeFillerPreset = await FillerPresetMustExist(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 maybeFillerPreset.Match(
|
|
Some: async fillerPreset =>
|
|
{
|
|
Validation<BaseError, string> validation = await ValidateName(dbContext, request);
|
|
return await validation.Apply((string _) =>
|
|
ApplyUpdateRequest(dbContext, fillerPreset, request, cancellationToken));
|
|
},
|
|
None: () => Task.FromResult<Either<BaseError, Unit>>(
|
|
new NotFoundError($"FillerPreset {request.Id} does not exist.")));
|
|
}
|
|
|
|
private static async Task<Unit> ApplyUpdateRequest(
|
|
TvContext dbContext,
|
|
FillerPreset existing,
|
|
UpdateFillerPreset request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
existing.Name = request.Name;
|
|
existing.FillerKind = request.FillerKind;
|
|
existing.FillerMode = request.FillerMode;
|
|
existing.Duration = request.Duration;
|
|
existing.Count = request.Count;
|
|
existing.PadToNearestMinute = request.PadToNearestMinute;
|
|
existing.AllowWatermarks = request.AllowWatermarks;
|
|
existing.CollectionType = request.CollectionType;
|
|
existing.CollectionId = request.CollectionId;
|
|
existing.MediaItemId = request.MediaItemId;
|
|
existing.MultiCollectionId = request.MultiCollectionId;
|
|
existing.SmartCollectionId = request.SmartCollectionId;
|
|
existing.PlaylistId = request.PlaylistId;
|
|
existing.Expression = request.FillerKind is FillerKind.MidRoll ? request.Expression : null;
|
|
existing.UseChaptersAsMediaItems =
|
|
request.FillerKind is not FillerKind.Fallback && request.UseChaptersAsMediaItems;
|
|
|
|
await dbContext.SaveChangesAsync(cancellationToken);
|
|
|
|
return Unit.Default;
|
|
}
|
|
|
|
private static Task<Option<FillerPreset>> FillerPresetMustExist(
|
|
TvContext dbContext,
|
|
UpdateFillerPreset request,
|
|
CancellationToken cancellationToken) =>
|
|
dbContext.FillerPresets
|
|
.SelectOneAsync(ps => ps.Id, ps => ps.Id == request.Id, cancellationToken);
|
|
|
|
private static async Task<Validation<BaseError, string>> ValidateName(
|
|
TvContext dbContext,
|
|
UpdateFillerPreset request)
|
|
{
|
|
Validation<BaseError, string> result1 = request.NotEmpty(fp => fp.Name)
|
|
.Bind(_ => request.NotLongerThan(50)(fp => fp.Name));
|
|
|
|
bool duplicateName = await dbContext.FillerPresets
|
|
.AnyAsync(c => c.Id != request.Id && c.Name == request.Name);
|
|
|
|
Validation<BaseError, Unit> result2 = duplicateName
|
|
? Fail<BaseError, Unit>("Filler preset name must be unique")
|
|
: Success<BaseError, Unit>(Unit.Default);
|
|
|
|
return (result1, result2).Apply((_, _) => request.Name);
|
|
}
|
|
}
|