Enhance channel and settings functionalities: introduce viewer settings in ChannelEndpoints, update SiteSettings to include channel number toggling, and refactor related data structures. Implement new endpoints for validating templates and diffing scheduling changes, improving overall user experience and configuration management.

2026-07-26 14:50:32 +03:00
parent 8494eb5e6a
commit f699576582
54 changed files with 5857 additions and 1631 deletions
@@ -9,6 +9,8 @@ using TeleWave.Application.Broadcast.UpdateChannelSettings;
 using TeleWave.Application.Broadcast.UpdateChannelTime;
 using TeleWave.Domain.Broadcast;
 using TeleWave.Infrastructure.Identity;
+using TeleWave.Application.Broadcast.UpdateViewerSettings;
+using TeleWave.Application.Programming.Planning.Trace;

 namespace TeleWave.Api.Endpoints;

@@ -92,10 +94,47 @@ public static partial class ChannelEndpoints
        admin
            .MapGet("/{id:guid}/schedule", GetSchedule)
            .Produces<IReadOnlyList<ScheduleEntryDto>>();
+        admin
+            .MapPut("/{id:guid}/viewer", UpdateViewerSettings)
+            .Produces(StatusCodes.Status204NoContent);
+
+        // «Почему это здесь»: цепочка происхождения записи, записанная в момент генерации.
+        admin.MapGet("/entries/{entryId:guid}/trace", GetEntryTrace).Produces<EntryTraceDto>();

        return app;
    }

