Enhance user plan management and update related endpoints
- Added new configuration options for user plans in `.env.example`, including `Plans__MaxCustomConfigCount` and `Plans__MinCustomConfigCount`. - Introduced `MapPlanEndpoints` in `Program.cs` to handle plan-related API routes. - Implemented `SetUserPlan` endpoint in `RoleEndpoints` to allow admins to assign plans to users. - Removed deprecated role request approval endpoints from `AdminSupportEndpoints`. - Updated `ITelegramNotifier` and related classes to reflect changes in role request handling and payment notifications. - Refactored role management commands to remove `MaxConfigs` and focus on `MaxIpLimit` and billing settings. - Enhanced billing request handling to accommodate plan changes instead of role changes. - Updated various interfaces and command handlers to support new plan management features.
This commit is contained in:
+2
-1
@@ -33,7 +33,8 @@ public class CreateVpnConfigCommandHandlerTests
|
||||
"premium",
|
||||
IsActivated: true,
|
||||
IsBlocked: false,
|
||||
MaxConfigs: 5,
|
||||
ConfigQuota: 5,
|
||||
PlanId: null,
|
||||
MaxIpLimit: 3,
|
||||
SubscriptionToken: "sub-token",
|
||||
BillingEnabled: billingEnabled,
|
||||
|
||||
+2
-1
@@ -46,6 +46,7 @@ public class GetMyConfigsQueryHandlerTests
|
||||
true,
|
||||
false,
|
||||
5,
|
||||
null,
|
||||
RoleQuota.Unlimited,
|
||||
"sub-token",
|
||||
false,
|
||||
@@ -65,7 +66,7 @@ public class GetMyConfigsQueryHandlerTests
|
||||
Assert.True(result.IsSuccess);
|
||||
Assert.Single(result.Value.Configs);
|
||||
Assert.Equal(activeConfig.Id, result.Value.Configs[0].Id);
|
||||
Assert.Equal(5, result.Value.MaxConfigs);
|
||||
Assert.Equal(5, result.Value.ConfigQuota);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
+3
@@ -16,6 +16,7 @@ using PnvPanel.Domain.Inbounds;
|
||||
using PnvPanel.Domain.Instructions;
|
||||
using PnvPanel.Domain.News;
|
||||
using PnvPanel.Domain.Nodes;
|
||||
using PnvPanel.Domain.Plans;
|
||||
using PnvPanel.Domain.Pricing;
|
||||
using PnvPanel.Domain.Support;
|
||||
using PnvPanel.Domain.Telegram;
|
||||
@@ -48,6 +49,7 @@ public sealed class ThrowingSaveDbContext(AppDbContext inner) : IAppDbContext
|
||||
public DbSet<PricingDiscountTier> PricingDiscountTiers => inner.PricingDiscountTiers;
|
||||
public DbSet<BillingSettings> BillingSettings => inner.BillingSettings;
|
||||
public DbSet<PaymentRequest> PaymentRequests => inner.PaymentRequests;
|
||||
public DbSet<Plan> Plans => inner.Plans;
|
||||
public DatabaseFacade Database => inner.Database;
|
||||
|
||||
public Task<int> SaveChangesAsync(CancellationToken cancellationToken) =>
|
||||
@@ -68,6 +70,7 @@ public class RotateVpnConfigCommandHandlerTests
|
||||
true,
|
||||
false,
|
||||
3,
|
||||
null,
|
||||
RoleQuota.Unlimited,
|
||||
"sub-token",
|
||||
false,
|
||||
|
||||
Reference in New Issue
Block a user