Build ErsatzTV Image / Docs update reminder (pull_request) Successful in 7s
Build ErsatzTV Image / Build & test (.NET) (pull_request) Successful in 5m24s
Build ErsatzTV Image / EF migration integrity (SQLite + MySql) (pull_request) Successful in 4m25s
Build ErsatzTV Image / Build & push image (amd64) (pull_request) Has been skipped
Adds the shared optimistic-concurrency contract so a stale second tab can no longer silently overwrite a fresher edit. PR1 lands the infra + the Block reference aggregate; PRs 2–4 fan the same recipe across the other 8 roots (design: #253#issuecomment-8472). Contract - `IVersionedAggregate` (`int Version`) on all 9 replace-all roots (ProgramSchedule, Block, Template, DecoTemplate, Playlist, Collection, Playout, MultiCollection, RerunCollection), EF-mapped `.IsConcurrencyToken()`; one dual-provider migration `AddAggregateVersions` (nullable:false, default 0). - Strong `ETag` of `Version` on the aggregate GET; `If-Match` on the PUT; mismatch → 412 (distinct from the §3a 409 build-lock guard). Successful PUT returns the new ETag. - `PreconditionFailedError : BaseError` → 412 in `ApiResults.ToErrorResult`; `ConcurrencyHeaders.ParseIfMatch/SetETag`; malformed If-Match → 400; `*`/absent = Phase-1 force-write. Block reference wiring - Handler: standalone `Either` via `CheckVersion` AFTER validation (never through `Apply`, which Join()-flattens the subtype to 422), unconditional `Version++`, `SaveChangesWithConcurrencyGuard` backstop (DbUpdateConcurrencyException → 412). - `BlockViewModel.Version` (header-only, not echoed in the body); controller sets the ETag on GET items and on the successful PUT. - SPA: `client.requestWithMeta` seam; `blocks.getBlockItemsWithMeta` + `replaceBlock` If-Match/ETag round-trip; `BlockEditor` holds the ETag, sends If-Match, and on 412 opens a blocking "changed elsewhere — reload" dialog. Tests - Handler contract tests: stale-If-Match → 412 (no mutation), matching/absent → success + bump, no-op save still bumps, and a two-context racing save → 412; proven non-vacuous (drop `.IsConcurrencyToken()` → the race test fails). - Controller tests: malformed If-Match → 400, If-Match threaded to the command, ETag on GET/PUT, 412 passthrough. SPA: requestWithMeta ETag, replaceBlock If-Match, 412 dialog. Docs: api-conventions §7a, spa-conventions §4a, domain-model glossary, decisions log. Refs #253 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
307 lines
13 KiB
C#
307 lines
13 KiB
C#
using System.ComponentModel.DataAnnotations;
|
|
using ErsatzTV.Application.Scheduling;
|
|
using ErsatzTV.Controllers.Api.Requests;
|
|
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Api.Scheduling;
|
|
using ErsatzTV.Extensions;
|
|
using MediatR;
|
|
using Microsoft.AspNetCore.Http;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
namespace ErsatzTV.Controllers.Api;
|
|
|
|
[ApiController]
|
|
public class BlockController(IMediator mediator) : ControllerBase
|
|
{
|
|
[HttpGet("/api/blocks/groups", Name = "GetBlockGroups")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Get all block groups")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(List<BlockGroupResponseModel>), StatusCodes.Status200OK)]
|
|
public async Task<List<BlockGroupResponseModel>> GetGroups(CancellationToken cancellationToken)
|
|
{
|
|
List<BlockGroupViewModel> groups = await mediator.Send(new GetAllBlockGroups(), cancellationToken);
|
|
return groups.Map(ProjectToResponseModel).ToList();
|
|
}
|
|
|
|
[HttpPost("/api/blocks/groups")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Create a block group")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(BlockGroupResponseModel), StatusCodes.Status201Created)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status422UnprocessableEntity)]
|
|
public async Task<IActionResult> CreateGroup(
|
|
[Required] [FromBody] CreateBlockGroupRequest request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Either<BaseError, BlockGroupViewModel> result =
|
|
await mediator.Send(request.ToCommand(), cancellationToken);
|
|
return result.ToCreatedResult(
|
|
vm => $"/api/blocks/groups/{vm.Id}",
|
|
vm => ProjectToResponseModel(vm));
|
|
}
|
|
|
|
[HttpDelete("/api/blocks/groups/{id:int}")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Delete a block group")]
|
|
[EndpointDescription(
|
|
"Deletes the block group. The database cascade removes every block (and its items) in the group.")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
public async Task<IActionResult> DeleteGroup(int id, CancellationToken cancellationToken)
|
|
{
|
|
List<BlockGroupViewModel> groups = await mediator.Send(new GetAllBlockGroups(), cancellationToken);
|
|
if (groups.All(g => g.Id != id))
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
Option<BaseError> result = await mediator.Send(new DeleteBlockGroup(id), cancellationToken);
|
|
return result.Match<IActionResult>(
|
|
Some: error => error.ToErrorResult(),
|
|
None: () => new NoContentResult());
|
|
}
|
|
|
|
[HttpGet("/api/blocks")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Get all blocks")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(List<BlockResponseModel>), StatusCodes.Status200OK)]
|
|
public async Task<List<BlockResponseModel>> GetAll(CancellationToken cancellationToken)
|
|
{
|
|
List<BlockViewModel> blocks = await mediator.Send(new GetAllBlocks(), cancellationToken);
|
|
return blocks.Map(ProjectToResponseModel).ToList();
|
|
}
|
|
|
|
[HttpGet("/api/blocks/{id:int}", Name = "GetBlockById")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Get a block by id")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(BlockResponseModel), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
public async Task<IActionResult> GetById(int id, CancellationToken cancellationToken)
|
|
{
|
|
Option<BlockViewModel> result = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
return result.Map(ProjectToResponseModel).ToGetResult();
|
|
}
|
|
|
|
[HttpPost("/api/blocks")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Create a block")]
|
|
[EndpointDescription("Creates an empty block in the given block group. The block defaults to 30 minutes.")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(BlockResponseModel), StatusCodes.Status201Created)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status422UnprocessableEntity)]
|
|
public async Task<IActionResult> Create(
|
|
[Required] [FromBody] CreateBlockRequest request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Either<BaseError, BlockViewModel> result = await mediator.Send(request.ToCommand(), cancellationToken);
|
|
return result.ToCreatedResult(
|
|
vm => $"/api/blocks/{vm.Id}",
|
|
vm => ProjectToResponseModel(vm));
|
|
}
|
|
|
|
[HttpDelete("/api/blocks/{id:int}")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Delete a block")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(StatusCodes.Status204NoContent)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
public async Task<IActionResult> Delete(int id, CancellationToken cancellationToken)
|
|
{
|
|
Option<BlockViewModel> existing = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
if (existing.IsNone)
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
Option<BaseError> result = await mediator.Send(new DeleteBlock(id), cancellationToken);
|
|
return result.Match<IActionResult>(
|
|
Some: error => error.ToErrorResult(),
|
|
None: () => new NoContentResult());
|
|
}
|
|
|
|
[HttpGet("/api/blocks/{id:int}/items")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Get block items")]
|
|
[EndpointDescription(
|
|
"Returns the block's items and a strong ETag of the block's version. Pass that ETag back as " +
|
|
"If-Match on the replace (PUT) to detect a concurrent edit (issue #253).")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(List<BlockItemResponseModel>), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
public async Task<IActionResult> GetItems(int id, CancellationToken cancellationToken)
|
|
{
|
|
Option<BlockViewModel> block = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
if (block.IsNone)
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
// The items GET returns children, not the root, so read the block's version for the ETag.
|
|
ConcurrencyHeaders.SetETag(Response, block.Map(b => b.Version).IfNone(0));
|
|
|
|
List<BlockItemViewModel> items = await mediator.Send(new GetBlockItems(id), cancellationToken);
|
|
return new OkObjectResult(items.OrderBy(i => i.Index).Map(ProjectToResponseModel).ToList());
|
|
}
|
|
|
|
[HttpPut("/api/blocks/{id:int}")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Replace a block and its items")]
|
|
[EndpointDescription(
|
|
"Replaces the block's name/minutes/stop-scheduling and its full item list. Item indexes are assigned " +
|
|
"from the array order. Minutes must be greater than zero, divisible by 5, and at most 24 hours. " +
|
|
"Send the ETag from the items GET as If-Match to reject a stale overwrite with 412 (issue #253); " +
|
|
"a successful response carries the new ETag.")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(BlockWithItemsResponseModel), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status412PreconditionFailed)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status422UnprocessableEntity)]
|
|
public async Task<IActionResult> Replace(
|
|
int id,
|
|
[Required] [FromBody] ReplaceBlockRequest request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
IfMatchCondition ifMatch = ConcurrencyHeaders.ParseIfMatch(Request);
|
|
if (ifMatch.Kind is IfMatchKind.Malformed)
|
|
{
|
|
return new BadRequestObjectResult(
|
|
new ProblemDetails
|
|
{
|
|
Status = StatusCodes.Status400BadRequest,
|
|
Title = "Invalid If-Match header",
|
|
Detail = "If-Match must be a strong ETag of the resource version (e.g. \"3\") or \"*\"."
|
|
});
|
|
}
|
|
|
|
Option<BlockViewModel> maybeBlock = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
if (maybeBlock.IsNone)
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
int groupId = maybeBlock.Map(b => b.GroupId).IfNone(0);
|
|
|
|
Either<BaseError, Unit> result =
|
|
await mediator.Send(request.ToCommand(groupId, id, ifMatch.ExpectedVersion), cancellationToken);
|
|
|
|
return await result.Match(
|
|
Left: error => Task.FromResult(error.ToErrorResult()),
|
|
Right: async _ =>
|
|
{
|
|
Option<BlockViewModel> refreshed = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
List<BlockItemViewModel> items = await mediator.Send(new GetBlockItems(id), cancellationToken);
|
|
return refreshed.Match(
|
|
Some: vm =>
|
|
{
|
|
// Return the new ETag so a same-tab second save doesn't 412 against its own write.
|
|
ConcurrencyHeaders.SetETag(Response, vm.Version);
|
|
return (IActionResult)new OkObjectResult(ProjectToWithItemsResponseModel(vm, items));
|
|
},
|
|
None: () => ApiResults.NotFoundProblem());
|
|
});
|
|
}
|
|
|
|
[HttpPost("/api/blocks/{id:int}/preview")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Preview a block playout")]
|
|
[EndpointDescription(
|
|
"Builds a preview playout from the supplied block definition without persisting any changes to the " +
|
|
"block, its items, or any playout. Returns the resulting start/finish/title/duration list.")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(List<BlockPreviewItemResponseModel>), StatusCodes.Status200OK)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
public async Task<IActionResult> Preview(
|
|
int id,
|
|
[Required] [FromBody] ReplaceBlockRequest request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Option<BlockViewModel> maybeBlock = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
if (maybeBlock.IsNone)
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
int groupId = maybeBlock.Map(b => b.GroupId).IfNone(0);
|
|
|
|
List<PlayoutItemPreviewViewModel> preview = await mediator.Send(
|
|
new PreviewBlockPlayout(request.ToCommand(groupId, id)),
|
|
cancellationToken);
|
|
|
|
return new OkObjectResult(preview.Map(ProjectToResponseModel).ToList());
|
|
}
|
|
|
|
[HttpPost("/api/blocks/{id:int}/copy")]
|
|
[Tags("Blocks")]
|
|
[EndpointSummary("Copy a block")]
|
|
[EndpointDescription("Copies the block and its items into another (or the same) block group under a new name.")]
|
|
[EndpointGroupName("general")]
|
|
[ProducesResponseType(typeof(BlockResponseModel), StatusCodes.Status201Created)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
|
|
[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status422UnprocessableEntity)]
|
|
public async Task<IActionResult> Copy(
|
|
int id,
|
|
[Required] [FromBody] CopyBlockRequest request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
Option<BlockViewModel> existing = await mediator.Send(new GetBlockById(id), cancellationToken);
|
|
if (existing.IsNone)
|
|
{
|
|
return ApiResults.NotFoundProblem();
|
|
}
|
|
|
|
Either<BaseError, BlockViewModel> result = await mediator.Send(request.ToCommand(id), cancellationToken);
|
|
return result.ToCreatedResult(
|
|
vm => $"/api/blocks/{vm.Id}",
|
|
vm => ProjectToResponseModel(vm));
|
|
}
|
|
|
|
private static BlockGroupResponseModel ProjectToResponseModel(BlockGroupViewModel vm) =>
|
|
new(vm.Id, vm.Name);
|
|
|
|
private static BlockResponseModel ProjectToResponseModel(BlockViewModel vm) =>
|
|
new(vm.Id, vm.GroupId, vm.GroupName, vm.Name, vm.Minutes, vm.StopScheduling);
|
|
|
|
private static BlockWithItemsResponseModel ProjectToWithItemsResponseModel(
|
|
BlockViewModel vm,
|
|
List<BlockItemViewModel> items) =>
|
|
new(
|
|
vm.Id,
|
|
vm.GroupId,
|
|
vm.GroupName,
|
|
vm.Name,
|
|
vm.Minutes,
|
|
vm.StopScheduling,
|
|
items.OrderBy(i => i.Index).Map(ProjectToResponseModel).ToList());
|
|
|
|
private static BlockItemResponseModel ProjectToResponseModel(BlockItemViewModel vm) =>
|
|
new(
|
|
vm.Id,
|
|
vm.Index,
|
|
vm.CollectionType,
|
|
vm.Collection?.Id,
|
|
vm.Collection?.Name,
|
|
vm.MultiCollection?.Id,
|
|
vm.MultiCollection?.Name,
|
|
vm.SmartCollection?.Id,
|
|
vm.SmartCollection?.Name,
|
|
vm.MediaItem?.MediaItemId,
|
|
vm.MediaItem?.Name,
|
|
vm.SearchTitle,
|
|
vm.SearchQuery,
|
|
vm.PlaybackOrder,
|
|
vm.IncludeInProgramGuide,
|
|
vm.DisableWatermarks,
|
|
vm.Watermarks.Map(w => w.Id).ToList(),
|
|
vm.GraphicsElements.Map(g => g.Id).ToList());
|
|
|
|
private static BlockPreviewItemResponseModel ProjectToResponseModel(PlayoutItemPreviewViewModel vm) =>
|
|
new(vm.Title, vm.Start, vm.Finish, vm.Duration);
|
|
}
|