+    private static async Task<IResult> UpdateViewerSettings(
+        Guid id,
+        UpdateViewerSettingsBody body,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(
+            new UpdateViewerSettingsCommand(
+                id,
+                body.LogoImageId,
+                body.LogoCorner,
+                body.LogoOpacity,
+                body.ShowClock,
+                body.AnalogFilterStrength
+            ),
+            cancellationToken
+        );
+        return result.ToHttpResult();
+    }
+
+    private static async Task<IResult> GetEntryTrace(
+        Guid entryId,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(new GetEntryTraceQuery(entryId), cancellationToken);
+        return result.ToHttpResult();
+    }
+
    private static async Task<IResult> CreateChannel(
        CreateChannelCommand command,
        ISender sender,
@@ -203,3 +242,12 @@ public sealed record UpdateChannelSettingsBody(
    BumperSettingsInput Bumper,
    Guid? FillerAssetId
 );
+
+/// <summary>Оверлеи и аналоговый фильтр — как канал выглядит у зрителя (см. 6.8).</summary>
+public sealed record UpdateViewerSettingsBody(
+    Guid? LogoImageId,
+    LogoCorner LogoCorner,
+    double LogoOpacity,
+    bool ShowClock,
+    double AnalogFilterStrength
+);
@@ -1,53 +1,55 @@
-using LiteCqrs;
-using TeleWave.Api.Common;
-using TeleWave.Application.Settings;
-using TeleWave.Application.Settings.GetSiteSettings;
-using TeleWave.Application.Settings.UpdateSiteSettings;
-using TeleWave.Infrastructure.Identity;
-
-namespace TeleWave.Api.Endpoints;
-
-public static class SettingsEndpoints
-{
-    public static IEndpointRouteBuilder MapSettingsEndpoints(this IEndpointRouteBuilder app)
-    {
-        var admin = app.MapGroup("/api/admin/settings")
-            .WithTags("Admin.Settings")
-            .RequireAuthorization(policy => policy.RequireRole(RoleNames.Admin));
-
-        admin.MapGet("", GetSettings).Produces<SiteSettingsDto>();
-        admin.MapPut("", UpdateSettings).Produces(StatusCodes.Status204NoContent);
-
-        return app;
-    }
-
-    private static async Task<IResult> GetSettings(
-        ISender sender,
-        CancellationToken cancellationToken
-    )
-    {
-        var settings = await sender.Send(new GetSiteSettingsQuery(), cancellationToken);
-        return Results.Ok(settings);
-    }
-
-    private static async Task<IResult> UpdateSettings(
-        UpdateSiteSettingsBody body,
-        ISender sender,
-        CancellationToken cancellationToken
-    )
-    {
-        var result = await sender.Send(
-            new UpdateSiteSettingsCommand(
-                body.RegistrationEnabled,
-                body.PreferredAudioLanguages ?? ""
-            ),
-            cancellationToken
-        );
-        return result.ToHttpResult();
-    }
-}
-
-public sealed record UpdateSiteSettingsBody(
-    bool RegistrationEnabled,
-    string? PreferredAudioLanguages
-);
+using LiteCqrs;
+using TeleWave.Api.Common;
+using TeleWave.Application.Settings;
+using TeleWave.Application.Settings.GetSiteSettings;
+using TeleWave.Application.Settings.UpdateSiteSettings;
+using TeleWave.Infrastructure.Identity;
+
+namespace TeleWave.Api.Endpoints;
+
+public static class SettingsEndpoints
+{
+    public static IEndpointRouteBuilder MapSettingsEndpoints(this IEndpointRouteBuilder app)
+    {
+        var admin = app.MapGroup("/api/admin/settings")
+            .WithTags("Admin.Settings")
+            .RequireAuthorization(policy => policy.RequireRole(RoleNames.Admin));
+
+        admin.MapGet("", GetSettings).Produces<SiteSettingsDto>();
+        admin.MapPut("", UpdateSettings).Produces(StatusCodes.Status204NoContent);
+
+        return app;
+    }
+
+    private static async Task<IResult> GetSettings(
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var settings = await sender.Send(new GetSiteSettingsQuery(), cancellationToken);
+        return Results.Ok(settings);
+    }
+
+    private static async Task<IResult> UpdateSettings(
+        UpdateSiteSettingsBody body,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(
+            new UpdateSiteSettingsCommand(
+                body.RegistrationEnabled,
+                body.PreferredAudioLanguages ?? "",
+                body.ChannelNumbersEnabled
+            ),
+            cancellationToken
+        );
+        return result.ToHttpResult();
+    }
+}
+
+public sealed record UpdateSiteSettingsBody(
+    bool RegistrationEnabled,
+    string? PreferredAudioLanguages,
+    bool ChannelNumbersEnabled
+);
@@ -1,184 +1,197 @@
-using System.Globalization;
-using System.Text;
-using System.Text.RegularExpressions;
-using LiteCqrs;
-using Microsoft.Extensions.Hosting;
-using TeleWave.Api.Common;
-using TeleWave.Application.Common.Interfaces;
-using TeleWave.Application.Streaming;
-using TeleWave.Application.Streaming.GetLivePlaylist;
-using TeleWave.Application.Streaming.GetPublicEpg;
-using TeleWave.Application.Streaming.ListPublicChannels;
-using TeleWave.Infrastructure.Media;
-using TeleWave.Infrastructure.Streaming;
-
-namespace TeleWave.Api.Endpoints;
-
-public static class StreamingEndpoints
-{
-    private const string StreamCookieName = "tw_stream";
-    private static readonly Regex SegmentFileName = new(@"^seg\d{1,6}\.ts$", RegexOptions.Compiled);
-
-    public static IEndpointRouteBuilder MapStreamingEndpoints(this IEndpointRouteBuilder app)
-    {
-        // Публичный API канала (Bearer): список, EPG, выдача stream-cookie.
-        var channels = app.MapGroup("/api/channels").WithTags("Channels").RequireAuthorization();
-        channels.MapGet("", ListChannels).Produces<IReadOnlyList<PublicChannelDto>>();
-        channels.MapPost("/{slug}/watch", Watch).Produces(StatusCodes.Status204NoContent);
-        channels.MapGet("/{slug}/epg", Epg);
-
-        // Раздача эфира (cookie tw_stream): плейлист и сегменты — их грузит <video>/hls.js.
-        app.MapGet("/api/channels/{slug}/live.m3u8", LivePlaylist).WithTags("Streaming");
-        app.MapGet("/api/stream/{assetId:guid}/{file}", Segment).WithTags("Streaming");
-
-        return app;
-    }
-
-    private static async Task<IResult> ListChannels(
-        ISender sender,
-        CancellationToken cancellationToken
-    )
-    {
-        var result = await sender.Send(new ListPublicChannelsQuery(), cancellationToken);
-        return Results.Ok(result);
-    }
-
-    private static IResult Watch(
-        string slug,
-        ICurrentUser currentUser,
-        StreamTokenService tokens,
-        HttpRequest request,
-        HttpResponse response,
-        IHostEnvironment env
-    )
-    {
-        if (currentUser.UserId is not { } userId)
-            return Results.Unauthorized();
-
-        var (token, expiresAt) = tokens.Issue(userId);
-        response.Cookies.Append(
-            StreamCookieName,
-            token,
-            new CookieOptions
-            {
-                HttpOnly = true,
-                // Вне Development — всегда Secure (прод за внешним TLS-прокси; request.IsHttps ненадёжен
-                // при неполной настройке ForwardedHeaders). См. UseSecureCookie в AuthEndpoints.
-                Secure = !env.IsDevelopment() || request.IsHttps,
-                SameSite = SameSiteMode.Strict,
-                Path = "/api",
-                Expires = expiresAt,
-            }
-        );
-        return Results.NoContent();
-    }
-
-    private static async Task<IResult> Epg(
-        string slug,
-        DateTimeOffset? from,
-        DateTimeOffset? to,
-        ISender sender,
-        CancellationToken cancellationToken
-    )
-    {
-        var fromUtc = from ?? DateTimeOffset.UtcNow;
-        var toUtc = to ?? fromUtc.AddHours(12);
-        var result = await sender.Send(
-            new GetPublicEpgQuery(slug, fromUtc, toUtc),
-            cancellationToken
-        );
-        return result.ToHttpResult();
-    }
-
-    private static async Task<IResult> LivePlaylist(
-        string slug,
-        HttpRequest request,
-        HttpResponse response,
-        StreamTokenService tokens,
-        IIdentityService identity,
-        ISender sender,
-        CancellationToken cancellationToken
-    )
-    {
-        // Плейлист hls.js перезагружает регулярно — здесь дёшево (1 запрос на перезагрузку) сверить,
-        // что зритель из токена ещё существует и не заблокирован. Так блокировка отражается почти сразу,
-        // не дожидаясь истечения короткого TTL cookie; сегменты этой проверки не делают (слишком часто).
-        if (tokens.Validate(request.Cookies[StreamCookieName]) is not { } userId)
-            return Results.Unauthorized();
-        var profile = await identity.GetProfileAsync(userId, cancellationToken);
-        if (profile is null || profile.IsBlocked)
-            return Results.Unauthorized();
-
-        var result = await sender.Send(
-            new GetLivePlaylistQuery(slug, DateTimeOffset.UtcNow),
-            cancellationToken
-        );
-        if (!result.IsSuccess)
-            return result.ToHttpResult();
-        if (result.Value.Segments.Count == 0)
-            return Results.StatusCode(StatusCodes.Status503ServiceUnavailable);
-
-        response.Headers.CacheControl = "no-cache";
-        return Results.Text(Render(result.Value), "application/vnd.apple.mpegurl");
-    }
-
-    private static IResult Segment(
-        Guid assetId,
-        string file,
-        HttpRequest request,
-        HttpResponse response,
-        StreamTokenService tokens,
-        MediaPathResolver paths
-    )
-    {
-        if (tokens.Validate(request.Cookies[StreamCookieName]) is null)
-            return Results.Unauthorized();
-        if (!SegmentFileName.IsMatch(file))
-            return Results.NotFound();
-
-        string path;
-        try
-        {
-            path = paths.SegmentPath(assetId, file);
-        }
-        catch (UnauthorizedAccessException)
-        {
-            return Results.NotFound();
-        }
-
-        if (!File.Exists(path))
-            return Results.NotFound();
-
-        response.Headers.CacheControl = "public, max-age=31536000, immutable";
-        return Results.File(path, "video/mp2t", enableRangeProcessing: true);
-    }
-
-    private static string Render(LivePlaylistDto playlist)
-    {
-        var extinf = playlist.TargetDuration.ToString("F6", CultureInfo.InvariantCulture);
-        var sb = new StringBuilder();
-        sb.Append("#EXTM3U\n");
-        sb.Append("#EXT-X-VERSION:3\n");
-        sb.Append(
-            CultureInfo.InvariantCulture,
-            $"#EXT-X-TARGETDURATION:{playlist.TargetDuration}\n"
-        );
-        sb.Append(
-            CultureInfo.InvariantCulture,
-            $"#EXT-X-MEDIA-SEQUENCE:{playlist.MediaSequence}\n"
-        );
-
-        foreach (var segment in playlist.Segments)
-        {
-            if (segment.Discontinuity)
-                sb.Append("#EXT-X-DISCONTINUITY\n");
-            sb.Append(CultureInfo.InvariantCulture, $"#EXTINF:{extinf},\n");
-            sb.Append(
-                CultureInfo.InvariantCulture,
-                $"/api/stream/{segment.AssetId:N}/seg{segment.LocalIndex:D5}.ts\n"
-            );
-        }
-
-        return sb.ToString();
-    }
-}
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using LiteCqrs;
+using Microsoft.Extensions.Hosting;
+using TeleWave.Api.Common;
+using TeleWave.Application.Common.Interfaces;
+using TeleWave.Application.Streaming;
+using TeleWave.Application.Streaming.GetLivePlaylist;
+using TeleWave.Application.Streaming.GetPublicEpg;
+using TeleWave.Application.Streaming.ListPublicChannels;
+using TeleWave.Infrastructure.Media;
+using TeleWave.Infrastructure.Streaming;
+
+namespace TeleWave.Api.Endpoints;
+
+public static class StreamingEndpoints
+{
+    private const string StreamCookieName = "tw_stream";
+    private static readonly Regex SegmentFileName = new(@"^seg\d{1,6}\.ts$", RegexOptions.Compiled);
+
+    public static IEndpointRouteBuilder MapStreamingEndpoints(this IEndpointRouteBuilder app)
+    {
+        // Публичный API канала (Bearer): список, EPG, выдача stream-cookie.
+        var channels = app.MapGroup("/api/channels").WithTags("Channels").RequireAuthorization();
+        channels.MapGet("", ListChannels).Produces<IReadOnlyList<PublicChannelDto>>();
+        // Что включено на стороне зрителя: сейчас только переключение по номерам (см. 6.8).
+        channels.MapGet("/features", ViewerFeatures).Produces<ViewerFeaturesDto>();
+        channels.MapPost("/{slug}/watch", Watch).Produces(StatusCodes.Status204NoContent);
+        channels.MapGet("/{slug}/epg", Epg);
+
+        // Раздача эфира (cookie tw_stream): плейлист и сегменты — их грузит <video>/hls.js.
+        app.MapGet("/api/channels/{slug}/live.m3u8", LivePlaylist).WithTags("Streaming");
+        app.MapGet("/api/stream/{assetId:guid}/{file}", Segment).WithTags("Streaming");
+
+        return app;
+    }
+
+    private static async Task<IResult> ListChannels(
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(new ListPublicChannelsQuery(), cancellationToken);
+        return Results.Ok(result);
+    }
+
+    private static async Task<IResult> ViewerFeatures(
+        ISiteSettings siteSettings,
+        CancellationToken cancellationToken
+    ) =>
+        Results.Ok(
+            new ViewerFeaturesDto(await siteSettings.AreChannelNumbersEnabledAsync(cancellationToken))
+        );
+
+    private static IResult Watch(
+        string slug,
+        ICurrentUser currentUser,
+        StreamTokenService tokens,
+        HttpRequest request,
+        HttpResponse response,
+        IHostEnvironment env
+    )
+    {
+        if (currentUser.UserId is not { } userId)
+            return Results.Unauthorized();
+
+        var (token, expiresAt) = tokens.Issue(userId);
+        response.Cookies.Append(
+            StreamCookieName,
+            token,
+            new CookieOptions
+            {
+                HttpOnly = true,
+                // Вне Development — всегда Secure (прод за внешним TLS-прокси; request.IsHttps ненадёжен
+                // при неполной настройке ForwardedHeaders). См. UseSecureCookie в AuthEndpoints.
+                Secure = !env.IsDevelopment() || request.IsHttps,
+                SameSite = SameSiteMode.Strict,
+                Path = "/api",
+                Expires = expiresAt,
+            }
+        );
+        return Results.NoContent();
+    }
+
+    private static async Task<IResult> Epg(
+        string slug,
+        DateTimeOffset? from,
+        DateTimeOffset? to,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var fromUtc = from ?? DateTimeOffset.UtcNow;
+        var toUtc = to ?? fromUtc.AddHours(12);
+        var result = await sender.Send(
+            new GetPublicEpgQuery(slug, fromUtc, toUtc),
+            cancellationToken
+        );
+        return result.ToHttpResult();
+    }
+
+    private static async Task<IResult> LivePlaylist(
+        string slug,
+        HttpRequest request,
+        HttpResponse response,
+        StreamTokenService tokens,
+        IIdentityService identity,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        // Плейлист hls.js перезагружает регулярно — здесь дёшево (1 запрос на перезагрузку) сверить,
+        // что зритель из токена ещё существует и не заблокирован. Так блокировка отражается почти сразу,
+        // не дожидаясь истечения короткого TTL cookie; сегменты этой проверки не делают (слишком часто).
+        if (tokens.Validate(request.Cookies[StreamCookieName]) is not { } userId)
+            return Results.Unauthorized();
+        var profile = await identity.GetProfileAsync(userId, cancellationToken);
+        if (profile is null || profile.IsBlocked)
+            return Results.Unauthorized();
+
+        var result = await sender.Send(
+            new GetLivePlaylistQuery(slug, DateTimeOffset.UtcNow),
+            cancellationToken
+        );
+        if (!result.IsSuccess)
+            return result.ToHttpResult();
+        if (result.Value.Segments.Count == 0)
+            return Results.StatusCode(StatusCodes.Status503ServiceUnavailable);
+
+        response.Headers.CacheControl = "no-cache";
+        return Results.Text(Render(result.Value), "application/vnd.apple.mpegurl");
+    }
+
+    private static IResult Segment(
+        Guid assetId,
+        string file,
+        HttpRequest request,
+        HttpResponse response,
+        StreamTokenService tokens,
+        MediaPathResolver paths
+    )
+    {
+        if (tokens.Validate(request.Cookies[StreamCookieName]) is null)
+            return Results.Unauthorized();
+        if (!SegmentFileName.IsMatch(file))
+            return Results.NotFound();
+
+        string path;
+        try
+        {
+            path = paths.SegmentPath(assetId, file);
+        }
+        catch (UnauthorizedAccessException)
+        {
+            return Results.NotFound();
+        }
+
+        if (!File.Exists(path))
+            return Results.NotFound();
+
+        response.Headers.CacheControl = "public, max-age=31536000, immutable";
+        return Results.File(path, "video/mp2t", enableRangeProcessing: true);
+    }
+
+    private static string Render(LivePlaylistDto playlist)
+    {
+        var extinf = playlist.TargetDuration.ToString("F6", CultureInfo.InvariantCulture);
+        var sb = new StringBuilder();
+        sb.Append("#EXTM3U\n");
+        sb.Append("#EXT-X-VERSION:3\n");
+        sb.Append(
+            CultureInfo.InvariantCulture,
+            $"#EXT-X-TARGETDURATION:{playlist.TargetDuration}\n"
+        );
+        sb.Append(
+            CultureInfo.InvariantCulture,
+            $"#EXT-X-MEDIA-SEQUENCE:{playlist.MediaSequence}\n"
+        );
+
+        foreach (var segment in playlist.Segments)
+        {
+            if (segment.Discontinuity)
+                sb.Append("#EXT-X-DISCONTINUITY\n");
+            sb.Append(CultureInfo.InvariantCulture, $"#EXTINF:{extinf},\n");
+            sb.Append(
+                CultureInfo.InvariantCulture,
+                $"/api/stream/{segment.AssetId:N}/seg{segment.LocalIndex:D5}.ts\n"
+            );
+        }
+
+        return sb.ToString();
+    }
+}
+
+/// <summary>Опции зрительской части, включённые глобально.</summary>
+public sealed record ViewerFeaturesDto(bool ChannelNumbersEnabled);
@@ -1,13 +1,16 @@
 using LiteCqrs;
 using TeleWave.Api.Common;
 using TeleWave.Application.Programming.Planning.ApplyTemplate;
+using TeleWave.Application.Programming.Planning.Diff;
 using TeleWave.Application.Programming.Planning.Preview;
 using TeleWave.Application.Programming.Templates;
+using TeleWave.Application.Programming.Templates.CopyTemplate;
 using TeleWave.Application.Programming.Templates.CreateSlot;
 using TeleWave.Application.Programming.Templates.DeleteSlot;
 using TeleWave.Application.Programming.Templates.GetTemplate;
 using TeleWave.Application.Programming.Templates.Layers;
 using TeleWave.Application.Programming.Templates.UpdateSlot;
+using TeleWave.Application.Programming.Templates.Validate;
 using TeleWave.Infrastructure.Identity;

 namespace TeleWave.Api.Endpoints;
@@ -39,6 +42,17 @@ public static class TemplateEndpoints
        admin
            .MapGet("/channels/{channelId:guid}/template/preview", PreviewTemplate)
            .Produces<SchedulePreviewDto>();
+        // Проверки по правилам — только по шаблону, без прогона генератора.
+        admin
+            .MapGet("/channels/{channelId:guid}/template/issues", ValidateTemplate)
+            .Produces<IReadOnlyList<TemplateIssueDto>>();
+        // Что изменится в эфире, если применить прямо сейчас.
+        admin
+            .MapGet("/channels/{channelId:guid}/template/diff", DiffTemplate)
+            .Produces<ScheduleDiffDto>();
+        admin
+            .MapPost("/channels/{channelId:guid}/template/copy-to/{targetChannelId:guid}", CopyTemplate)
+            .Produces<CopyTemplateResultDto>();

        admin
            .MapPost("/templates/{templateId:guid}/layers", CreateLayer)
@@ -94,6 +108,40 @@ public static class TemplateEndpoints
        return result.ToHttpResult();
    }

+    private static async Task<IResult> ValidateTemplate(
+        Guid channelId,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(new ValidateTemplateQuery(channelId), cancellationToken);
+        return result.ToHttpResult();
+    }
+
+    private static async Task<IResult> DiffTemplate(
+        Guid channelId,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(new PreviewApplyDiffQuery(channelId), cancellationToken);
+        return result.ToHttpResult();
+    }
+
+    private static async Task<IResult> CopyTemplate(
+        Guid channelId,
+        Guid targetChannelId,
+        ISender sender,
+        CancellationToken cancellationToken
+    )
+    {
+        var result = await sender.Send(
+            new CopyTemplateCommand(channelId, targetChannelId),
+            cancellationToken
+        );
+        return result.ToHttpResult();
+    }
+
    private static async Task<IResult> UpdateTemplate(
        Guid templateId,
        UpdateTemplateBody body,