Implement billing functionality and enhance role management

- Introduced billing capabilities, allowing users to request payments for subscription periods (3/6/12 months) with admin approval via Telegram. - Updated role management to include a `BillingEnabled` property, preventing billing for admin roles. - Enhanced the `CreateRoleCommand` and `UpdateRoleCommand` to accept billing parameters, ensuring proper handling during role creation and updates. - Added new endpoints for billing management and integrated billing checks into VPN config creation to enforce payment requirements. - Updated related services, models, and tests to support the new billing features, ensuring comprehensive coverage and functionality. - Enhanced documentation to reflect the new billing processes and role management changes.
2026-07-19 01:38:16 +03:00
parent b980dc6cef
commit b2ae358250
106 changed files with 6018 additions and 66 deletions
@@ -0,0 +1,13 @@
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record AdminPaymentRequestDto(
+    Guid Id,
+    Guid UserId,
+    string UserName,
+    PaymentPeriod Period,
+    int AmountSnapshot,
+    PaymentRequestStatus Status,
+    DateTimeOffset CreatedAt
+);
@@ -0,0 +1,13 @@
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record BillingSettingsDto(
+    string RequisitesText,
+    int GraceDays,
+    bool DefaultBillingEnabledForNewRoles
+)
+{
+    public static BillingSettingsDto FromDomain(BillingSettings settings) =>
+        new(settings.RequisitesText, settings.GraceDays, settings.DefaultBillingEnabledForNewRoles);
+}
@@ -0,0 +1,6 @@
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record ConfirmPaymentRequestCommand(Guid RequestId) : ICommand<Result>;
@@ -0,0 +1,147 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using PnvPanel.Application.Auth;
+using PnvPanel.Application.Billing;
+using PnvPanel.Application.Common.Interfaces;
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+using PnvPanel.Domain.Audit;
+using PnvPanel.Domain.Billing;
+using PnvPanel.Domain.Configs;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+/// <summary>
+/// Продлевает оплату (max(текущий PaidUntil, сейчас) + период), возвращает в Active конфиги,
+/// приостановленные за неуплату (Expired), и синхронизирует ExpiresAt на все конфиги пользователя —
+/// зеркало UnblockUserCommandHandler, но по статусу Expired (биллинг), а не Disabled (блокировка).
+/// </summary>
+public sealed class ConfirmPaymentRequestCommandHandler(
+    IAppDbContext dbContext,
+    IIdentityService identityService,
+    IXuiPanelGateway gateway,
+    IRealtimeNotifier notifier,
+    ITelegramNotifier telegramNotifier,
+    ICurrentUser currentUser,
+    ILogger<ConfirmPaymentRequestCommandHandler> logger
+) : ICommandHandler<ConfirmPaymentRequestCommand, Result>
+{
+    public async Task<Result> Handle(
+        ConfirmPaymentRequestCommand command,
+        CancellationToken cancellationToken
+    )
+    {
+        if (currentUser.UserId is not { } adminId)
+            return Result.Failure(AuthErrors.Unauthorized);
+
+        var request = await dbContext.PaymentRequests.FirstOrDefaultAsync(
+            r => r.Id == command.RequestId,
+            cancellationToken
+        );
+        if (request is null)
+            return Result.Failure(BillingErrors.RequestNotFound);
+
+        if (
+            request.Status
+            is not (PaymentRequestStatus.AwaitingPayment or PaymentRequestStatus.AwaitingConfirmation)
+        )
+            return Result.Failure(BillingErrors.RequestNotDecidable);
+
+        var profile = await identityService.GetProfileAsync(request.UserId, cancellationToken);
+        if (profile is null)
+            return Result.Failure(AuthErrors.Unauthorized);
+
+        var now = DateTimeOffset.UtcNow;
+        var baseline = profile.BillingPaidUntil is { } paidUntil && paidUntil > now ? paidUntil : now;
+        var newPaidUntil = baseline.AddMonths(request.Period.ToMonths());
+
+        var extendResult = await identityService.ExtendBillingPaidUntilAsync(
+            request.UserId,
+            newPaidUntil,
+            cancellationToken
+        );
+        if (!extendResult.IsSuccess)
+            return extendResult;
+
+        request.Confirm(adminId);
+
+        var configs = await dbContext
+            .VpnConfigs.Where(c =>
+                c.UserId == request.UserId
+                && (c.Status == ConfigStatus.Active || c.Status == ConfigStatus.Expired)
+            )
+            .ToListAsync(cancellationToken);
+
+        foreach (var config in configs)
+        {
+            if (config.Status == ConfigStatus.Expired)
+            {
+                var inbound = await dbContext
+                    .Inbounds.AsNoTracking()
+                    .FirstOrDefaultAsync(i => i.Id == config.InboundId, cancellationToken);
+                var node = inbound is null
+                    ? null
+                    : await dbContext
+                        .Nodes.AsNoTracking()
+                        .FirstOrDefaultAsync(n => n.Id == inbound.NodeId, cancellationToken);
+
+                if (inbound is not null && node is not null)
+                {
+                    var updateResult = await gateway.UpdateClientAsync(
+                        node,
+                        inbound.RemoteInboundId,
+                        config.ClientExternalId,
+                        config.Protocol,
+                        config.Label ?? config.ClientEmail,
+                        enable: true,
+                        cancellationToken
+                    );
+
+                    if (!updateResult.IsSuccess)
+                    {
+                        // Нода недоступна — не трогаем локальный статус, подхватится следующим
+                        // подтверждением/циклом BillingService (идемпотентно).
+                        logger.LogWarning(
+                            "Failed to enable client for config {ConfigId} on node {NodeId} while confirming payment {RequestId}: {Error}",
+                            config.Id,
+                            node.Id,
+                            request.Id,
+                            updateResult.Error
+                        );
+                        continue;
+                    }
+                }
+
+                config.Resume();
+                await notifier.NotifyConfigStatusChangedAsync(
+                    config.UserId,
+                    config.Id,
+                    config.Status,
+                    cancellationToken
+                );
+            }
+
+            config.SetBillingExpiry(newPaidUntil);
+        }
+
+        dbContext.AuditLogs.Add(
+            AuditLog.Create(
+                adminId,
+                "PaymentConfirmed",
+                "PaymentRequest",
+                request.Id.ToString(),
+                metadata: null,
+                AuditSource.Web
+            )
+        );
+
+        await telegramNotifier.NotifyUserAsync(
+            request.UserId,
+            $"✅ Оплата подтверждена. Доступ продлён до {newPaidUntil:dd.MM.yyyy}.",
+            null,
+            cancellationToken
+        );
+
+        return Result.Success();
+    }
+}
@@ -0,0 +1,6 @@
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record GetBillingSettingsQuery : IQuery<Result<BillingSettingsDto>>;
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore;
+using PnvPanel.Application.Common.Interfaces;
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed class GetBillingSettingsQueryHandler(IAppDbContext dbContext)
+    : IQueryHandler<GetBillingSettingsQuery, Result<BillingSettingsDto>>
+{
+    public async Task<Result<BillingSettingsDto>> Handle(
+        GetBillingSettingsQuery query,
+        CancellationToken cancellationToken
+    )
+    {
+        var settings = await dbContext
+            .BillingSettings.AsNoTracking()
+            .FirstOrDefaultAsync(cancellationToken);
+
+        // Ещё не сохранялось ни разу — отдаём дефолты, а не ошибку (см. PricingSettings).
+        return Result.Success(
+            settings is null
+                ? new BillingSettingsDto(string.Empty, BillingSettings.DefaultGraceDays, false)
+                : BillingSettingsDto.FromDomain(settings)
+        );
+    }
+}
@@ -0,0 +1,8 @@
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record ListPaymentRequestsQuery(PaymentRequestStatus? StatusFilter, int Page, int PageSize)
+    : IQuery<Result<PagedList<AdminPaymentRequestDto>>>;
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore;
+using PnvPanel.Application.Common.Interfaces;
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed class ListPaymentRequestsQueryHandler(
+    IAppDbContext dbContext,
+    IIdentityService identityService
+) : IQueryHandler<ListPaymentRequestsQuery, Result<PagedList<AdminPaymentRequestDto>>>
+{
+    public async Task<Result<PagedList<AdminPaymentRequestDto>>> Handle(
+        ListPaymentRequestsQuery query,
+        CancellationToken cancellationToken
+    )
+    {
+        var page = query.Page <= 0 ? 1 : query.Page;
+        var pageSize = query.PageSize is <= 0 or > 100 ? 20 : query.PageSize;
+
+        var requestsQuery = dbContext.PaymentRequests.AsNoTracking();
+        if (query.StatusFilter is { } status)
+            requestsQuery = requestsQuery.Where(r => r.Status == status);
+
+        var page1 = await requestsQuery
+            .OrderByDescending(r => r.CreatedAt)
+            .ToPagedListAsync(page, pageSize, cancellationToken);
+
+        var userNames = await identityService.GetUserNamesAsync(
+            page1.Items.Select(r => r.UserId).Distinct().ToList(),
+            cancellationToken
+        );
+
+        var items = page1
+            .Items.Select(r => new AdminPaymentRequestDto(
+                r.Id,
+                r.UserId,
+                userNames.GetValueOrDefault(r.UserId, "?"),
+                r.Period,
+                r.AmountSnapshot,
+                r.Status,
+                r.CreatedAt
+            ))
+            .ToList();
+
+        return Result.Success(
+            new PagedList<AdminPaymentRequestDto>(items, page1.Total, page1.Page, page1.PageSize)
+        );
+    }
+}
@@ -0,0 +1,6 @@
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record RejectPaymentRequestCommand(Guid RequestId, string? Reason) : ICommand<Result>;
@@ -0,0 +1,64 @@
+using Microsoft.EntityFrameworkCore;
+using PnvPanel.Application.Auth;
+using PnvPanel.Application.Billing;
+using PnvPanel.Application.Common.Interfaces;
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+using PnvPanel.Domain.Audit;
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed class RejectPaymentRequestCommandHandler(
+    IAppDbContext dbContext,
+    ITelegramNotifier telegramNotifier,
+    ICurrentUser currentUser
+) : ICommandHandler<RejectPaymentRequestCommand, Result>
+{
+    public async Task<Result> Handle(
+        RejectPaymentRequestCommand command,
+        CancellationToken cancellationToken
+    )
+    {
+        if (currentUser.UserId is not { } adminId)
+            return Result.Failure(AuthErrors.Unauthorized);
+
+        var request = await dbContext.PaymentRequests.FirstOrDefaultAsync(
+            r => r.Id == command.RequestId,
+            cancellationToken
+        );
+        if (request is null)
+            return Result.Failure(BillingErrors.RequestNotFound);
+
+        if (
+            request.Status
+            is not (PaymentRequestStatus.AwaitingPayment or PaymentRequestStatus.AwaitingConfirmation)
+        )
+            return Result.Failure(BillingErrors.RequestNotDecidable);
+
+        request.Reject(adminId, command.Reason);
+
+        dbContext.AuditLogs.Add(
+            AuditLog.Create(
+                adminId,
+                "PaymentRejected",
+                "PaymentRequest",
+                request.Id.ToString(),
+                metadata: null,
+                AuditSource.Web
+            )
+        );
+
+        var reasonSuffix = string.IsNullOrWhiteSpace(command.Reason)
+            ? string.Empty
+            : $"\nПричина: {command.Reason}";
+        await telegramNotifier.NotifyUserAsync(
+            request.UserId,
+            $"❌ Заявка на оплату отклонена.{reasonSuffix}",
+            null,
+            cancellationToken
+        );
+
+        return Result.Success();
+    }
+}
@@ -0,0 +1,10 @@
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed record UpdateBillingSettingsCommand(
+    string RequisitesText,
+    int GraceDays,
+    bool DefaultBillingEnabledForNewRoles
+) : ICommand<Result<BillingSettingsDto>>;
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore;
+using PnvPanel.Application.Common.Interfaces;
+using PnvPanel.Application.Common.Messaging;
+using PnvPanel.Application.Common.Models;
+using PnvPanel.Domain.Billing;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed class UpdateBillingSettingsCommandHandler(IAppDbContext dbContext)
+    : ICommandHandler<UpdateBillingSettingsCommand, Result<BillingSettingsDto>>
+{
+    public async Task<Result<BillingSettingsDto>> Handle(
+        UpdateBillingSettingsCommand command,
+        CancellationToken cancellationToken
+    )
+    {
+        var settings = await dbContext.BillingSettings.FirstOrDefaultAsync(cancellationToken);
+        if (settings is null)
+        {
+            settings = BillingSettings.CreateDefault();
+            dbContext.BillingSettings.Add(settings);
+        }
+
+        settings.Update(
+            command.RequisitesText,
+            command.GraceDays,
+            command.DefaultBillingEnabledForNewRoles
+        );
+
+        return Result.Success(BillingSettingsDto.FromDomain(settings));
+    }
+}
@@ -0,0 +1,13 @@
+using FluentValidation;
+
+namespace PnvPanel.Application.Admin.Billing;
+
+public sealed class UpdateBillingSettingsCommandValidator
+    : AbstractValidator<UpdateBillingSettingsCommand>
+{
+    public UpdateBillingSettingsCommandValidator()
+    {
+        RuleFor(x => x.RequisitesText).NotEmpty().MaximumLength(4000);
+        RuleFor(x => x.GraceDays).GreaterThanOrEqualTo(0).LessThanOrEqualTo(365);
+    }
+}